gmane.comp.version-control.mercurial.devel

[PATCH] rebase: add support to keep branch names

Patrick Mezard — 2008-12-02T22:04:44

# HG changeset patch # User Augie Fackler gmail.com> # Date 1227066361 21600 # Node ID 18877b897712f2bb171b7ee723efdb002c2f0d94 # Parent 79d1bb737c16b343e33be7cd7e22dcc4e7bfab0b rebase: add support to keep branch names Callback on extra fields added by Patrick Mezard gmail.com>. diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py < at >< at > -64,6 +64,14 < at >< at > contf = opts.get('continue') abortf = opts.get('abort') collapsef = opts.get('collapse', False) + extrafn = opts.get('extrafn') + if opts.get('keepbranches', None): + if extrafn: + raise dispatch.ParseError('rebase', + _('cannot use both keepbranches and extrafn')) + def extrafn(ctx, extra): + extra['branch'] = ctx.branch() + if contf or abortf: if contf and abortf: raise dispatch.ParseError('rebase', < at >< at > -101,14 +109,14 < at >< at > storestatus(repo, originalwd, target, state, collapsef, external) rebasenode(repo, rev, target, state, skipped, targetancestors, - collapsef) + collapsef, extrafn) ui.note(_('rebase merging completed\n')) if collapsef: p1, p2 = defineparents(repo, min(state), target, state, targetancestors) concludenode(repo, rev, p1, external, state, collapsef, - last=True, skipped=skipped) + last=True, skipped=skipped, extrafn=extrafn) if 'qtip' in repo.tags(): updatemq(repo, state, skipped, **opts) < at >< at > -131,7 +139,8 < at >< at > finally: del lock, wlock -def concludenode(repo, rev, p1, p2, state, collapse, last=False, skipped={}): +def concludenode(repo, rev, p1, p2, state, collapse, last=False, skipped={}, + extrafn=None): """Skip commit if collapsing has been required and rev is not the last revision, commit otherwise """ < at >< at > -155,18 +164,22 < at >< at > else: commitmsg = repo[rev].description() # Commit might fail if unresolved files exist + extra = {'rebase_source': repo[rev].hex()} + if extrafn: + extrafn(repo[rev], extra) newrev = repo.commit(m+a+r, text=commitmsg, user=repo[rev].user(), date=repo[rev].date(), - extra={'rebase_source': repo[rev].hex()}) + extra=extra) return newrev except util.Abort: # Invalidate the previous setparents repo.dirstate.invalidate() raise -def rebasenode(repo, rev, target, state, skipped, targetancestors, collapse): +def rebasenode(repo, rev, target, state, skipped, targetancestors, collapse, + extrafn): 'Rebase a single revision' repo.ui.debug(_("rebasing %d:%s\n") % (rev, repo[rev])) < at >< at > -195,7 +208,8 < at >< at > repo.ui.debug(_('resuming interrupted rebase\n')) - newrev = concludenode(repo, rev, p1, p2, state, collapse) + newrev = concludenode(repo, rev, p1, p2, state, collapse, + extrafn=extrafn) # Update the state if newrev is not None: < at >< at > -409,6 +423,7 < at >< at > (rebase, [ ('', 'keep', False, _('keep original revisions')), + ('', 'keepbranches', False, _('keep original branches')), ('s', 'source', '', _('rebase from a given revision')), ('b', 'base', '', _('rebase from the base of a given revision')), ('d', 'dest', '', _('rebase onto a given revision')), diff --git a/tests/test-rebase-keep-branch b/tests/test-rebase-keep-branch new file mode 100755 --- /dev/null +++ b/tests/test-rebase-keep-branch < at >< at > -0,0 +1,30 < at >< at > +#!/bin/sh + +echo "[extensions]" >> $HGRCPATH +echo "graphlog=" >> $HGRCPATH +echo "rebase=" >> $HGRCPATH + +addcommit () { + echo $1 > $1 + hg add $1 + hg commit -d "${2} 0" -u test -m $1 +} + +hg init a +cd a +addcommit "c1" 0 +addcommit "c2" 1 + +addcommit "l1" 2 +addcommit "l2" 3 + +hg update -C 1 +hg branch 'notdefault' +addcommit "r1" 4 +hg glog --template '{rev}:{desc}:{branches}\n' + +echo +echo '% Rebase a branch while preserving the branch name' +hg update -C 3 +hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/$saving bundle to $.*/\1/' +hg glog --template '{rev}:{desc}:{branches}\n' diff --git a/tests/test-rebase-keep-branch.out b/tests/test-rebase-keep-branch.out new file mode 100644 --- /dev/null +++ b/tests/test-rebase-keep-branch.out < at >< at > -0,0 +1,33 < at >< at > +0 files updated, 0 files merged, 2 files removed, 0 files unresolved +marked working directory as branch notdefault +created new head +< at > 4:r1:notdefault +| +| o 3:l2: +| | +| o 2:l1: +|/ +o 1:c2: +| +o 0:c1: + + +% Rebase a branch while preserving the branch name +2 files updated, 0 files merged, 1 files removed, 0 files unresolved +saving bundle to +adding branch +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +rebase completed +< at > 4:r1:notdefault +| +o 3:l2: +| +o 2:l1: +| +o 1:c2: +| +o 0:c1: + diff --git a/tests/test-rebase-parameters.out b/tests/test-rebase-parameters.out --- a/tests/test-rebase-parameters.out +++ b/tests/test-rebase-parameters.out < at >< at > -15,15 +15,16 < at >< at > options: - --keep keep original revisions - -s --source rebase from a given revision - -b --base rebase from the base of a given revision - -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - -c --continue continue an interrupted rebase - -a --abort abort an interrupted rebase - --style display using template map file - --template display with template + --keep keep original revisions + --keepbranches keep original branches + -s --source rebase from a given revision + -b --base rebase from the base of a given revision + -d --dest rebase onto a given revision + --collapse collapse the rebased revisions + -c --continue continue an interrupted rebase + -a --abort abort an interrupted rebase + --style display using template map file + --template display with template use "hg -v help rebase" to show global options < at >< at > -42,15 +43,16 < at >< at > options: - --keep keep original revisions - -s --source rebase from a given revision - -b --base rebase from the base of a given revision - -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - -c --continue continue an interrupted rebase - -a --abort abort an interrupted rebase - --style display using template map file - --template display with template + --keep keep original revisions + --keepbranches keep original branches + -s --source rebase from a given revision + -b --base rebase from the base of a given revision + -d --dest rebase onto a given revision + --collapse collapse the rebased revisions + -c --continue continue an interrupted rebase + -a --abort abort an interrupted rebase + --style display using template map file + --template display with template use "hg -v help rebase" to show global options < at >< at > -69,15 +71,16 < at >< at > options: - --keep keep original revisions - -s --source rebase from a given revision - -b --base rebase from the base of a given revision - -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - -c --continue continue an interrupted rebase - -a --abort abort an interrupted rebase - --style display using template map file - --template display with template + --keep keep original revisions + --keepbranches keep original branches + -s --source rebase from a given revision + -b --base rebase from the base of a given revision + -d --dest rebase onto a given revision + --collapse collapse the rebased revisions + -c --continue continue an interrupted rebase + -a --abort abort an interrupted rebase + --style display using template map file + --template display with template use "hg -v help rebase" to show global options < at >< at > -96,15 +99,16 < at >< at > options: - --keep keep original revisions - -s --source rebase from a given revision - -b --base rebase from the base of a given revision - -d --dest rebase onto a given revision - --collapse collapse the rebased revisions - -c --continue continue an interrupted rebase - -a --abort abort an interrupted rebase - --style display using template map file - --template display with template + --keep keep original revisions + --keepbranches keep original branches + -s --source rebase from a given revision + -b --base rebase from the base of a given revision + -d --dest rebase onto a given revision + --collapse collapse the rebased revisions + -c --continue continue an interrupted rebase + -a --abort abort an interrupted rebase + --style display using template map file + --template display with template use "hg -v help rebase" to show global options

hg-stable< at >7463: 905 new changesets

Mercurial Commits — 2008-12-02T22:31:28

905 new changesets in hg-stable: changeset: 6559:0231f763ebc8 parent: 6388:1e4ddc9ac9f7 user: Bryan O'Sullivan serpentine.com> date: Wed Mar 26 10:12:10 2008 -0700 summary: manifest: improve parsing performance by 8x via a new C extension ... changeset: 7463:6aafd75fb924 tag: tip user: Matt Mackall selenic.com> date: Tue Dec 02 13:06:18 2008 -0600 summary: Added signature for changeset 2a67430f92f1

mercurial< at >7463: 9 new changesets

Mercurial Commits — 2008-12-02T22:15:45

9 new changesets in mercurial: http://www.selenic.com/hg/rev/c9fd5474a707 changeset: 7455:c9fd5474a707 user: Brodie Rao dackz.net> date: Wed Nov 26 08:58:31 2008 -0500 summary: color: add --color switch http://www.selenic.com/hg/rev/79eb16db5e4a changeset: 7456:79eb16db5e4a user: Brodie Rao dackz.net> date: Tue Dec 02 16:46:45 2008 +0100 summary: color: diff colorization http://www.selenic.com/hg/rev/a70fb83cbb9e changeset: 7457:a70fb83cbb9e user: Georg Brandl python.org> date: Wed Nov 26 22:58:07 2008 +0100 summary: diff colorization: finish highlighting trailing whitespace http://www.selenic.com/hg/rev/03dd55115985 changeset: 7458:03dd55115985 user: Augie Fackler gmail.com> date: Tue Dec 02 10:13:52 2008 -0600 summary: color: Add tests for colorized diff and status output. http://www.selenic.com/hg/rev/3fb5c142a9f0 changeset: 7459:3fb5c142a9f0 user: Brodie Rao dackz.net> date: Mon Dec 01 10:45:22 2008 -0500 summary: color: replace effect-specific reset control codes with general purpose one http://www.selenic.com/hg/rev/3342e6ada4b9 changeset: 7460:3342e6ada4b9 user: Benoit Boissinot ens-lyon.org> date: Tue Dec 02 19:36:43 2008 +0100 summary: push: use the fast changegroup() path on push http://www.selenic.com/hg/rev/2a67430f92f1 changeset: 7461:2a67430f92f1 tag: 1.1 user: Matt Mackall selenic.com> date: Tue Dec 02 13:05:40 2008 -0600 summary: encoding: normalize some silly encoding names http://www.selenic.com/hg/rev/40098e76d376 changeset: 7462:40098e76d376 user: Matt Mackall selenic.com> date: Tue Dec 02 13:06:17 2008 -0600 summary: Added tag 1.1 for changeset 2a67430f92f1 http://www.selenic.com/hg/rev/6aafd75fb924 changeset: 7463:6aafd75fb924 tag: tip user: Matt Mackall selenic.com> date: Tue Dec 02 13:06:18 2008 -0600 summary: Added signature for changeset 2a67430f92f1

