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
Thu, 22 Mar 2012 17:07:39 -0500 strip: ignore -n (issue3326) (BC) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16278
strip: ignore -n (issue3326) (BC) -n could be confused for --dry-run by foolhardy users, resulting in permanent data loss. As leaving a backup when none was requested is significantly less disastrous, the short option is silently ignored. Old scripts continue to work, users only get lightly burned.
Thu, 22 Mar 2012 17:07:39 -0500 aliases: use empty string for missing position parameters (issue3331) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16277
aliases: use empty string for missing position parameters (issue3331)
Wed, 21 Mar 2012 16:39:38 -0500 bookmarks: clone non-divergent bookmarks with @ in them stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 21 Mar 2012 16:39:38 -0500] rev 16276
bookmarks: clone non-divergent bookmarks with @ in them
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip