Mercurial > hg
comparison tests/test-largefiles-update.t @ 21932:21a2f31f054d stable
largefiles: use "normallookup", if "mtime" of standin is unset
Before this patch, largefiles gotten from "other" revision (without
conflict) at "hg merge" become "clean" unexpectedly in steps below:
1. "merge.update()" is invoked
1-1 standinfile SF is updated in the working directory
1-2 "dirstate" entry for SF is "normallookup"-ed
2. "lfcommands.updatelfiles()" is invoked (by "overrides.hgmerge()")
2-1 largefile LF (for SF) is updated in the working directory
2-2 "dirstate" returns "n" for SF (by 1-2)
2-3 "lfdirstate" entry for LF is "normal"-ed
2-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and
timestamp of LF is stored into "lfdirstate" file
(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 2-1), because "lfilesrepo.status()" always treats
"normal"-ed files (by 2-3 and 2-4) as "clean".
When timestamp is not set (= negative value) for standinfile in
"dirstate", largefile should be "normallookup"-ed regardless of
rebasing or not, because "n" state in "dirstate" doesn't ensure
"clean"-ness of a standinfile at that time.
This patch uses "normallookup" instead of "normal", if "mtime" of
standin is unset
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, "lfdirstate" should
be updated with "dirstate" simultaneously while "merge.update"
execution: maybe by hooking "recordupdates"
It is also why this patch (temporarily) uses internal field "_map" of
"dirstate" directly.
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 2-4)
This patch newly adds "test-largefiles-update.t", to avoid increasing
cost to run other tests for largefiles by subsequent patches
(especially, "[debug] dirstate.delaywrite" causes so).
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 22 Jul 2014 23:59:34 +0900 |
parents | |
children | 8ecbe55fd09d |
comparison
equal
deleted
inserted
replaced
21931:89b809fa6cef | 21932:21a2f31f054d |
---|---|
1 This file focuses mainly on updating largefiles in the working | |
2 directory (and ".hg/largefiles/dirstate") | |
3 | |
4 $ cat >> $HGRCPATH <<EOF | |
5 > [ui] | |
6 > merge = internal:fail | |
7 > [extensions] | |
8 > largefiles = | |
9 > EOF | |
10 | |
11 $ hg init repo | |
12 $ cd repo | |
13 | |
14 $ echo large1 > large1 | |
15 $ echo large2 > large2 | |
16 $ hg add --large large1 large2 | |
17 $ echo normal1 > normal1 | |
18 $ hg add normal1 | |
19 $ hg commit -m '#0' | |
20 $ echo 'large1 in #1' > large1 | |
21 $ echo 'normal1 in #1' > normal1 | |
22 $ hg commit -m '#1' | |
23 $ hg update -q -C 0 | |
24 $ echo 'large2 in #2' > large2 | |
25 $ hg commit -m '#2' | |
26 created new head | |
27 | |
28 Test that "hg merge" updates largefiles from "other" correctly | |
29 | |
30 (getting largefiles from "other" normally) | |
31 | |
32 $ hg status -A large1 | |
33 C large1 | |
34 $ cat large1 | |
35 large1 | |
36 $ cat .hglf/large1 | |
37 4669e532d5b2c093a78eca010077e708a071bb64 | |
38 $ hg merge --config debug.dirstate.delaywrite=2 | |
39 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 (branch merge, don't forget to commit) | |
41 getting changed largefiles | |
42 1 largefiles updated, 0 removed | |
43 $ hg status -A large1 | |
44 M large1 | |
45 $ cat large1 | |
46 large1 in #1 | |
47 $ cat .hglf/large1 | |
48 58e24f733a964da346e2407a2bee99d9001184f5 | |
49 $ hg diff -c 1 --nodates .hglf/large1 | grep '^[+-][0-9a-z]' | |
50 -4669e532d5b2c093a78eca010077e708a071bb64 | |
51 +58e24f733a964da346e2407a2bee99d9001184f5 | |
52 | |
53 $ cd .. |