Mercurial > hg
annotate contrib/convert-repo @ 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 | 1d3eb332f3cb |
children |
rev | line source |
---|---|
4514
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
1 #!/usr/bin/env python |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
2 # |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
3 # Wrapper script around the convert.py hgext extension |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
4 # for foreign SCM conversion to mercurial format. |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
5 # |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
6 |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
7 import sys |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
8 from mercurial import ui, fancyopts |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
9 from hgext import convert |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
10 |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
11 # Options extracted from the cmdtable |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
12 func, options, help = convert.cmdtable['convert'] |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
13 |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
14 # An ui instance |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
15 u = ui.ui() |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
16 |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
17 opts = {} |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
18 args = [] |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
19 try: |
6365
1d3eb332f3cb
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com>
parents:
4514
diff
changeset
|
20 args = list(fancyopts.fancyopts(sys.argv[1:], options, opts)) |
1d3eb332f3cb
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com>
parents:
4514
diff
changeset
|
21 args += [None]*(3 - len(args)) |
1d3eb332f3cb
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com>
parents:
4514
diff
changeset
|
22 src, dest, revmapfile = args |
1d3eb332f3cb
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com>
parents:
4514
diff
changeset
|
23 except (fancyopts.getopt.GetoptError, ValueError), inst: |
1d3eb332f3cb
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com>
parents:
4514
diff
changeset
|
24 u.warn('Usage:\n%s\n' % help) |
4514
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
25 sys.exit(-1) |
ec889780f28b
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr>
parents:
diff
changeset
|
26 |
6365
1d3eb332f3cb
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com>
parents:
4514
diff
changeset
|
27 convert.convert(u, src, dest, revmapfile, **opts) |