##// END OF EJS Templates
tests: fix up changed output
tests: fix up changed output

File last commit:

r12057:798ef5b1 default
r12787:e8a8993b default
Show More
repair.py
167 lines | 5.6 KiB | text/x-python | PythonLexer
Matt Mackall
strip: move strip code to a new repair module
r4702 # repair.py - functions for repository repair for mercurial
#
# Copyright 2005, 2006 Chris Mason <mason@suse.com>
# Copyright 2007 Matt Mackall
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
strip: move strip code to a new repair module
r4702
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import changegroup
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from node import nullrev, short
Martin Geisler
i18n: mark strings for translation in Mercurial
r6953 from i18n import _
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import os
Matt Mackall
strip: move strip code to a new repair module
r4702
Nicolas Dumazet
repair: do not compress partial bundle if we do not keep it on disk...
r11791 def _bundle(repo, bases, heads, node, suffix, extranodes=None, compress=True):
Alexis S. L. Carvalho
repair.py: don't use nested functions.
r5905 """create a bundle with the specified revisions as a backup"""
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 cg = repo.changegroupsubset(bases, heads, 'strip', extranodes)
Alexis S. L. Carvalho
repair.py: don't use nested functions.
r5905 backupdir = repo.join("strip-backup")
if not os.path.isdir(backupdir):
os.mkdir(backupdir)
Matt Mackall
strip: backup bundles should use the .hg extension
r11333 name = os.path.join(backupdir, "%s-%s.hg" % (short(node), suffix))
Nicolas Dumazet
repair: do not compress partial bundle if we do not keep it on disk...
r11791 if compress:
bundletype = "HG10BZ"
else:
bundletype = "HG10UN"
return changegroup.writebundle(cg, name, bundletype)
Matt Mackall
strip: move strip code to a new repair module
r4702
Alexis S. L. Carvalho
simplify revlog.strip interface and callers; add docstring...
r5910 def _collectfiles(repo, striprev):
"""find out the filelogs affected by the strip"""
Benoit Boissinot
repair: use set instead of dict
r8462 files = set()
Matt Mackall
strip: move strip code to a new repair module
r4702
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 for x in xrange(striprev, len(repo)):
Martin Geisler
repair: bulk update sets...
r8479 files.update(repo[x].files())
Alexis S. L. Carvalho
repair.py: split stripall into two functions; clean it up a bit
r5902
Benoit Boissinot
repair: use set instead of dict
r8462 return sorted(files)
Alexis S. L. Carvalho
repair.py: split stripall into two functions; clean it up a bit
r5902
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 def _collectextranodes(repo, files, link):
"""return the nodes that have to be saved before the strip"""
Patrick Mezard
repair: pass variable explicitely to nested function
r12057 def collectone(cl, revlog):
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 extra = []
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 startrev = count = len(revlog)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 # find the truncation point of the revlog
Martin Geisler
replace xrange(0, n) with xrange(n)
r8624 for i in xrange(count):
Matt Mackall
linkrev: take a revision number rather than a hash
r7361 lrev = revlog.linkrev(i)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 if lrev >= link:
startrev = i + 1
break
# see if any revision after that point has a linkrev less than link
# (we have to manually save these guys)
for i in xrange(startrev, count):
node = revlog.node(i)
Matt Mackall
linkrev: take a revision number rather than a hash
r7361 lrev = revlog.linkrev(i)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 if lrev < link:
extra.append((node, cl.node(lrev)))
return extra
extranodes = {}
cl = repo.changelog
Patrick Mezard
repair: pass variable explicitely to nested function
r12057 extra = collectone(cl, repo.manifest)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 if extra:
extranodes[1] = extra
for fname in files:
f = repo.file(fname)
Patrick Mezard
repair: pass variable explicitely to nested function
r12057 extra = collectone(cl, f)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 if extra:
extranodes[fname] = extra
return extranodes
Alexis S. L. Carvalho
repair.py: don't use nested functions.
r5905 def strip(ui, repo, node, backup="all"):
Alexis S. L. Carvalho
repair.py: rename chlog to cl
r5901 cl = repo.changelog
Matt Mackall
strip: move strip code to a new repair module
r4702 # TODO delete the undo files, and handle undo of merge sets
Alexis S. L. Carvalho
repair.py: rename chlog to cl
r5901 striprev = cl.rev(node)
Matt Mackall
strip: move strip code to a new repair module
r4702
Nicolas Dumazet
repair: do not compress partial bundle if we do not keep it on disk...
r11791 keeppartialbundle = backup == 'strip'
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 # Some revisions with rev > striprev may not be descendants of striprev.
# We have to find these revisions and put them in a bundle, so that
# we can restore them after the truncations.
# To create the bundle we use repo.changegroupsubset which requires
# the list of heads and bases of the set of interesting revisions.
# (head = revision in the set that has no descendant in the set;
# base = revision in the set that has no ancestor in the set)
Benoit Boissinot
repair: use set instead of dict
r8462 tostrip = set((striprev,))
saveheads = set()
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 savebases = []
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 for r in xrange(striprev + 1, len(cl)):
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 parents = cl.parentrevs(r)
if parents[0] in tostrip or parents[1] in tostrip:
# r is a descendant of striprev
Benoit Boissinot
repair: use set instead of dict
r8462 tostrip.add(r)
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 # if this is a merge and one of the parents does not descend
# from striprev, mark that parent as a savehead.
if parents[1] != nullrev:
for p in parents:
if p not in tostrip and p > striprev:
Benoit Boissinot
repair: use set instead of dict
r8462 saveheads.add(p)
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 else:
# if no parents of this revision will be stripped, mark it as
# a savebase
if parents[0] < striprev and parents[1] < striprev:
savebases.append(cl.node(r))
Matt Mackall
strip: move strip code to a new repair module
r4702
Martin Geisler
repair: bulk update sets...
r8479 saveheads.difference_update(parents)
Benoit Boissinot
repair: use set instead of dict
r8462 saveheads.add(r)
Matt Mackall
strip: move strip code to a new repair module
r4702
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 saveheads = [cl.node(r) for r in saveheads]
Alexis S. L. Carvalho
simplify revlog.strip interface and callers; add docstring...
r5910 files = _collectfiles(repo, striprev)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909
Alexis S. L. Carvalho
simplify revlog.strip interface and callers; add docstring...
r5910 extranodes = _collectextranodes(repo, files, striprev)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909
Matt Mackall
strip: move strip code to a new repair module
r4702 # create a changegroup for all the branches we need to keep
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 backupfile = None
Matt Mackall
strip: move strip code to a new repair module
r4702 if backup == "all":
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 backupfile = _bundle(repo, [node], cl.heads(), node, 'backup')
Matt Mackall
strip: improve full backup message
r11200 repo.ui.status(_("saved backup bundle to %s\n") % backupfile)
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 if saveheads or extranodes:
Nicolas Dumazet
repair: do not compress partial bundle if we do not keep it on disk...
r11791 # do not compress partial bundle if we remove it from disk later
Alexis S. L. Carvalho
repair.py: rewrite a loop, making it cleaner and faster
r6147 chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp',
Nicolas Dumazet
repair: do not compress partial bundle if we do not keep it on disk...
r11791 extranodes=extranodes, compress=keeppartialbundle)
Matt Mackall
strip: move strip code to a new repair module
r4702
Henrik Stuart
strip: make repair.strip transactional to avoid repository corruption...
r8073 mfst = repo.manifest
Steve Borho
localrepo: add desc parameter to transaction...
r10881 tr = repo.transaction("strip")
Henrik Stuart
strip: make repair.strip transactional to avoid repository corruption...
r8073 offset = len(tr.entries)
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 try:
tr.startgroup()
cl.strip(striprev, tr)
mfst.strip(striprev, tr)
for fn in files:
repo.file(fn).strip(striprev, tr)
tr.endgroup()
Henrik Stuart
strip: make repair.strip transactional to avoid repository corruption...
r8073
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 try:
for i in xrange(offset, len(tr.entries)):
file, troffset, ignore = tr.entries[i]
repo.sopener(file, 'a').truncate(troffset)
tr.close()
except:
tr.abort()
raise
if saveheads or extranodes:
Matt Mackall
strip: hide unbundle messages by default...
r11202 ui.note(_("adding branch\n"))
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 f = open(chgrpfile, "rb")
gen = changegroup.readbundle(f, chgrpfile)
Matt Mackall
strip: hide unbundle messages by default...
r11202 if not repo.ui.verbose:
# silence internal shuffling chatter
repo.ui.pushbuffer()
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 repo.addchangegroup(gen, 'strip', 'bundle:' + chgrpfile, True)
Matt Mackall
strip: hide unbundle messages by default...
r11202 if not repo.ui.verbose:
repo.ui.popbuffer()
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 f.close()
Nicolas Dumazet
repair: do not compress partial bundle if we do not keep it on disk...
r11791 if not keeppartialbundle:
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 os.unlink(chgrpfile)
Henrik Stuart
strip: make repair.strip transactional to avoid repository corruption...
r8073 except:
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 if backupfile:
Martin Geisler
mark ui.warn strings for translation
r11600 ui.warn(_("strip failed, full bundle stored in '%s'\n")
% backupfile)
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 elif saveheads:
Martin Geisler
mark ui.warn strings for translation
r11600 ui.warn(_("strip failed, partial bundle stored in '%s'\n")
Matt Mackall
strip: be quiet about temporary internal bundle
r11197 % chgrpfile)
Henrik Stuart
strip: make repair.strip transactional to avoid repository corruption...
r8073 raise
Matt Mackall
strip: move strip code to a new repair module
r4702
Greg Ward
localrepo: add destroyed() method for strip/rollback to use (issue548).
r9150 repo.destroyed()