Mercurial > hg
annotate contrib/convert-repo @ 14151:1fe82c93b8e2
convert: also catch missing revlogs when introduced in repo roots
The previous behaviour was almost as if convert.hg.ignoreerrors was always set
for revisions without parents, except that errors were silently ignored. Revlog
errors are handled as a side effect of getcopies(), but getcopies() was only
called when convert.hg.ignoreerrors was set.
Now we always call self.getcopies for root revisions, not only when
convert.hg.ignoreerrors is set, just like we do on all other revisions.
The extra call might be a bit expensive, but the proper fix for that would be
to catch these errors in another way.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 01 May 2011 17:34:16 +0200 |
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) |