mercurial< at >7454: 4 new changesets

Mercurial Commits — 2008-12-02T18:15:41

4 new changesets in mercurial: http://www.selenic.com/hg/rev/fca9947652ce changeset: 7451:fca9947652ce user: Brendan Cully kublai.com> date: Mon Dec 01 13:38:26 2008 -0800 summary: inotify: close most file descriptors when autostarting http://www.selenic.com/hg/rev/89c516430107 changeset: 7452:89c516430107 user: Brendan Cully kublai.com> date: Mon Dec 01 14:06:02 2008 -0800 summary: inotify: do not complain that inotify is not running if autostart is False http://www.selenic.com/hg/rev/9898427add1c changeset: 7453:9898427add1c user: Brendan Cully kublai.com> date: Mon Dec 01 20:09:10 2008 -0800 summary: mq: drop copy sources removed during qfold http://www.selenic.com/hg/rev/1d5ecaa47abb changeset: 7454:1d5ecaa47abb tag: tip user: Brendan Cully kublai.com> date: Mon Dec 01 20:10:02 2008 -0800 summary: mq: filter out empty commit messages in qfold

[issue1406] record extension can't handle files with changedpermissions

edgimar — 2008-12-02T14:53:14

New submission from edgimar gmail.com>: the 'record' extension fails when files having changed permissions are waiting to be committed, as the following test script demonstrates: #!/bin/sh mkdir test_dir cd test_dir hg init . echo 'a' >a echo 'b' >b chmod 644 b hg ci -A -m 'blah' chmod 755 b echo 'a' >>a hg record # fails # hg ci would work here ---------- messages: 8042 nosy: edgimar priority: bug status: unread title: record extension can't handle files with changed permissions ____________________________________________________ Mercurial issue tracker selenic.com> ____________________________________________________

[PATCH 0 of 2] mail.charset fixes

Christian Ebert — 2008-12-02T14:37:51

Hi, 1. patch disables irritating charset conversion for notify's test mode. 2. patch fixes docs for email.charset (there is no ui.encoding setting) c

mercurial/crew< at >7454: 4 outgoing changesets

Mercurial Commits — 2008-12-02T12:00:04

4 outgoing changesets in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/1d5ecaa47abb changeset: 7454:1d5ecaa47abb tag: tip user: Brendan Cully kublai.com> date: Mon Dec 01 20:10:02 2008 -0800 summary: mq: filter out empty commit messages in qfold http://hg.intevation.org/mercurial/crew/rev/9898427add1c changeset: 7453:9898427add1c user: Brendan Cully kublai.com> date: Mon Dec 01 20:09:10 2008 -0800 summary: mq: drop copy sources removed during qfold http://hg.intevation.org/mercurial/crew/rev/89c516430107 changeset: 7452:89c516430107 user: Brendan Cully kublai.com> date: Mon Dec 01 14:06:02 2008 -0800 summary: inotify: do not complain that inotify is not running if autostart is False http://hg.intevation.org/mercurial/crew/rev/fca9947652ce changeset: 7451:fca9947652ce user: Brendan Cully kublai.com> date: Mon Dec 01 13:38:26 2008 -0800 summary: inotify: close most file descriptors when autostarting

Python extension distribution without sources

Berkes Ádám — 2008-12-02T10:30:12

I would like to ask whether it is possible to distribute a python extension module to an already installed binary package somehow. My question is focusing on windows (e.g. there is an installed tortoiseHg version), so if I have a .py module, how can I "plugin" this into the existing mercurial installation with the least impact and hacking possible. Is there any tool for such aim, or a descriptive explanation (setting up extension to hgrc is not part of my interest now)?

[issue1405] "unknown exception encountered" when qfolding multiplepatches together,where later patch removes file edited by earlier patch

Daniel Holbert — 2008-12-02T02:31:15

New submission from Daniel Holbert mozilla.com>: STEPS TO REPRODUCE: ------------------- Just run the commands in the attached "qfold_broken.sh" script The commands basically just do this: a. Clone http://hg.mozilla.org/mozilla-central b. Clone my patch queue http://hg.mozilla.org/users/dholbert_mozilla.com/smil-patches c. "hg qnew" a new patch, and try to fold the first 4 patches (up to "smil_secondFixes") into it. ACTUAL RESULTS: --------------- The "qfold" command fails with an "unknown exception encountered" error message, and it leaves my source tree in an unclean state, with 'hg qpop' and 'hg status' both failing. (details to follow) NOTE: If, instead of qfolding the 4 patches all at once, I qfold the first 3 and *then* separately qfold the 4th one, then everything works fine. (I'll attach a separate script demonstrating that.) I think this might happen because the 4th patch deletes files which are created in the 1st patch (and which are modified in the 2nd and 3rd patches). So, I'm guessing the problem is that Mercurial has a hard time when it needs to create & delete a file in a single qfold command. Mercurial version: 1.0.1 OS Version: Ubuntu 8.10 (up to date) ---------- files: qfold_broken.sh messages: 8038 nosy: dholbert priority: urgent status: unread title: "unknown exception encountered" when qfolding multiple patches together, where later patch removes file edited by earlier patch ____________________________________________________ Mercurial issue tracker selenic.com> ____________________________________________________

mercurial< at >7450: 24 new changesets

Mercurial Commits — 2008-12-01T18:15:52

24 new changesets in mercurial: http://www.selenic.com/hg/rev/f21e3d0e335b changeset: 7427:f21e3d0e335b parent: 7421:4c4324476be6 user: Patrick Mezard gmail.com> date: Wed Nov 26 22:27:37 2008 +0100 summary: util_win32: fix Windows version checking (issue1358) http://www.selenic.com/hg/rev/fdcde929ce4f changeset: 7428:fdcde929ce4f user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:30 2008 +0100 summary: tests: use killdaemons in hgweb tests http://www.selenic.com/hg/rev/dbc40381620e changeset: 7429:dbc40381620e user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:31 2008 +0100 summary: tests: Skip tests if they will fail because of outer repo http://www.selenic.com/hg/rev/f0a3e87c810d changeset: 7430:f0a3e87c810d user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:32 2008 +0100 summary: util: use existing never() instead of custom lambda http://www.selenic.com/hg/rev/3d827cc616b6 changeset: 7431:3d827cc616b6 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 01:09:11 2008 +0100 summary: buildrpm: complain when hg command isn't available http://www.selenic.com/hg/rev/642754e776e2 changeset: 7432:642754e776e2 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 01:10:27 2008 +0100 summary: rpm spec: include python egg in rpm http://www.selenic.com/hg/rev/c4ce828e8074 changeset: 7433:c4ce828e8074 parent: 7426:df0962f6c54e parent: 7432:642754e776e2 user: Benoit Boissinot ens-lyon.org> date: Thu Nov 27 01:35:12 2008 +0100 summary: merge with mpm http://www.selenic.com/hg/rev/cf7741aa1e96 changeset: 7434:cf7741aa1e96 user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 16:07:13 2008 +0100 summary: kill some trailing spaces http://www.selenic.com/hg/rev/5e13df32fb74 changeset: 7435:5e13df32fb74 user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 16:07:17 2008 +0100 summary: bundlerepo doesn't really have a dirstate, throw AttributeError if requested http://www.selenic.com/hg/rev/07faba78cf5a changeset: 7436:07faba78cf5a user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 17:00:54 2008 +0100 summary: diff: fix obscure off-by-one error in diff -p http://www.selenic.com/hg/rev/3cdaac732b2b changeset: 7437:3cdaac732b2b user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 18:46:45 2008 +0100 summary: tests: fix test results for 07faba78cf5a http://www.selenic.com/hg/rev/b80b944836ec changeset: 7438:b80b944836ec user: Brendan Cully kublai.com> date: Thu Nov 27 11:04:29 2008 -0800 summary: Add hgcia to hgext http://www.selenic.com/hg/rev/7dd44ad43914 changeset: 7439:7dd44ad43914 user: Brendan Cully kublai.com> date: Thu Nov 27 11:05:50 2008 -0800 summary: Ignore eclipse droppings http://www.selenic.com/hg/rev/d2a917b27152 changeset: 7440:d2a917b27152 user: Brendan Cully kublai.com> date: Thu Nov 27 11:14:43 2008 -0800 summary: Fix test breakage introduced in 07faba78cf5a http://www.selenic.com/hg/rev/4fecd17f2de9 changeset: 7441:4fecd17f2de9 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 22:04:51 2008 +0100 summary: convert cvs: Fix branch name parsing http://www.selenic.com/hg/rev/a14ce129cfcd changeset: 7442:a14ce129cfcd user: Edouard Gomez free.fr> date: Thu Nov 27 10:13:20 2008 +0100 summary: convert: check existence of ~/.cvspass before reading it http://www.selenic.com/hg/rev/1e0677756f60 changeset: 7443:1e0677756f60 user: Dirkjan Ochtman ochtman.nl> date: Fri Nov 28 09:50:30 2008 +0100 summary: gitweb: fix graph display in IE http://www.selenic.com/hg/rev/f792c7bb2fb3 changeset: 7444:f792c7bb2fb3 user: Thomas Arendsen Hein intevation.de> date: Fri Nov 28 11:38:41 2008 +0100 summary: Improvement to 14ce129cfcd: Use try/except and pass filename on errors http://www.selenic.com/hg/rev/29c6e71b1c73 changeset: 7445:29c6e71b1c73 user: Dirkjan Ochtman ochtman.nl> date: Sun Nov 30 18:38:42 2008 +0100 summary: gitweb: fix graph again after previous faulty commit (1e0677756f60) http://www.selenic.com/hg/rev/2d2e0be762be changeset: 7446:2d2e0be762be user: Patrick Mezard gmail.com> date: Sun Nov 30 22:01:26 2008 +0100 summary: convert: work around svn.ra.get_files() not releasing input buffer http://www.selenic.com/hg/rev/4fd92687f331 changeset: 7447:4fd92687f331 user: Patrick Mezard gmail.com> date: Sun Nov 30 22:51:42 2008 +0100 summary: convert: improve reporting of invalid svn bindings http://www.selenic.com/hg/rev/7900d240c3d8 changeset: 7448:7900d240c3d8 user: Thomas Arendsen Hein intevation.de> date: Mon Dec 01 12:11:28 2008 +0100 summary: Fix non-empty $CDPATH causing failed tests. http://www.selenic.com/hg/rev/f848d7f96195 changeset: 7449:f848d7f96195 user: Georg Brandl python.org> date: Mon Dec 01 13:44:34 2008 +0100 summary: help: try topics before commands to avoid "diffs" showing help for diffstat http://www.selenic.com/hg/rev/79d1bb737c16 changeset: 7450:79d1bb737c16 tag: tip user: Patrick Mezard gmail.com> date: Mon Dec 01 14:20:20 2008 +0100 summary: hgweb: extend [paths] syntax to match repositories recursively (issue852)

