Thu, 03 Nov 2011 12:58:30 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 12:58:30 -0500] rev 15411
merge with stable
Wed, 02 Nov 2011 01:17:11 -0400 add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us> [Wed, 02 Nov 2011 01:17:11 -0400] rev 15410
add: support adding explicit files in subrepos Change the behavior of the add command such that explicit paths in subrepos are always added. This eliminates the previous behavior where if you called "hg add" for an explicit path in a subrepo without specifying the -S option, it would be silently ignored. If you specify patterns, or no arguments at all, the -S option will still be needed to activate recursion into subrepos.
Tue, 01 Nov 2011 23:53:29 -0400 tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us> [Tue, 01 Nov 2011 23:53:29 -0400] rev 15409
tests: add test for add of explicit path in subrepo Add test coverage for the existing behavior where adds of explicit paths in subrepos are silently ignored. This is in preparation for changing the behavior of the add command to have better support for subrepos.
Thu, 03 Nov 2011 10:59:32 -0400 largefiles: ensure destination directory exists before findfile links to there stable
Hao Lian <hao@fogcreek.com> [Thu, 03 Nov 2011 10:59:32 -0400] rev 15408
largefiles: ensure destination directory exists before findfile links to there When (1) findfile links a largefile from the user cache to the store and (2) the store directory doesn't exist yet, findfile errors out. A simple call to util.makedirs fixes it.
Thu, 03 Nov 2011 11:24:55 -0500 misc: adding missing file close() calls stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 11:24:55 -0500] rev 15407
misc: adding missing file close() calls Spotted by Victor Stinner <victor.stinner@haypocalc.com>
Thu, 20 Oct 2011 00:37:34 +0200 bisect: remove superfluous parameter in label()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Thu, 20 Oct 2011 00:37:34 +0200] rev 15406
bisect: remove superfluous parameter in label() The argument is not used. This is a left-over of non-published iterations, and it passed through. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed, 02 Nov 2011 15:06:40 -0500 log: hide some low-utility options
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2011 15:06:40 -0500] rev 15405
log: hide some low-utility options
Wed, 02 Nov 2011 13:51:16 -0500 localrepo: convert various repo.set() users to repo.revs()
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2011 13:51:16 -0500] rev 15404
localrepo: convert various repo.set() users to repo.revs()
Wed, 02 Nov 2011 13:37:34 -0500 localrepo: add revs helper method
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2011 13:37:34 -0500] rev 15403
localrepo: add revs helper method
Tue, 01 Nov 2011 16:49:30 -0500 merge with stable, reopen default branch
Matt Mackall <mpm@selenic.com> [Tue, 01 Nov 2011 16:49:30 -0500] rev 15402
merge with stable, reopen default branch
Tue, 01 Nov 2011 15:37:00 -0500 Added signature for changeset 41453d55b481 stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Nov 2011 15:37:00 -0500] rev 15401
Added signature for changeset 41453d55b481
Tue, 01 Nov 2011 15:36:56 -0500 Added tag 2.0 for changeset 41453d55b481 stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Nov 2011 15:36:56 -0500] rev 15400
Added tag 2.0 for changeset 41453d55b481
Tue, 01 Nov 2011 15:19:37 -0500 dirstate: don't fail when dropping a not-tracked file (issue3080) stable 2.0
Matt Mackall <mpm@selenic.com> [Tue, 01 Nov 2011 15:19:37 -0500] rev 15399
dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.
Tue, 01 Nov 2011 12:25:54 -0700 tests: fix readline escape characters in heredoctest.py/test-url.py stable
Brodie Rao <brodie@bitheap.org> [Tue, 01 Nov 2011 12:25:54 -0700] rev 15398
tests: fix readline escape characters in heredoctest.py/test-url.py This fix mirrors the changes made to test-doctest.py in b856071435f7 and 967adcf5910d. Without this change, tests running heredoctest.py can fail on certain versions of OS X when TERM is set to xterm-256color: $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF > >>> open('b', 'w').write('this' * 1000) > EOF + \x1b[?1034h (no-eol) (esc) A similar problem occurs with test-url.py: $ ./run-tests.py test-url.py --- .../tests/test-url.py.out +++ .../tests/test-url.py.err @@ -0,0 +1 @@ + ERROR: .../test-url.py output changed ! Failed test-url.py: output changed # Ran 1 tests, 0 skipped, 1 failed.
Tue, 01 Nov 2011 12:49:06 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Nov 2011 12:49:06 -0500] rev 15397
merge with i18n
Mon, 31 Oct 2011 11:27:16 -0200 i18n-pt_BR: synchronized with a53888685a6c stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 31 Oct 2011 11:27:16 -0200] rev 15396
i18n-pt_BR: synchronized with a53888685a6c
Mon, 31 Oct 2011 11:24:37 -0200 merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 31 Oct 2011 11:24:37 -0200] rev 15395
merge with i18n
Mon, 31 Oct 2011 20:58:49 +0900 i18n-ja: synchronized with b357a972d6cd stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Oct 2011 20:58:49 +0900] rev 15394
i18n-ja: synchronized with b357a972d6cd
Mon, 31 Oct 2011 21:06:18 +0900 minirst: use unicode string as intermediate form for replacement stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Oct 2011 21:06:18 +0900] rev 15393
minirst: use unicode string as intermediate form for replacement # this change redones part of 521c8e0c93bf, backed out by 0ad0ebe67815 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. [mpm: test changed to simple doctest]
Mon, 31 Oct 2011 15:41:39 -0500 util: add a doctest for empty sha() calls stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 15:41:39 -0500] rev 15392
util: add a doctest for empty sha() calls
Thu, 20 Oct 2011 17:24:59 -0400 largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp stable
Hao Lian <hao@fogcreek.com> [Thu, 20 Oct 2011 17:24:59 -0400] rev 15391
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp This is consistent with the rest of Mercurial's code, mirroring the try-finally-unlink structure elsewhere. Furthermore, it fixes the case where largefiles throws an IOError on Windows when the temporary file is opened a second time by copytocacheabsolute. This patch creates the temporary file in the repo's largefiles store rather than /tmp, which might be a different filesystem.
Mon, 31 Oct 2011 14:22:11 -0500 util: allow sha1() with no args stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 14:22:11 -0500] rev 15390
util: allow sha1() with no args Normally this works because we replace util.sha1 with hashlib.sha1 after first use, but if the first user doesn't provide an arg, it breaks.
Mon, 31 Oct 2011 14:22:11 -0500 tests: use md5sum.py instead of sha1sum, add check stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 14:22:11 -0500] rev 15389
tests: use md5sum.py instead of sha1sum, add check
Mon, 31 Oct 2011 00:42:32 +0900 setup: set whole env for running hg even if .hg doesn't exist (issue3073) stable
Yuya Nishihara <yuya@tcha.org> [Mon, 31 Oct 2011 00:42:32 +0900] rev 15388
setup: set whole env for running hg even if .hg doesn't exist (issue3073) The issue was partially fixed by b357a972d6cd, but there were missing variables to run build_hgextindex.
Sun, 30 Oct 2011 12:10:11 -0500 keyword: backout realpath change (issue3071) stable
Matt Mackall <mpm@selenic.com> [Sun, 30 Oct 2011 12:10:11 -0500] rev 15387
keyword: backout realpath change (issue3071)
Sun, 30 Oct 2011 12:10:09 -0500 strip: backout 73307643a09f (issue3077) stable
Matt Mackall <mpm@selenic.com> [Sun, 30 Oct 2011 12:10:09 -0500] rev 15386
strip: backout 73307643a09f (issue3077)
Sat, 29 Oct 2011 17:38:13 -0500 largefiles: avoid checking requirements on every command stable
Matt Mackall <mpm@selenic.com> [Sat, 29 Oct 2011 17:38:13 -0500] rev 15385
largefiles: avoid checking requirements on every command When largefiles is enabled, commands on large repositories which don't require largefiles could be slowed down substantially. Disable checking this for every command.
Fri, 28 Oct 2011 18:50:54 +0200 largefiles: shorten test suite by using log --template stable
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:50:54 +0200] rev 15384
largefiles: shorten test suite by using log --template
Fri, 28 Oct 2011 18:48:24 +0200 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on stable
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:48:24 +0200] rev 15383
largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Fri, 28 Oct 2011 18:17:44 +0200 largefiles: test that a largefile cannot accidentally be re-added as a regular file stable
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:17:44 +0200] rev 15382
largefiles: test that a largefile cannot accidentally be re-added as a regular file
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip