http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19309 New submission from Stepan Koltsov <yozh< at >mx1.ru>: hg log outputs: === changeset: 887:bd3da2ce3610 branch: r2199-all tag: tip parent: 885:dd0fed14aec7 parent: 886:a18d4114c86b user: Stepan Koltsov <stepancheg< at >yandex-team.ru> date: Wed Dec 03 22:02:38 2008 +0300 summary: merge r2199-debian (ccache as dependency) === 885 comes from branch r2199-all 886 comes from branch r2199-debian Output should be something like this: === changeset: 887:bd3da2ce3610 branch: r2199-all tag: tip parent: 885:dd0fed14aec7 (r2199-all) parent: 886:a18d4114c86b (r2199-debian) user: Stepan Koltsov <stepancheg< at >yandex-team.ru> date: Wed Dec 03 22:02:38 2008 +0300 summary: merge r2199-debian (ccache as dependency) === Note branch name at the end of "parent:" lines. ---------- messages: 8059 nosy: yozh priority: wish status: unread title: hg log should show parent changeset branches ____________________________________________________ Mercurial Stepan Koltsov 2008-12-03T19:37:18 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19308 New submission from david priest <davidp< at >meyersound.com>: Testing against basestring permits use of unicode path names as well as ascii. See hg.py line 117 (def clone) for example of isinstance bug. ---------- messages: 8055 nosy: davidp priority: bug status: unread title: isinstance(source, str) should be isinstance(source, basestring) ____________________________________________________ Mercurial issue tracker <mercurial-bugs< at >selenic.com> <http://www.selenic.com/mercurial/bts/issue1413> ____________________________________________________ david priest 2008-12-03T18:56:55 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19307 New submission from Brodie Rao <dackze< at >gmail.com>: Right now, running "make install" on OS X 10.5 with Apple's distribution of Python correctly installs scripts and external data into /usr/local, but incorrectly installs the Mercurial Python package into /usr/local/lib/python2.5/site-packages, instead of /Library/Python/2.5/site-packages, presenting the user with an ImportErorr when they run hg. This also probably affects 10.4 and Python 2.3, and the python.org distribution. A solution would have to involve either not passing --prefix to setup.py, or passing the correct --install-lib. Perhaps the Makefile could invoke python -c [get default install lib], check to see if it doesn't start with /usr, and if it doesn't, pass it with --install-lib to setup.py. ---------- messages: 8054 nosy: brodie priority: bug status: unread title: make install on Mac OS X installs into an invalid site-packages topic: macos, surprise ____________________________________________________ Mercurial issue tracker <mercurial-bu Brodie Rao 2008-12-03T18:48:23 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19306 New submission from Akira Kitada <akitada< at >gmail.com>: When building Mercurial 1.1 on FreeBSD 4.11 with gcc 2.95.4, I got the following warnings. In file included from mercurial/bdiff.c:40: /usr/include/arpa/inet.h:89: warning: parameter has incomplete type /usr/include/arpa/inet.h:92: warning: parameter has incomplete type /usr/include/arpa/inet.h:96: warning: parameter has incomplete type In file included from mercurial/mpatch.c:58: /usr/include/arpa/inet.h:89: warning: parameter has incomplete type /usr/include/arpa/inet.h:92: warning: parameter has incomplete type /usr/include/arpa/inet.h:96: warning: parameter has incomplete type In file included from mercurial/parsers.c:157: /usr/include/arpa/inet.h:89: warning: parameter has incomplete type /usr/include/arpa/inet.h:92: warning: parameter has incomplete type /usr/include/arpa/inet.h:96: warning: parameter has incomplete type ---------- messages: 8049 nosy: akitada priority: bug status: unread title: /usr/include/arpa/inet.h:89: warning: parameter Akira Kitada 2008-12-03T16:24:27 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19305 New submission from Akira Kitada <akitada< at >gmail.com>: $ make local "Makefile", line 2: Need an operator make: fatal errors encountered -- cannot continue If I removed "export PREFIX" (line 2), BSD Make works fine. ---------- messages: 8048 nosy: akitada priority: wish status: unread title: cannot build Mercurial with BSD Make ____________________________________________________ Mercurial issue tracker <mercurial-bugs< at >selenic.com> <http://www.selenic.com/mercurial/bts/issue1410> ____________________________________________________ Akira Kitada 2008-12-03T16:21:30 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19304 New submission from Rune Halvorsen <runefh< at >gmail.com>: The system wide mercurial.ini, C:\Program Files\Mercurial, is not used by mercurial in the 1.1 binary distribution. That is, the file does not seem to be read at all. ---------- messages: 8046 nosy: runeh priority: bug status: unread title: Win32 Mercurial 1.1 binary distribution does not honor system wide mercurial.ini topic: windows ____________________________________________________ Mercurial issue tracker <mercurial-bugs< at >selenic.com> <http://www.selenic.com/mercurial/bts/issue1409> ____________________________________________________ Rune Halvorsen 2008-12-03T16:11:56 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19303 New submission from Petr Kodl <petrkodl< at >gmail.com>: The Win32 installer for 1.1 seems to be build on machine without Win32 extensions installed - as a result hardlinking would not work and .ini file search reverts to a hardcoded c:\mercurial\mercurial.ini. With Win32 extension installed everything works fine. ---------- messages: 8044 nosy: pko priority: bug status: unread title: official binary distribution of Mercurial 1.1 on Win32 built without Win32 extensions ____________________________________________________ Mercurial issue tracker <mercurial-bugs< at >selenic.com> <http://www.selenic.com/mercurial/bts/issue1408> ____________________________________________________ Petr Kodl 2008-12-03T14:57:58 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19302 Outgoing changeset in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/3a829f29d1e2 changeset: 7464:3a829f29d1e2 tag: tip user: Benoit Boissinot <benoit.boissinot< at >ens-lyon.org> date: Wed Dec 03 01:28:33 2008 +0100 summary: re-add +x bit for test-convert-darcs (was missing from 14ed6662af48) Mercurial Commits 2008-12-03T12:00:40 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19301 Outgoing changeset in mercurial/crew-stable: http://hg.intevation.org/mercurial/crew-stable/rev/3a829f29d1e2 changeset: 7464:3a829f29d1e2 tag: tip user: Benoit Boissinot <benoit.boissinot< at >ens-lyon.org> date: Wed Dec 03 01:28:33 2008 +0100 summary: re-add +x bit for test-convert-darcs (was missing from 14ed6662af48) Mercurial Commits 2008-12-03T12:00:30 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19300 New submission from Joerg Sonnenberger <joerg< at >bec.de>: The book mentions .hgignore in two places, but doesn't explain or index it otherwise. Coming from a different VCS, it can be guessed, but for new users it is likely hard to find. This is likely the missing content of section 7.6 ---------- assignedto: djc messages: 8043 nosy: djc, joerg priority: wish status: unread title: .hgignore should be explained in the book topic: documentation ____________________________________________________ Mercurial issue tracker <mercurial-bugs< at >selenic.com> <http://www.selenic.com/mercurial/bts/issue1407> ____________________________________________________ Joerg Sonnenberger 2008-12-03T10:32:30 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19299 Patrick Mezard a écrit : Here is an update on Augie initial proposal. I am not completely happy with passing the extrafn callback as a rebase() keyword argument but this is the simpler solution short of splitting rebase() into a CLI entry point and an API dedicated call. Tell me if you prefer the second option. If this is accepted, I'd like it to go in 1.1.1, this feature is blocking svn branches rebasing IIRC. -- Patrick Mézard Patrick Mézard 2008-12-03T08:44:55 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19298 # HG changeset patch # User Augie Fackler <durin42< at >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 <pmezard< at >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(r Patrick Mezard 2008-12-02T22:04:44 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19297 Benoît Allard wrote: It is similar, but consider the branches that I have screenshotted at http://phparadox.com/ss/branches.png - it is possible to have an entire page with no changesets against a branch, so the branch name never appears. In this case, it's the purple branch. I guess the rational is that, because the colours are chosen randomly and can change between changesets, you can never learn to associate a colour with a particular branch. With my change you can at least have a quick reference between the colours and name available at all times. Lindsey Smith 2008-12-02T23:32:56 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19296 905 new changesets in hg-stable: changeset: 6559:0231f763ebc8 parent: 6388:1e4ddc9ac9f7 user: Bryan O'Sullivan <bos< at >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 <mpm< at >selenic.com> date: Tue Dec 02 13:06:18 2008 -0600 summary: Added signature for changeset 2a67430f92f1 Mercurial Commits 2008-12-02T22:31:28 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19295 9 new changesets in mercurial: http://www.selenic.com/hg/rev/c9fd5474a707 changeset: 7455:c9fd5474a707 user: Brodie Rao <me+hg< at >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 <me+hg< at >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 <georg< at >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 <durin42< at >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 <me+hg< at >dackz.net> date: Mercurial Commits 2008-12-02T22:15:45 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19294 I reworked them a bit, it will soon be pushed to crew, now. thanks, Benoit Benoit Boissinot 2008-12-02T18:35:28 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19293 4 new changesets in mercurial: http://www.selenic.com/hg/rev/fca9947652ce changeset: 7451:fca9947652ce user: Brendan Cully <brendan< at >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 <brendan< at >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 <brendan< at >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 <brendan< at >kublai.com> date: Mon Dec 01 20:10:02 2008 -0800 summary: mq: filter out empty commit messages in qfold Mercurial Commits 2008-12-02T18:15:41 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19292 Berkes Adam 2008-12-02T17:29:51 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19291 Peter Ruibal 2008-12-02T16:49:57 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19290 New submission from edgimar <edgimar< at >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 <mercurial-bugs< at >selenic.com> <http://www.selenic.com/mercurial/bts/issue1406> ____________________________________________________ edgimar 2008-12-02T14:53:14 http://permalink.gmane.org/gmane.comp.version-control.mercurial.devel/19289 # HG changeset patch # User Christian Ebert <blacktrash< at >gmx.net> # Date 1228228308 -3600 # Node ID 5d2fa3d118993a4420348c5ae0a9b178fa1a21e5 # Parent 23f19b44a35c99542c6b18e852075c6c16b6288d 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 Christian Ebert 2008-12-02T14:37:53 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.version-control.mercurial.devel