[PATCH] notify: no charset conversion when testing

Christian Ebert — 2008-12-01T14:33:56

# HG changeset patch # User Christian Ebert gmx.net> # Date 1228141979 -3600 # Node ID a65f638e219cec49b0a1bc1e5516caf3ecbc670b # Parent 79d1bb737c16b343e33be7cd7e22dcc4e7bfab0b notify: no charset conversion when testing Same as for patchbomb. diff --git a/hgext/notify.py b/hgext/notify.py --- a/hgext/notify.py +++ b/hgext/notify.py < at >< at > -157,7 +157,9 < at >< at > for user in users.split(','): subs[self.fixmail(user)] = 1 subs = util.sort(subs) - return [mail.addressencode(self.ui, s, self.charsets) for s in subs] + show = self.ui.configbool('notify', 'test', True) + return [mail.addressencode(self.ui, s, self.charsets, show) + for s in subs] def url(self, path=None): return self.ui.config('web', 'baseurl') + (path or self.root) < at >< at > -186,7 +188,8 < at >< at > # create fresh mime message from msg body text = msg.get_payload() # for notification prefer readability over data precision - msg = mail.mimeencode(self.ui, text, self.charsets) + show = self.ui.configbool('notify', 'test', True) + msg = mail.mimeencode(self.ui, text, self.charsets, show) def fix_subject(subject): '''try to make subject line exist and be useful.''' < at >< at > -201,7 +204,8 < at >< at > maxsubject = int(self.ui.config('notify', 'maxsubject', 67)) if maxsubject and len(subject) > maxsubject: subject = subject[:maxsubject-3] + '...' - msg['Subject'] = mail.headencode(self.ui, subject, self.charsets) + msg['Subject'] = mail.headencode(self.ui, subject, + self.charsets, show) def fix_sender(sender): '''try to make message have proper sender.''' < at >< at > -210,7 +214,8 < at >< at > sender = self.ui.config('email', 'from') or self.ui.username() if '< at >' not in sender or '< at >localhost' in sender: sender = self.fixmail(sender) - msg['From'] = mail.addressencode(self.ui, sender, self.charsets) + msg['From'] = mail.addressencode(self.ui, sender, + self.charsets, show) msg['Date'] = util.datestr(format="%a, %d %b %Y %H:%M:%S %1%2") fix_subject(subject) < at >< at > -224,7 +229,7 < at >< at > msg['To'] = ', '.join(self.subs) msgtext = msg.as_string(0) - if self.ui.configbool('notify', 'test', True): + if show: self.ui.write(msgtext) if not msgtext.endswith('\n'): self.ui.write('\n')

[issue1404] Commit fails on a VMWare shared drive

Jukka Laurila — 2008-12-01T13:56:38

New submission from Jukka Laurila nokia.com>: Commit on a repository on a VMWare shared drive fails in certain circumstances. To replicate: X:\shared>mkdir repo X:\shared>cd repo X:\shared\repo>mkdir foo X:\shared\repo>echo foo >foo\foo.txt X:\shared\repo>hg init X:\shared\repo>hg add . adding foo\foo.txt X:\shared\repo>hg commit trouble committing foo/foo.txt! abort: The filename, directory name, or volume label syntax is incorrect: X:\shared\repo\.hg\store\data/foo/foo.txt.i X:\shared is a directory shared with an OS X Leopard host. The guest OS is WinXP SP2. Mercurial is 1.0.2, installed via the TortoiseHG distribution. To trigger the bug the top level directory must be empty. The bug does not appear if there is a file in the top level directory: X:\shared>mkdir repo X:\shared>cd repo X:\shared\repo>mkdir foo X:\shared\repo>echo foo>foo\foo.txt X:\shared\repo>echo foo>foo.txt X:\shared\repo>hg init X:\shared\repo>hg add . adding foo.txt adding foo\foo.txt X:\shared\repo>hg commit X:\shared\repo> The bug does not appear on a regular drive. ---------- messages: 8035 nosy: jlaurila priority: bug status: unread title: Commit fails on a VMWare shared drive ____________________________________________________ Mercurial issue tracker selenic.com> ____________________________________________________

