Mon, 11 Aug 2014 22:29:43 +0900 largefiles: restore R status of removed largefiles correctly at "hg rollback"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 11 Aug 2014 22:29:43 +0900] rev 22096
largefiles: restore R status of removed largefiles correctly at "hg rollback" Before this patch, removed or forgotten largefiles aren't treated as removed ("R") after "hg rollback". Removed ones are treated as missing ("!") and forgotten ones are treated as clean ("C") unexpectedly. "overriderollback" uses "normallookup" to restore status in lfdirstate for largefiles other than ones not added in rollback-ed revision, but this isn't correct for removed (or forgotten) largefiles. This patch uses "lfutil.synclfdirstate" to restore "R" status of removed (or forgotten) largefiles correctly at "hg rollback". This is a temporary way to fix with less changes. For fundamental resolution of this kind of problems in the future, lfdirstate should be rollback-ed as a part of transaction, as same as dirstate.
Mon, 11 Aug 2014 22:29:43 +0900 largefiles: factor out synchronization of lfdirstate for future use
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 11 Aug 2014 22:29:43 +0900] rev 22095
largefiles: factor out synchronization of lfdirstate for future use
Mon, 11 Aug 2014 22:29:43 +0900 largefiles: put whole rollback-ing process into the same "wlock" scope
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 11 Aug 2014 22:29:43 +0900] rev 22094
largefiles: put whole rollback-ing process into the same "wlock" scope Before this patch, there are three distinct "wlock" scopes in "overriderollback": 1. "localrepository.rollback" via original "rollback" command, 2. "merge.update" for reverting standin files only, and 3. "overriderollback" specific "wlock" scope (to synchronize largefile dirstate) But these should be executed in the same "wlock" scope for consistency.
Mon, 11 Aug 2014 09:35:24 -0500 tests: use a decorator for hghave checks
Matt Mackall <mpm@selenic.com> [Mon, 11 Aug 2014 09:35:24 -0500] rev 22093
tests: use a decorator for hghave checks
Sun, 10 Aug 2014 23:13:12 -0500 hg-test-mode: colorize HGFOO and TESTFOO environment variables
Matt Mackall <mpm@selenic.com> [Sun, 10 Aug 2014 23:13:12 -0500] rev 22092
hg-test-mode: colorize HGFOO and TESTFOO environment variables
Sun, 10 Aug 2014 23:09:23 -0500 unbundle: don't advance bookmarks (issue4322) (BC) stable
Matt Mackall <mpm@selenic.com> [Sun, 10 Aug 2014 23:09:23 -0500] rev 22091
unbundle: don't advance bookmarks (issue4322) (BC) This behavior didn't make much sense and interacts badly with things that use unbundle internally like shelve. Presumably, the original rationale was that since bundles didn't contain bookmarks, this gave a sense of keeping bookmarks up-to-date like would happen with a corresponding pull. However, since it only updated the current active bookmark, and bare update already did that anyway, this is pretty slim. Notably, the corresponding test actually works better without this feature.
Sun, 10 Aug 2014 15:26:33 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 10 Aug 2014 15:26:33 -0500] rev 22090
merge with stable
Sun, 10 Aug 2014 15:26:12 -0500 tests: more bundle2 non-binary file test fixes stable
Matt Mackall <mpm@selenic.com> [Sun, 10 Aug 2014 15:26:12 -0500] rev 22089
tests: more bundle2 non-binary file test fixes
(0) -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip