Show More
@@ -39,34 +39,34 b' def strip(ui, repo, node, backup="all"):' | |||
|
39 | 39 | ui.warn("saving bundle to %s\n" % name) |
|
40 | 40 | return changegroup.writebundle(cg, name, "HG10BZ") |
|
41 | 41 | |
|
42 |
def |
|
|
43 | mm = repo.changectx(node).manifest() | |
|
44 | seen = {} | |
|
42 | def collectfilenodes(repo, striprev): | |
|
43 | """find out the first node that should be stripped from each filelog""" | |
|
44 | mm = repo.changectx(striprev).manifest() | |
|
45 | filenodes = {} | |
|
45 | 46 | |
|
46 | 47 | for x in xrange(striprev, repo.changelog.count()): |
|
47 |
for |
|
|
48 |
if |
|
|
48 | for name in repo.changectx(x).files(): | |
|
49 | if name in filenodes: | |
|
49 | 50 | continue |
|
50 |
|
|
|
51 | if f in mm: | |
|
52 | filerev = mm[f] | |
|
53 | else: | |
|
54 | filerev = 0 | |
|
55 | seen[f] = filerev | |
|
51 | filenodes[name] = mm.get(name) | |
|
52 | ||
|
53 | return filenodes | |
|
54 | ||
|
55 | def stripall(repo, striprev, filenodes): | |
|
56 | """strip the requested nodes from the filelogs""" | |
|
56 | 57 | # we go in two steps here so the strip loop happens in a |
|
57 | 58 | # sensible order. When stripping many files, this helps keep |
|
58 | 59 | # our disk access patterns under control. |
|
59 | seen_list = seen.keys() | |
|
60 | seen_list.sort() | |
|
61 | for f in seen_list: | |
|
62 | ff = repo.file(f) | |
|
63 | filerev = seen[f] | |
|
64 |
|
|
|
65 | if filerev in ff.nodemap: | |
|
66 | filerev = ff.rev(filerev) | |
|
67 |
|
|
|
68 | filerev = 0 | |
|
69 | ff.strip(filerev, striprev) | |
|
60 | ||
|
61 | files = filenodes.keys() | |
|
62 | files.sort() | |
|
63 | for name in files: | |
|
64 | f = repo.file(name) | |
|
65 | fnode = filenodes[name] | |
|
66 | frev = 0 | |
|
67 | if fnode is not None and fnode in f.nodemap: | |
|
68 | frev = f.rev(fnode) | |
|
69 | f.strip(frev, striprev) | |
|
70 | 70 | |
|
71 | 71 | cl = repo.changelog |
|
72 | 72 | # TODO delete the undo files, and handle undo of merge sets |
@@ -115,7 +115,8 b' def strip(ui, repo, node, backup="all"):' | |||
|
115 | 115 | if saveheads: |
|
116 | 116 | chgrpfile = bundle(repo, savebases.keys(), saveheads, node, 'temp') |
|
117 | 117 | |
|
118 | stripall(striprev) | |
|
118 | filenodes = collectfilenodes(repo, striprev) | |
|
119 | stripall(repo, striprev, filenodes) | |
|
119 | 120 | |
|
120 | 121 | change = cl.read(node) |
|
121 | 122 | cl.strip(striprev, striprev) |
General Comments 0
You need to be logged in to leave comments.
Login now