On Dec 6, 2007 1:50 PM, Stelian Pop <stelian@xxxxxxxxxx> 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 <word>: 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 <stelian@xxxxxxxxxx> > > > - > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html