# [PATCH] hg-to-git: do not include the branch name as the first line of commit msg 4 messages from 2007-12-01 to 2007-12-06. Participants: Mark Drago, Junio C Hamano, Stelian Pop, Baz. Thread: https://gitlist.dev/t/11081 ## Mark Drago, 2007-12-01 17:56 Subject: [PATCH] hg-to-git: do not include the branch name as the first line of commit msg Message-ID: <4751A036.1080209@gmail.com> URL: https://gitlist.dev/e/4751A036.1080209%40gmail.com ``` Signed-off-by: Mark Drago --- contrib/hg-to-git/hg-to-git.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 7a1c3e4..6bff49b 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -158,7 +158,7 @@ for cset in range(int(tip) + 1): mparent = None (fdcomment, filecomment) = tempfile.mkstemp() - csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag:' % cset).read().strip() + csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag: | grep -v ^branch:' % cset).read().strip() os.write(fdcomment, csetcomment) os.close(fdcomment) -- 1.5.2.4 ``` ## Junio C Hamano, 2007-12-04 01:20 Subject: Re: [PATCH] hg-to-git: do not include the branch name as the first line of commit msg Message-ID: <7vsl2jcl32.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vsl2jcl32.fsf%40gitster.siamese.dyndns.org In-Reply-To: <4751A036.1080209@gmail.com> ``` Mark Drago writes: > Signed-off-by: Mark Drago > --- > contrib/hg-to-git/hg-to-git.py | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py > index 7a1c3e4..6bff49b 100755 > --- a/contrib/hg-to-git/hg-to-git.py > +++ b/contrib/hg-to-git/hg-to-git.py > @@ -158,7 +158,7 @@ for cset in range(int(tip) + 1): > mparent = None > > (fdcomment, filecomment) = tempfile.mkstemp() > - csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag:' % cset).read().strip() > + csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag: | grep -v ^branch:' % cset).read().strip() > os.write(fdcomment, csetcomment) > os.close(fdcomment) Isn't this one of the ugliest lines in the whole git.git project, I have to wonder? I also wonder missing colon after "date" is a bug from the original version, and assuming that it is, how about doing something less error prone like this? def included(line): keywords = ('changeset', 'parent', 'user', 'date', 'files', 'description', 'tag', 'branch') for kw in keywords: if line.startswith(kw + ':'): return 0 return 1 hglog = os.popen('hg log -r %d -v' % cset).read(); csetcomment = '\n'.join(filter(included, hglog.split('\n'))).strip() If you are excluding _all_ of the : header lines, the "included" function may have to become cleverer but much simpler by doing something like: import re header_re = re.compile(r'^\w+:') def included(line): return not header_re.match(line) ``` ## Stelian Pop, 2007-12-06 13:50 Subject: Re: [PATCH] hg-to-git: do not include the branch name as the first line of commit msg Message-ID: <1196949043.5388.18.camel@galileo> URL: https://gitlist.dev/e/1196949043.5388.18.camel%40galileo In-Reply-To: <7vsl2jcl32.fsf@gitster.siamese.dyndns.org> ``` Le lundi 03 décembre 2007 à 17:20 -0800, Junio C Hamano a écrit : > > (fdcomment, filecomment) = tempfile.mkstemp() > > - csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag:' % cset).read().strip() > > + csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag: | grep -v ^branch:' % cset).read().strip() > > os.write(fdcomment, csetcomment) > > os.close(fdcomment) > > Isn't this one of the ugliest lines in the whole git.git project, I have > to wonder? It probably is, and I take full resposibility for the original version :). Incremental development woes. > I also wonder missing colon after "date" is a bug from the original > version, and assuming that it is, It is indeed a bug. > how about doing something less error > prone like this? > > def included(line): > keywords = ('changeset', 'parent', 'user', 'date', 'files', > 'description', 'tag', 'branch') > for kw in keywords: > if line.startswith(kw + ':'): > return 0 > return 1 > > hglog = os.popen('hg log -r %d -v' % cset).read(); > csetcomment = '\n'.join(filter(included, hglog.split('\n'))).strip() Seems great to me. > If you are excluding _all_ of the : header lines, the "included" > function may have to become cleverer but much simpler by doing something > like: > > import re > header_re = re.compile(r'^\w+:') > def included(line): > return not header_re.match(line) I'm afraid something like this will be much more prone to false positives. Maybe an even better alternative, given the way mercurial outputs the changeset information, is to search for the '^description:' tag and take all the text that follows. -- Stelian Pop ``` ## Baz, 2007-12-06 14:36 Subject: Re: [PATCH] hg-to-git: do not include the branch name as the first line of commit msg Message-ID: <2faad3050712060636i5eab2169vc4588c075fcd73f1@mail.gmail.com> URL: https://gitlist.dev/e/2faad3050712060636i5eab2169vc4588c075fcd73f1%40mail.gmail.com In-Reply-To: <1196949043.5388.18.camel@galileo> ``` On Dec 6, 2007 1:50 PM, Stelian Pop wrote: > > Le lundi 03 décembre 2007 à 17:20 -0800, Junio C Hamano a écrit : > > > > (fdcomment, filecomment) = tempfile.mkstemp() > > > - csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag:' % cset).read().strip() > > > + csetcomment = os.popen('hg log -r %d -v | grep -v ^changeset: | grep -v ^parent: | grep -v ^user: | grep -v ^date | grep -v ^files: | grep -v ^description: | grep -v ^tag: | grep -v ^branch:' % cset).read().strip() > > > os.write(fdcomment, csetcomment) > > > os.close(fdcomment) > > > > Isn't this one of the ugliest lines in the whole git.git project, I have > > to wonder? > > It probably is, and I take full resposibility for the original > version :). Incremental development woes. > > > I also wonder missing colon after "date" is a bug from the original > > version, and assuming that it is, > > It is indeed a bug. > > > how about doing something less error > > prone like this? > > > > def included(line): > > keywords = ('changeset', 'parent', 'user', 'date', 'files', > > 'description', 'tag', 'branch') > > for kw in keywords: > > if line.startswith(kw + ':'): > > return 0 > > return 1 > > > > hglog = os.popen('hg log -r %d -v' % cset).read(); > > csetcomment = '\n'.join(filter(included, hglog.split('\n'))).strip() > > Seems great to me. > > > If you are excluding _all_ of the : header lines, the "included" > > function may have to become cleverer but much simpler by doing something > > like: > > > > import re > > header_re = re.compile(r'^\w+:') > > def included(line): > > return not header_re.match(line) > > I'm afraid something like this will be much more prone to false > positives. > > Maybe an even better alternative, given the way mercurial outputs the > changeset information, is to search for the '^description:' tag and take > all the text that follows. Would it not be better to use hg log --template to output only the information needed? eg date = os.popen('hg log -r %d --template "{date|isodate}"' % cset).read().strip() ... or even just create a template to pull in everything needed in a single popen. -Baz > > -- > Stelian Pop > > > - > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ```