Mercurial > hg
comparison hgext/largefiles/lfcommands.py @ 21933:8ecbe55fd09d stable
largefiles: invoke "normallookup" on "lfdirstate" for merged files
Before this patch, largefiles gotten from "other" revision (with
conflict) at "hg merge" become "clean" unexpectedly in steps below:
1. "repo.status()" is invoked (for status check before merging)
1-1 "dirstate" entry for standinfile SF is "normal"-ed
1-2 "lfdirstate" entry of largefile LF (for SF) is "normal"-ed
2. "merge.update()" is invoked
2-1 SF is updated in the working directory
(ASSUMPTION: user choice "other" at conflict)
2-2 "dirstate" entry for SF is "merge"-ed
3. "lfcommands.updatelfiles()" is invoked (by "overrides.hgmerge()")
3-1 largefile LF (for SF) is updated in the working directory
3-2 "dirstate" returns "m" for SF (by 2-2)
3-3 "lfdirstate" entry for LF is left as it is
3-4 "lfdirstate" is written into ".hg/largefiles/dirstate", and
timestamp of LF is stored into "lfdirstate" file (by 1-2)
(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 1-2 and 3-4) as "clean".
When state of standinfile in "dirstate" is "m", largefile should be
"normallookup"-ed.
This patch invokes "normallookup" on "lfdirstate" for merged files.
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)
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 23 Jul 2014 00:10:24 +0900 |
parents | 21a2f31f054d |
children | 0cb34b3991f8 |
comparison
equal
deleted
inserted
replaced
21932:21a2f31f054d | 21933:8ecbe55fd09d |
---|---|
519 if mtime < 0: | 519 if mtime < 0: |
520 # state 'n' doesn't ensure 'clean' in this case | 520 # state 'n' doesn't ensure 'clean' in this case |
521 lfdirstate.normallookup(lfile) | 521 lfdirstate.normallookup(lfile) |
522 else: | 522 else: |
523 lfdirstate.normal(lfile) | 523 lfdirstate.normal(lfile) |
524 elif state == 'm': | |
525 lfdirstate.normallookup(lfile) | |
524 elif state == 'r': | 526 elif state == 'r': |
525 lfdirstate.remove(lfile) | 527 lfdirstate.remove(lfile) |
526 elif state == 'a': | 528 elif state == 'a': |
527 lfdirstate.add(lfile) | 529 lfdirstate.add(lfile) |
528 elif state == '?': | 530 elif state == '?': |