mercurial/crew< at >7448: 22 outgoing changesets

Mercurial Commits — 2008-12-01T12:00:08

22 outgoing changesets in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/7900d240c3d8 changeset: 7448:7900d240c3d8 tag: tip user: Thomas Arendsen Hein intevation.de> date: Mon Dec 01 12:11:28 2008 +0100 summary: Fix non-empty $CDPATH causing failed tests. http://hg.intevation.org/mercurial/crew/rev/4fd92687f331 changeset: 7447:4fd92687f331 user: Patrick Mezard gmail.com> date: Sun Nov 30 22:51:42 2008 +0100 summary: convert: improve reporting of invalid svn bindings http://hg.intevation.org/mercurial/crew/rev/2d2e0be762be changeset: 7446:2d2e0be762be user: Patrick Mezard gmail.com> date: Sun Nov 30 22:01:26 2008 +0100 summary: convert: work around svn.ra.get_files() not releasing input buffer http://hg.intevation.org/mercurial/crew/rev/29c6e71b1c73 changeset: 7445:29c6e71b1c73 user: Dirkjan Ochtman ochtman.nl> date: Sun Nov 30 18:38:42 2008 +0100 summary: gitweb: fix graph again after previous faulty commit (1e0677756f60) http://hg.intevation.org/mercurial/crew/rev/f792c7bb2fb3 changeset: 7444:f792c7bb2fb3 user: Thomas Arendsen Hein intevation.de> date: Fri Nov 28 11:38:41 2008 +0100 summary: Improvement to 14ce129cfcd: Use try/except and pass filename on errors http://hg.intevation.org/mercurial/crew/rev/1e0677756f60 changeset: 7443:1e0677756f60 user: Dirkjan Ochtman ochtman.nl> date: Fri Nov 28 09:50:30 2008 +0100 summary: gitweb: fix graph display in IE http://hg.intevation.org/mercurial/crew/rev/a14ce129cfcd changeset: 7442:a14ce129cfcd user: Edouard Gomez free.fr> date: Thu Nov 27 10:13:20 2008 +0100 summary: convert: check existence of ~/.cvspass before reading it http://hg.intevation.org/mercurial/crew/rev/4fecd17f2de9 changeset: 7441:4fecd17f2de9 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 22:04:51 2008 +0100 summary: convert cvs: Fix branch name parsing http://hg.intevation.org/mercurial/crew/rev/d2a917b27152 changeset: 7440:d2a917b27152 user: Brendan Cully kublai.com> date: Thu Nov 27 11:14:43 2008 -0800 summary: Fix test breakage introduced in 07faba78cf5a http://hg.intevation.org/mercurial/crew/rev/7dd44ad43914 changeset: 7439:7dd44ad43914 user: Brendan Cully kublai.com> date: Thu Nov 27 11:05:50 2008 -0800 summary: Ignore eclipse droppings http://hg.intevation.org/mercurial/crew/rev/b80b944836ec changeset: 7438:b80b944836ec user: Brendan Cully kublai.com> date: Thu Nov 27 11:04:29 2008 -0800 summary: Add hgcia to hgext http://hg.intevation.org/mercurial/crew/rev/3cdaac732b2b changeset: 7437:3cdaac732b2b user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 18:46:45 2008 +0100 summary: tests: fix test results for 07faba78cf5a http://hg.intevation.org/mercurial/crew/rev/07faba78cf5a changeset: 7436:07faba78cf5a user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 17:00:54 2008 +0100 summary: diff: fix obscure off-by-one error in diff -p http://hg.intevation.org/mercurial/crew/rev/5e13df32fb74 changeset: 7435:5e13df32fb74 user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 16:07:17 2008 +0100 summary: bundlerepo doesn't really have a dirstate, throw AttributeError if requested http://hg.intevation.org/mercurial/crew/rev/cf7741aa1e96 changeset: 7434:cf7741aa1e96 user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 16:07:13 2008 +0100 summary: kill some trailing spaces http://hg.intevation.org/mercurial/crew/rev/c4ce828e8074 changeset: 7433:c4ce828e8074 parent: 7432:df0962f6c54e parent: 7426:642754e776e2 user: Benoit Boissinot ens-lyon.org> date: Thu Nov 27 01:35:12 2008 +0100 summary: merge with mpm http://hg.intevation.org/mercurial/crew/rev/642754e776e2 changeset: 7426:642754e776e2 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 01:10:27 2008 +0100 summary: rpm spec: include python egg in rpm http://hg.intevation.org/mercurial/crew/rev/3d827cc616b6 changeset: 7425:3d827cc616b6 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 01:09:11 2008 +0100 summary: buildrpm: complain when hg command isn't available http://hg.intevation.org/mercurial/crew/rev/f0a3e87c810d changeset: 7424:f0a3e87c810d user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:32 2008 +0100 summary: util: use existing never() instead of custom lambda http://hg.intevation.org/mercurial/crew/rev/dbc40381620e changeset: 7423:dbc40381620e user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:31 2008 +0100 summary: tests: Skip tests if they will fail because of outer repo http://hg.intevation.org/mercurial/crew/rev/fdcde929ce4f changeset: 7422:fdcde929ce4f user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:30 2008 +0100 summary: tests: use killdaemons in hgweb tests http://hg.intevation.org/mercurial/crew/rev/f21e3d0e335b changeset: 7421:f21e3d0e335b user: Patrick Mezard gmail.com> date: Wed Nov 26 22:27:37 2008 +0100 summary: util_win32: fix Windows version checking (issue1358)

