Wed, 23 Jul 2014 11:16:22 -0500 version: don't traceback if no extensions to list (issue4312) stable
Matt Mackall <mpm@selenic.com> [Wed, 23 Jul 2014 11:16:22 -0500] rev 21937
version: don't traceback if no extensions to list (issue4312)
Wed, 23 Jul 2014 10:50:21 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Wed, 23 Jul 2014 10:50:21 -0500] rev 21936
merge with i18n
Sun, 20 Jul 2014 18:08:29 -0300 i18n-pt_BR: synchronized with 6c36dc6cd61a stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 20 Jul 2014 18:08:29 -0300] rev 21935
i18n-pt_BR: synchronized with 6c36dc6cd61a
Wed, 23 Jul 2014 00:10:24 +0900 largefiles: use "normallookup" on "lfdirstate" while reverting stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Jul 2014 00:10:24 +0900] rev 21934
largefiles: use "normallookup" on "lfdirstate" while reverting Before this patch, largefiles gotten from revisions other than the parent of the working directory at "hg revert" become "clean" unexpectedly in steps below: 1. "repo.status()" is invoked (for status check before reverting) 1-1 "dirstate" entry for standinfile SF is "normal"-ed (1-2 "lfdirstate" entry of largefile LF (for SF) is "normal"-ed) 2. "cmdutil.revert()" is invoked 2-1 standinfile SF is updated in the working directory 2-2 "dirstate" entry for SF is NOT updated 3. "lfcommands.updatelfiles()" is invoked (by "overrides.overriderevert()") 3-1 largefile LF (for SF) is updated in the working directory 3-2 "dirstate" returns "n" and valid timestamp for SF (by 1-1 and 2-2) 3-3 "lfdirstate" entry for LF is "normal"-ed 3-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and timestamp of LF is stored into "lfdirstate" file (by 3-3) (ASSUMPTION: timestamp of LF differs from one of "lfdirstate" file) Then, "hs status" treats LF as "clean", even though LF is updated by "other" revision (by 3-1), because "lfilesrepo.status()" always treats "normal"-ed files (by 3-3 and 3-4) as "clean". When largefiles are reverted, they should be "normallookup"-ed forcibly. This patch uses "normallookup" on "lfdirstate" while reverting, by passing "True" to newly added argument "normallookup". Forcible "normallookup"-ing is not so expensive, because list of target largefiles is explicitly specified in this case. This patch uses "[debug] dirstate.delaywrite" feature in the test, to ensure that timestamp of the largefile gotten from "other" revision is stored into ".hg/largefiles/dirstate" (for ASSUMPTION at 3-4)
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 tip