Sat, 03 Jul 2010 02:15:25 +0200 mergetools.hgrc: add vimdiff
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:15:25 +0200] rev 11506
mergetools.hgrc: add vimdiff Imported from deb_specific__mergetools patch in Debians patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Sat, 03 Jul 2010 02:06:07 +0200 Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:06:07 +0200] rev 11505
Merge with stable
Sat, 03 Jul 2010 01:56:09 +0200 zeroconf: small fixes in docstring stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:56:09 +0200] rev 11504
zeroconf: small fixes in docstring Use reST role for consistency, import small part of Debian's proposed_upstream__correct-zeroconf-doc patch from http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Sat, 03 Jul 2010 02:03:55 +0200 hgweb: add link to wiki stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:03:55 +0200] rev 11503
hgweb: add link to wiki
Sat, 03 Jul 2010 01:48:50 +0200 hgweb.wsgi: add a URL to the corresponding wiki documentation stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:48:50 +0200] rev 11502
hgweb.wsgi: add a URL to the corresponding wiki documentation Imported for_upstream__add_doc_url_in_example_files.patch from Debian's patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Thu, 01 Jul 2010 19:27:03 -0300 churn: remove tuple parameter unpacking (deprecated in py3k)
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11501
churn: remove tuple parameter unpacking (deprecated in py3k)
Thu, 01 Jul 2010 19:27:03 -0300 record: removed 'reduce' calls (unsupported by py3k)
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11500
record: removed 'reduce' calls (unsupported by py3k) Quoting python's documentation, "Note that sum(range(n), m) is equivalent to reduce(operator.add, range(n), m)". The "sum" function is a builtin from 2.3 on and there's no reason for not to use it.
Thu, 01 Jul 2010 19:27:03 -0300 record: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11499
record: tuple parameter unpacking is deprecated in py3k
Thu, 01 Jul 2010 19:27:02 -0300 convert: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11498
convert: tuple parameter unpacking is deprecated in py3k
Thu, 01 Jul 2010 19:27:02 -0300 revlog: Marked classic int divisions as such.
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11497
revlog: Marked classic int divisions as such.
Fri, 02 Jul 2010 11:41:43 +0200 Merge with stable (again)
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:41:43 +0200] rev 11496
Merge with stable (again)
Wed, 30 Jun 2010 17:23:16 +0200 debugger: give a little intro before entering pdb
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:23:16 +0200] rev 11495
debugger: give a little intro before entering pdb
Wed, 30 Jun 2010 17:20:42 +0200 debugger: show traceback before entering pdb post-mortem
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:20:42 +0200] rev 11494
debugger: show traceback before entering pdb post-mortem
Fri, 02 Jul 2010 11:30:57 +0200 Merge with stable
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:30:57 +0200] rev 11493
Merge with stable
Thu, 01 Jul 2010 19:13:23 -0500 wix: generate a new GUID for the help folder stable
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 19:13:23 -0500] rev 11492
wix: generate a new GUID for the help folder A GUID change is recommended after changes like 159233cc9c14
Thu, 01 Jul 2010 12:53:37 -0500 wix: pick up new help topics added between 1.5 and 1.6 stable
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 12:53:37 -0500] rev 11491
wix: pick up new help topics added between 1.5 and 1.6 These files are not included the 1.6.0 installer, but will be picked up by nightly builds as soon as this makes it to the stable branch.
Thu, 01 Jul 2010 12:06:31 -0500 Added signature for changeset f786fc4b8764 stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:31 -0500] rev 11490
Added signature for changeset f786fc4b8764
Thu, 01 Jul 2010 12:06:30 -0500 Added tag 1.6 for changeset f786fc4b8764 stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:30 -0500] rev 11489
Added tag 1.6 for changeset f786fc4b8764
Tue, 29 Jun 2010 12:12:34 +0200 log: follow filenames through renames (issue647) stable 1.6
Mads Kiilerich <mads@kiilerich.com> [Tue, 29 Jun 2010 12:12:34 +0200] rev 11488
log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.
Thu, 01 Jul 2010 13:26:08 -0300 i18n-pt_BR: synchronized with d3c3e2fdeb0c stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Jul 2010 13:26:08 -0300] rev 11487
i18n-pt_BR: synchronized with d3c3e2fdeb0c
Thu, 01 Jul 2010 11:22:56 -0500 commit: add missing _() stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:22:56 -0500] rev 11486
commit: add missing _()
Thu, 01 Jul 2010 11:20:13 -0500 subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:20:13 -0500] rev 11485
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Thu, 01 Jul 2010 11:20:08 -0500 Merge with i18n stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:20:08 -0500] rev 11484
Merge with i18n
Thu, 01 Jul 2010 15:25:29 +0200 i18n-da: translated eol extension and various small strings stable
Martin Geisler <mg@aragost.com> [Thu, 01 Jul 2010 15:25:29 +0200] rev 11483
i18n-da: translated eol extension and various small strings
Wed, 30 Jun 2010 13:03:48 +0900 i18n-ja: synchronized with 13d02d6677f2 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jun 2010 13:03:48 +0900] rev 11482
i18n-ja: synchronized with 13d02d6677f2
Tue, 29 Jun 2010 12:27:08 -0300 i18n-pt_BR: synchronized with 59af1d65029c stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Jun 2010 12:27:08 -0300] rev 11481
i18n-pt_BR: synchronized with 59af1d65029c
Tue, 29 Jun 2010 12:18:42 -0300 merge with stable stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Jun 2010 12:18:42 -0300] rev 11480
merge with stable
Tue, 29 Jun 2010 09:11:55 +0200 i18n-sv: synchronized with 13d02d6677f2 stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 29 Jun 2010 09:11:55 +0200] rev 11479
i18n-sv: synchronized with 13d02d6677f2
Sat, 26 Jun 2010 21:37:10 -0300 i18n-pt_BR: synchronized with 9fa255c32406 stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Jun 2010 21:37:10 -0300] rev 11478
i18n-pt_BR: synchronized with 9fa255c32406
Sat, 26 Jun 2010 21:29:39 -0300 Merge with stable stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Jun 2010 21:29:39 -0300] rev 11477
Merge with stable
Wed, 23 Jun 2010 17:54:59 -0300 i18n-pt_BR: glossary.txt translation stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 23 Jun 2010 17:54:59 -0300] rev 11476
i18n-pt_BR: glossary.txt translation
Wed, 23 Jun 2010 09:33:28 +0200 i18n-sv: output from 'hg' is once again fully Swedish stable
Jens Bäckman <jens.backman@gmail.com> [Wed, 23 Jun 2010 09:33:28 +0200] rev 11475
i18n-sv: output from 'hg' is once again fully Swedish
Wed, 23 Jun 2010 09:10:54 +0200 i18n-sv: synchronized with 469a48dff18b stable
Jens Bäckman <jens.backman@gmail.com> [Wed, 23 Jun 2010 09:10:54 +0200] rev 11474
i18n-sv: synchronized with 469a48dff18b
Tue, 22 Jun 2010 21:13:18 -0300 i18n-pt_BR: synchronized with 2186124f08e4 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 22 Jun 2010 21:13:18 -0300] rev 11473
i18n-pt_BR: synchronized with 2186124f08e4
Tue, 22 Jun 2010 20:48:48 -0300 Merge with stable stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 22 Jun 2010 20:48:48 -0300] rev 11472
Merge with stable
Tue, 22 Jun 2010 09:43:07 +0200 i18n-sv: synchronized with 4d03c3680400 stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 22 Jun 2010 09:43:07 +0200] rev 11471
i18n-sv: synchronized with 4d03c3680400
Wed, 30 Jun 2010 23:56:35 -0500 subrepo: correctly handle update -C with modified subrepos (issue2022) stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Jun 2010 23:56:35 -0500] rev 11470
subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)
Wed, 30 Jun 2010 18:15:23 -0500 http: deliver hook output to client stable
Maxim Khitrov <mkhitrov@gmail.com> [Wed, 30 Jun 2010 18:15:23 -0500] rev 11469
http: deliver hook output to client
Wed, 23 Jun 2010 13:44:07 +0200 setup: ignore failures to build optional inotify extension stable
Christian Boos <cboos@neuf.fr> [Wed, 23 Jun 2010 13:44:07 +0200] rev 11468
setup: ignore failures to build optional inotify extension
Wed, 30 Jun 2010 17:44:36 -0500 revset: make negate work for sort specs stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Jun 2010 17:44:36 -0500] rev 11467
revset: make negate work for sort specs
Wed, 30 Jun 2010 17:34:20 -0500 update: synchronize permissions in the dirstate (issue1473) stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Jun 2010 17:34:20 -0500] rev 11466
update: synchronize permissions in the dirstate (issue1473) fix by Benoit, updated by mpm to not affect all clean files
Thu, 24 Jun 2010 15:18:47 +0100 heads: fix templating of headers again (issue2130) stable
Simon Howkins <simonh@symbian.org> [Thu, 24 Jun 2010 15:18:47 +0100] rev 11465
heads: fix templating of headers again (issue2130) (tweaks and test by mpm)
Wed, 30 Jun 2010 12:44:58 +0900 minirst: use unicode string as intermediate form for replacement stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jun 2010 12:44:58 +0900] rev 11464
minirst: use unicode string as intermediate form for replacement Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences.
Tue, 29 Jun 2010 17:30:42 -0500 subrepo: fix recording of + in .hgsubstate (issue2217) stable
Matt Mackall <mpm@selenic.com> [Tue, 29 Jun 2010 17:30:42 -0500] rev 11463
subrepo: fix recording of + in .hgsubstate (issue2217)
Tue, 29 Jun 2010 03:09:42 +0530 mq: qimport cleanup on fail (issue2214) stable
Vishakh H <vsh426@gmail.com> [Tue, 29 Jun 2010 03:09:42 +0530] rev 11462
mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.
Mon, 28 Jun 2010 23:23:55 +0200 test-acl: don't use $PWD stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 23:23:55 +0200] rev 11461
test-acl: don't use $PWD solaris ....
Mon, 28 Jun 2010 23:16:11 +0200 test-alias: don't use the environment variable PWD stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 23:16:11 +0200] rev 11460
test-alias: don't use the environment variable PWD solaris ...
Mon, 28 Jun 2010 15:08:01 +0200 revert: Make it clearer when not to use revert stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 28 Jun 2010 15:08:01 +0200] rev 11459
revert: Make it clearer when not to use revert
Sun, 27 Jun 2010 22:20:47 -0500 progress: check stderr.isatty() before each print stable
Augie Fackler <durin42@gmail.com> [Sun, 27 Jun 2010 22:20:47 -0500] rev 11458
progress: check stderr.isatty() before each print This prevents writing progress information to a non-tty stderr if one is swapped in after startup, which happens in `hg serve`.
Sat, 26 Jun 2010 23:00:58 +0200 http digest auth: reset redirect counter on new requests (issue2255) stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 26 Jun 2010 23:00:58 +0200] rev 11457
http digest auth: reset redirect counter on new requests (issue2255) This fixes a regression introduced in a1e575b48563 when Mercurial reuses the auth handler for several requests and the redirect counter never is reset.
Mon, 28 Jun 2010 11:07:27 -0500 revset: deal with empty sets in range endpoints stable
Matt Mackall <mpm@selenic.com> [Mon, 28 Jun 2010 11:07:27 -0500] rev 11456
revset: deal with empty sets in range endpoints (spotted by Julian Cowley <julian@lava.net>)
Sun, 27 Jun 2010 18:20:49 -0500 subrepo: fix silent push failure for SVN (issue2241) stable
Matt Mackall <mpm@selenic.com> [Sun, 27 Jun 2010 18:20:49 -0500] rev 11455
subrepo: fix silent push failure for SVN (issue2241)
Fri, 18 Jun 2010 08:49:24 +0200 merge: pass constant cset ancestor to fctx.ancestor stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 18 Jun 2010 08:49:24 +0200] rev 11454
merge: pass constant cset ancestor to fctx.ancestor
Fri, 18 Jun 2010 08:48:05 +0200 context: allow passing the common cset ancestor to fctx.ancestor stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 18 Jun 2010 08:48:05 +0200] rev 11453
context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.
Sun, 27 Jun 2010 17:41:43 -0500 merge: document how to 'undo' a merge stable
Matt Mackall <mpm@selenic.com> [Sun, 27 Jun 2010 17:41:43 -0500] rev 11452
merge: document how to 'undo' a merge
Sun, 27 Jun 2010 23:12:05 +0200 resolve: do not crash on empty mergestate stable
Martin Geisler <mg@lazybytes.net> [Sun, 27 Jun 2010 23:12:05 +0200] rev 11451
resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.
(0) -10000 -3000 -1000 -300 -100 -56 +56 +100 +300 +1000 +3000 +10000 +30000 tip