[PATCH] hgrc 5: fix email.charsets documentation

Christian Ebert — 2008-12-01T11:53:17

# HG changeset patch # User Christian Ebert gmx.net> # Date 1228132190 -3600 # Node ID f34ab298b2e248d0a3377c68bb982873d18df4ae # Parent 7900d240c3d83d5485d998b156ec27ed50c249b5 hgrc 5: fix email.charsets documentation diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt < at >< at > -219,7 +219,7 < at >< at > convenient for recipients. Addresses, headers, and parts not containing patches of outgoing messages will be encoded in the first charset to which conversion from local encoding - (ui.encoding, ui.fallbackencoding) succeeds. If correct + ($HGENCODING, ui.fallbackencoding) succeeds. If correct conversion fails, the text in question is sent as is. Defaults to empty (explicit) list. < at >< at > -228,7 +228,7 < at >< at > us-ascii always first, regardless of settings email.charsets in order given by user ui.fallbackencoding if not in email.charsets - ui.encoding if not in email.charsets + $HGENCODING if not in email.charsets utf-8 always last, regardless of settings Email example:

[PATCH 0 of 1] Addition of a colored legend for graph page

Lindsey Smith — 2008-12-01T01:31:00

(Apologies for the first patch email, first time posting and it obviously needed some more configuring) When scrolling down large graph pages, it is easy to forget which branch is represented by each line in the graph, especially with long periods between changesets. This patch adds a simple color coded legend under the left navigation which can be referenced in such cases. The colors for each branch are simply the colors that are picked by the actual graph (the colors can repeat with a large number of branches, just as in the graph). Unnamed branches' colors are attributed to (I believe) their parents.

[PATCH] Assign unique priorities in mergetools.hgrc

Mads Kiilerich — 2008-12-01T00:45:28

# HG changeset patch # User Mads Kiilerich kiilerich.com> # Date 1228092187 -3600 # Node ID cbd6e0539c7aa15e0f837f233870eb2c5fd828b6 # Parent 4fd92687f331a38ddb38d3f71753ab92cd9cb174 Assign unique priorities in mergetools.hgrc Merge tools are chosen by priority, but in case of tools with same priority there is no well-defined order. The default is 0. This patch gives all merge tools in mergetools.hgrc a unique priority less than 0. New tools with default priority will thus get higher priority. The assigned priorities could be different. They are based on existing values and ordering and how common and usable I think they are. diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc --- a/contrib/mergetools.hgrc +++ b/contrib/mergetools.hgrc < at >< at > -6,6 +6,7 < at >< at > kdiff3.regappend=\kdiff3.exe kdiff3.fixeol=True kdiff3.gui=True +kdiff3.priority=-1 gvimdiff.args=--nofork -d -g -O $local $other $base gvimdiff.regkey=Software\Vim\GVim < at >< at > -16,8 +17,10 < at >< at > merge.priority=-10 gpyfm.gui=True +gpyfm.priority=-3 meld.gui=True +meld.priority=-2 tkdiff.args=$local $other -a $base -o $output tkdiff.gui=True < at >< at > -25,27 +28,31 < at >< at > xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other xxdiff.gui=True -xxdiff.priority=-8 +xxdiff.priority=-7 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other diffmerge.checkchanged=True diffmerge.gui=True +diffmerge.priority=-11 p4merge.args=$base $local $other $output p4merge.regkey=Software\Perforce\Environment p4merge.regname=P4INSTROOT p4merge.regappend=\p4merge.exe p4merge.gui=True -p4merge.priority=-8 +p4merge.priority=-6 tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output tortoisemerge.regkey=Software\TortoiseSVN tortoisemerge.gui=True +tortoisemerge.priority=-5 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge ecmerge.gui=True +ecmerge.priority=-12 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.gui=True +filemerge.priority=-4

Information about cloning operations

Stefano — 2008-11-30T14:13:04

Hello, I'm looking for a way to provide more information about what's going on during cloning operations (read as: progress bar)... As far as I can see the needed information is at revlog.py level (addgroup) but there we don't have access to ui, while at an higher level we have addchangegroup (localrepo.py) but here we can just provide one progress.update before the changesets step, another one before the manifests step etc... and the result is not so useful. Any ideas? Cheers, Stefano

mercurial/crew< at >7444: 18 outgoing changesets

Mercurial Commits — 2008-11-30T12:00:07

