mercurial-scm/hg-stable: mercurial/repair.py annotate

annotate mercurial/repair.py @ 8073:e8a28556a0a8

strip: make repair.strip transactional to avoid repository corruption Uses a transaction instance from the local repository to journal the truncation of revlog files, such that if a strip only partially completes, hg recover will be able to finish the truncate of all the files. The potential unbundling of changes that have been backed up to be restored later will, in case of an error, have to be unbundled manually. The difference is that it will be possible to recover the repository state so the unbundle can actually succeed.

author	Henrik Stuart <henrik.stuart@edlund.dk>
date	Thu, 16 Apr 2009 15:34:03 +0200
parents	9fe97eea5510
children	46293a0c7e9f

rev	line source
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # repair.py - functions for repository repair for mercurial
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2005, 2006 Chris Mason <mason@suse.com>
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 # Copyright 2007 Matt Mackall
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	5 #
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	6 # This software may be used and distributed according to the terms
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	8
5899 d7388ad85511 repair.py: use node.* directly Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5898 diff changeset	9 import changegroup, os
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6147 diff changeset	10 from node import nullrev, short
6953 63b5f4c73c98 i18n: mark strings for translation in Mercurial Martin Geisler <mg@daimi.au.dk> parents: 6750 diff changeset	11 from i18n import _
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	12
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	13 def _bundle(repo, bases, heads, node, suffix, extranodes=None):
5905 3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	14 """create a bundle with the specified revisions as a backup"""
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	15 cg = repo.changegroupsubset(bases, heads, 'strip', extranodes)
5905 3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	16 backupdir = repo.join("strip-backup")
3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	17 if not os.path.isdir(backupdir):
3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	18 os.mkdir(backupdir)
3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	19 name = os.path.join(backupdir, "%s-%s" % (short(node), suffix))
6953 63b5f4c73c98 i18n: mark strings for translation in Mercurial Martin Geisler <mg@daimi.au.dk> parents: 6750 diff changeset	20 repo.ui.warn(_("saving bundle to %s\n") % name)
5905 3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	21 return changegroup.writebundle(cg, name, "HG10BZ")
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	22
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	23 def _collectfiles(repo, striprev):
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	24 """find out the filelogs affected by the strip"""
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	25 files = {}
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	26
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	27 for x in xrange(striprev, len(repo)):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6408 diff changeset	28 for name in repo[x].files():
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	29 if name in files:
5905 3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	30 continue
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	31 files[name] = 1
5902 98f8dec8f437 repair.py: split stripall into two functions; clean it up a bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5901 diff changeset	32
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	33 files = files.keys()
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	34 files.sort()
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	35 return files
5902 98f8dec8f437 repair.py: split stripall into two functions; clean it up a bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5901 diff changeset	36
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	37 def _collectextranodes(repo, files, link):
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	38 """return the nodes that have to be saved before the strip"""
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	39 def collectone(revlog):
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	40 extra = []
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	41 startrev = count = len(revlog)
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	42 # find the truncation point of the revlog
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	43 for i in xrange(0, count):
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 6953 diff changeset	44 lrev = revlog.linkrev(i)
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	45 if lrev >= link:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	46 startrev = i + 1
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	47 break
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	48
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	49 # see if any revision after that point has a linkrev less than link
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	50 # (we have to manually save these guys)
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	51 for i in xrange(startrev, count):
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	52 node = revlog.node(i)
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 6953 diff changeset	53 lrev = revlog.linkrev(i)
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	54 if lrev < link:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	55 extra.append((node, cl.node(lrev)))
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	56
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	57 return extra
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	58
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	59 extranodes = {}
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	60 cl = repo.changelog
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	61 extra = collectone(repo.manifest)
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	62 if extra:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	63 extranodes[1] = extra
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	64 for fname in files:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	65 f = repo.file(fname)
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	66 extra = collectone(f)
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	67 if extra:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	68 extranodes[fname] = extra
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	69
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	70 return extranodes
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	71
5905 3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	72 def strip(ui, repo, node, backup="all"):
5901 16f4129c19ac repair.py: rename chlog to cl Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5900 diff changeset	73 cl = repo.changelog
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	74 # TODO delete the undo files, and handle undo of merge sets
5901 16f4129c19ac repair.py: rename chlog to cl Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5900 diff changeset	75 striprev = cl.rev(node)
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	76
6147 53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	77 # Some revisions with rev > striprev may not be descendants of striprev.
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	78 # We have to find these revisions and put them in a bundle, so that
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	79 # we can restore them after the truncations.
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	80 # To create the bundle we use repo.changegroupsubset which requires
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	81 # the list of heads and bases of the set of interesting revisions.
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	82 # (head = revision in the set that has no descendant in the set;
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	83 # base = revision in the set that has no ancestor in the set)
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	84 tostrip = {striprev: 1}
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	85 saveheads = {}
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	86 savebases = []
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	87 for r in xrange(striprev + 1, len(cl)):
6147 53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	88 parents = cl.parentrevs(r)
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	89 if parents[0] in tostrip or parents[1] in tostrip:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	90 # r is a descendant of striprev
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	91 tostrip[r] = 1
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	92 # if this is a merge and one of the parents does not descend
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	93 # from striprev, mark that parent as a savehead.
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	94 if parents[1] != nullrev:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	95 for p in parents:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	96 if p not in tostrip and p > striprev:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	97 saveheads[p] = 1
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	98 else:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	99 # if no parents of this revision will be stripped, mark it as
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	100 # a savebase
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	101 if parents[0] < striprev and parents[1] < striprev:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	102 savebases.append(cl.node(r))
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	103
6147 53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	104 for p in parents:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	105 if p in saveheads:
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	106 del saveheads[p]
53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	107 saveheads[r] = 1
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	108
6147 53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	109 saveheads = [cl.node(r) for r in saveheads]
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	110 files = _collectfiles(repo, striprev)
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	111
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	112 extranodes = _collectextranodes(repo, files, striprev)
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	113
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	114 # create a changegroup for all the branches we need to keep
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	115 if backup == "all":
5905 3afbd82a6c82 repair.py: don't use nested functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	116 _bundle(repo, [node], cl.heads(), node, 'backup')
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	117 if saveheads or extranodes:
6147 53ae5af55db3 repair.py: rewrite a loop, making it cleaner and faster Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	118 chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp',
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	119 extranodes)
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	120
8073 e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	121 fs = [repo.file(name) for name in files]
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	122 mfst = repo.manifest
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	123
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	124 tr = repo.transaction()
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	125 offset = len(tr.entries)
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	126
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	127 cl.strip(striprev, tr)
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	128 mfst.strip(striprev, tr)
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	129 for f in fs:
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	130 f.strip(striprev, tr)
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	131
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	132 try:
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	133 for i in xrange(offset, len(tr.entries)):
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	134 file, troffset, ignore = tr.entries[i]
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	135 repo.sopener(file, 'a').truncate(troffset)
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	136 tr.close()
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	137 except:
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	138 tr.abort()
e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 7361 diff changeset	139 raise
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	140
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	141 if saveheads or extranodes:
6953 63b5f4c73c98 i18n: mark strings for translation in Mercurial Martin Geisler <mg@daimi.au.dk> parents: 6750 diff changeset	142 ui.status(_("adding branch\n"))
5898 52cfe86ebe55 repair.py: don't import commands.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4702 diff changeset	143 f = open(chgrpfile, "rb")
52cfe86ebe55 repair.py: don't import commands.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4702 diff changeset	144 gen = changegroup.readbundle(f, chgrpfile)
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5905 diff changeset	145 repo.addchangegroup(gen, 'strip', 'bundle:' + chgrpfile, True)
5898 52cfe86ebe55 repair.py: don't import commands.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4702 diff changeset	146 f.close()
4702 18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	147 if backup != "strip":
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	148 os.unlink(chgrpfile)
18e91c9def0c strip: move strip code to a new repair module Matt Mackall <mpm@selenic.com> parents: diff changeset	149

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/repair.py @ 8073:e8a28556a0a8