Wed, 15 Feb 2012 17:30:21 -0500 phases: fix a non-standard debug message stable
Greg Ward <greg@gerg.ca> [Wed, 15 Feb 2012 17:30:21 -0500] rev 16293
phases: fix a non-standard debug message - add missing newline - ditch gratuitous use of string formatting with dict - fix so it actually does string formatting ('%' rather than ',') - inline unnecessary local variable - downcase first word
Sat, 24 Mar 2012 22:13:17 -0500 convert/git: abort if git submodules are detected (issue2150) stable
Augie Fackler <durin42@gmail.com> [Sat, 24 Mar 2012 22:13:17 -0500] rev 16292
convert/git: abort if git submodules are detected (issue2150) This improves the error message when convert encounters a git submodule. Now, instead of a git-cat-file error, we'll directly report the lack of support for git submodules.
Tue, 27 Mar 2012 14:37:17 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:37:17 -0500] rev 16291
merge with stable
Sat, 24 Mar 2012 12:06:49 +0100 qfinish: comply with the phases.new-commit option in secret mode (issue3335) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 24 Mar 2012 12:06:49 +0100] rev 16290
qfinish: comply with the phases.new-commit option in secret mode (issue3335) In secret mode qfinished changeset were move to the draft phase in all case[1] without regard to phases.new-commit value This changeset ensure qfinish does not automatically promote a changeset further than the phases.new-commit value. Note: This may also result in qfinished changeset made public if phases.new-commit is set to public. [1] "In all case" where parent have a compatible phase. Qfinish keep never altering phases of changeset not involved in the qfinish.
Wed, 21 Mar 2012 22:16:12 -0400 test-gpg: make sure gpg does not modify the trustdb.gpg file stable
Greg Ward <greg@gerg.ca> [Wed, 21 Mar 2012 22:16:12 -0400] rev 16289
test-gpg: make sure gpg does not modify the trustdb.gpg file Tests really should not modify files in the Mercurial working dir where they ran from! I suspect that trustdb.gpg is now old enough that GPG thinks it should update it automatically. Suppress that feature with --no-auto-check-trustdb.
Tue, 27 Mar 2012 13:57:54 -0500 tests: remove case-folding false positive stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 13:57:54 -0500] rev 16288
tests: remove case-folding false positive
Tue, 27 Mar 2012 14:35:58 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Mar 2012 14:35:58 -0500] rev 16287
merge with i18n
Tue, 27 Mar 2012 20:37:52 +0900 i18n-ja: synchronized with 900eee0778d1 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 27 Mar 2012 20:37:52 +0900] rev 16286
i18n-ja: synchronized with 900eee0778d1
Mon, 26 Mar 2012 16:42:53 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 26 Mar 2012 16:42:53 -0500] rev 16285
merge with stable
Mon, 26 Mar 2012 16:41:54 -0500 merge: fix unknown file merge detection for case-folding systems
Matt Mackall <mpm@selenic.com> [Mon, 26 Mar 2012 16:41:54 -0500] rev 16284
merge: fix unknown file merge detection for case-folding systems This was triggering some test failures on Mac.
Fri, 23 Mar 2012 11:47:27 -0500 rename: handle case-changing (issue1717) stable
Matt Mackall <mpm@selenic.com> [Fri, 23 Mar 2012 11:47:27 -0500] rev 16283
rename: handle case-changing (issue1717)
Thu, 22 Mar 2012 23:58:47 +0900 largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 22 Mar 2012 23:58:47 +0900] rev 16282
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check original implementation queries whether specified pattern is related or not to largefiles in target context by 'dirstate.__contains__()'. but this can't recognize 'directory pattern' correctly, so this patch uses 'dirstate.dirs()' for it. this patch uses dirstate instead of lfdirstate in 'working' route (second patch hunk for 'hgext/largefiles/reposetup.py'), because 'dirs()' information may be already built for dirstate but not yet for lfdirstate at this point. this prevents lfdirstate from building up and having 'dirs()' information.
Thu, 22 Mar 2012 23:58:47 +0900 largefiles: suppress unexpected warning of 'hg status' for removed files stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 22 Mar 2012 23:58:47 +0900] rev 16281
largefiles: suppress unexpected warning of 'hg status' for removed files original implementation queries whether specified pattern is related or not to largefiles, to target context. but changectx/workingctx returns False about relationship with files marked as removed. So, 'hg status' with 'file pattern' for removed file shows unexpected warning message in below process: 1. 'tostandin()' returns non-STANDIN filename for removed file, because changectx/workingctx returns False about relationship with it 2. 'match.files()' contains non-STANDIN filename, which is already removed from working directory 3. 'dirstate.walk()' invoked via 'localrepository.status()' treats non-STANDIN filename as bad filename, because there is no entry for it in dirstate: only STANDIN is managed in dirstate 4. 'dirstate.walk()' invokes 'match.bad()', which is defined in 'localrepository.status()' as 'bad()' 5. 'bad()' shows warning message for non-STANDIN, because it is not related to source context: only STANDIN is related to it this patch queries to dirstate instead of changectxt/workingctx, because dirstate returns expected result for removed files. 'match.files()' is used by 'localrepository.status()' only in 'working' case, so this patched code also works correctly in non-'working' case.
Thu, 22 Mar 2012 17:47:00 -0500 rebase: properly calculate descendant set when aborting (issue3332) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:47:00 -0500] rev 16280
rebase: properly calculate descendant set when aborting (issue3332) Checking for descendants of target being public was also wrong.
Thu, 22 Mar 2012 17:08:05 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:08:05 -0500] rev 16279
merge with stable
(0) -10000 -3000 -1000 -300 -100 -15 +15 +100 +300 +1000 +3000 +10000 +30000 tip