18 outgoing changesets in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/f792c7bb2fb3 changeset: 7444:f792c7bb2fb3 tag: tip user: Thomas Arendsen Hein intevation.de> date: Fri Nov 28 11:38:41 2008 +0100 summary: Improvement to 14ce129cfcd: Use try/except and pass filename on errors http://hg.intevation.org/mercurial/crew/rev/1e0677756f60 changeset: 7443:1e0677756f60 user: Dirkjan Ochtman ochtman.nl> date: Fri Nov 28 09:50:30 2008 +0100 summary: gitweb: fix graph display in IE http://hg.intevation.org/mercurial/crew/rev/a14ce129cfcd changeset: 7442:a14ce129cfcd user: Edouard Gomez free.fr> date: Thu Nov 27 10:13:20 2008 +0100 summary: convert: check existence of ~/.cvspass before reading it http://hg.intevation.org/mercurial/crew/rev/4fecd17f2de9 changeset: 7441:4fecd17f2de9 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 22:04:51 2008 +0100 summary: convert cvs: Fix branch name parsing http://hg.intevation.org/mercurial/crew/rev/d2a917b27152 changeset: 7440:d2a917b27152 user: Brendan Cully kublai.com> date: Thu Nov 27 11:14:43 2008 -0800 summary: Fix test breakage introduced in 07faba78cf5a http://hg.intevation.org/mercurial/crew/rev/7dd44ad43914 changeset: 7439:7dd44ad43914 user: Brendan Cully kublai.com> date: Thu Nov 27 11:05:50 2008 -0800 summary: Ignore eclipse droppings http://hg.intevation.org/mercurial/crew/rev/b80b944836ec changeset: 7438:b80b944836ec user: Brendan Cully kublai.com> date: Thu Nov 27 11:04:29 2008 -0800 summary: Add hgcia to hgext http://hg.intevation.org/mercurial/crew/rev/3cdaac732b2b changeset: 7437:3cdaac732b2b user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 18:46:45 2008 +0100 summary: tests: fix test results for 07faba78cf5a http://hg.intevation.org/mercurial/crew/rev/07faba78cf5a changeset: 7436:07faba78cf5a user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 17:00:54 2008 +0100 summary: diff: fix obscure off-by-one error in diff -p http://hg.intevation.org/mercurial/crew/rev/5e13df32fb74 changeset: 7435:5e13df32fb74 user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 16:07:17 2008 +0100 summary: bundlerepo doesn't really have a dirstate, throw AttributeError if requested http://hg.intevation.org/mercurial/crew/rev/cf7741aa1e96 changeset: 7434:cf7741aa1e96 user: Dirkjan Ochtman ochtman.nl> date: Thu Nov 27 16:07:13 2008 +0100 summary: kill some trailing spaces http://hg.intevation.org/mercurial/crew/rev/c4ce828e8074 changeset: 7433:c4ce828e8074 parent: 7432:df0962f6c54e parent: 7426:642754e776e2 user: Benoit Boissinot ens-lyon.org> date: Thu Nov 27 01:35:12 2008 +0100 summary: merge with mpm http://hg.intevation.org/mercurial/crew/rev/642754e776e2 changeset: 7426:642754e776e2 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 01:10:27 2008 +0100 summary: rpm spec: include python egg in rpm http://hg.intevation.org/mercurial/crew/rev/3d827cc616b6 changeset: 7425:3d827cc616b6 user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 01:09:11 2008 +0100 summary: buildrpm: complain when hg command isn't available http://hg.intevation.org/mercurial/crew/rev/f0a3e87c810d changeset: 7424:f0a3e87c810d user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:32 2008 +0100 summary: util: use existing never() instead of custom lambda http://hg.intevation.org/mercurial/crew/rev/dbc40381620e changeset: 7423:dbc40381620e user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:31 2008 +0100 summary: tests: Skip tests if they will fail because of outer repo http://hg.intevation.org/mercurial/crew/rev/fdcde929ce4f changeset: 7422:fdcde929ce4f user: Mads Kiilerich kiilerich.com> date: Thu Nov 27 00:57:30 2008 +0100 summary: tests: use killdaemons in hgweb tests http://hg.intevation.org/mercurial/crew/rev/f21e3d0e335b changeset: 7421:f21e3d0e335b user: Patrick Mezard gmail.com> date: Wed Nov 26 22:27:37 2008 +0100 summary: util_win32: fix Windows version checking (issue1358)

excanvas.js obfuscated

TK Soh — 2008-11-30T03:38:56

I try to take a look at excanvas.js. Unlike other java scripts in mercurial's repo, this one is completely obfuscated. Any reasons for this?

[issue1403] add support to new rebase extension for handlingconcatenating changesets usecase

Faheem Mitha — 2008-11-29T19:18:09

New submission from Faheem Mitha email.unc.edu>: Hi, Someone on IRC (I think pmezard) said the functionality in http://www.selenic.com/mercurial/wiki/index.cgi/ConcatenatingChangesets could be folded into the new rebase extension. Since this is a regularly used feature, I'm submitting a feature request for this. If it is not possible to do this, feel free to close this issue. Regards, Faheem. ---------- messages: 8021 nosy: astratto, brendan, faheem, pmezard, tonfa priority: feature status: unread title: add support to new rebase extension for handling concatenating changesets usecase topic: rebase ____________________________________________________ Mercurial issue tracker selenic.com> ____________________________________________________

mercurial/crew< at >7444: 18 outgoing changesets

Mercurial Commits — 2008-11-29T12:00:07