##// END OF EJS Templates
treemanifests: actually strip directory manifests...
Martin von Zweigbergk -
r29464:87c184c9 default
parent child Browse files
Show More
@@ -167,6 +167,13 b' def strip(ui, repo, nodelist, backup=Tru'
167 tr.startgroup()
167 tr.startgroup()
168 cl.strip(striprev, tr)
168 cl.strip(striprev, tr)
169 mfst.strip(striprev, tr)
169 mfst.strip(striprev, tr)
170 if 'treemanifest' in repo.requirements: # safe but unnecessary
171 # otherwise
172 for unencoded, encoded, size in repo.store.datafiles():
173 if (unencoded.startswith('meta/') and
174 unencoded.endswith('00manifest.i')):
175 dir = unencoded[5:-12]
176 repo.dirlog(dir).strip(striprev, tr)
170 for fn in files:
177 for fn in files:
171 repo.file(fn).strip(striprev, tr)
178 repo.file(fn).strip(striprev, tr)
172 tr.endgroup()
179 tr.endgroup()
@@ -309,7 +309,16 b' Stripping and recovering changes should '
309 $ hg --config extensions.strip= strip tip
309 $ hg --config extensions.strip= strip tip
310 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
310 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
311 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg (glob)
311 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg (glob)
312 $ hg debugindex --dir dir1
313 rev offset length delta linkrev nodeid p1 p2
314 0 0 127 -1 4 064927a0648a 000000000000 000000000000
315 1 127 111 0 5 25ecb8cb8618 000000000000 000000000000
312 $ hg unbundle -q .hg/strip-backup/*
316 $ hg unbundle -q .hg/strip-backup/*
317 $ hg debugindex --dir dir1
318 rev offset length delta linkrev nodeid p1 p2
319 0 0 127 -1 4 064927a0648a 000000000000 000000000000
320 1 127 111 0 5 25ecb8cb8618 000000000000 000000000000
321 2 238 55 1 6 5b16163a30c6 25ecb8cb8618 000000000000
313 $ hg st --change tip
322 $ hg st --change tip
314 M dir1/a
323 M dir1/a
315
324
General Comments 0
You need to be logged in to leave comments. Login now