| pulkit |
| hg-reviewers |
This is the treemanifest version of f45f7390c1c5 (strip: calculate
list of extra nodes to save and pass it to changegroupsubset,
2008-01-19).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/repair.py (6 lines) | |||
| M | tests/test-strip-cross.t (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| files.update(repo[x].files()) | files.update(repo[x].files()) | ||||
| return sorted(files) | return sorted(files) | ||||
| def _collectrevlog(revlog, striprev): | def _collectrevlog(revlog, striprev): | ||||
| _, brokenset = revlog.getstrippoint(striprev) | _, brokenset = revlog.getstrippoint(striprev) | ||||
| return [revlog.linkrev(r) for r in brokenset] | return [revlog.linkrev(r) for r in brokenset] | ||||
| def _collectmanifest(repo, striprev): | |||||
| return _collectrevlog(repo.manifestlog.getstorage(b''), striprev) | |||||
| def _collectbrokencsets(repo, files, striprev): | def _collectbrokencsets(repo, files, striprev): | ||||
| """return the changesets which will be broken by the truncation""" | """return the changesets which will be broken by the truncation""" | ||||
| s = set() | s = set() | ||||
| s.update(_collectmanifest(repo, striprev)) | for revlog in manifestrevlogs(repo): | ||||
| s.update(_collectrevlog(revlog, striprev)) | |||||
| for fname in files: | for fname in files: | ||||
| s.update(_collectrevlog(repo.file(fname), striprev)) | s.update(_collectrevlog(repo.file(fname), striprev)) | ||||
| return s | return s | ||||
| def strip(ui, repo, nodelist, backup=True, topic='backup'): | def strip(ui, repo, nodelist, backup=True, topic='backup'): | ||||
| # This function requires the caller to lock the repo, but it operates | # This function requires the caller to lock the repo, but it operates | ||||
| # within a transaction of its own, and thus requires there to be no current | # within a transaction of its own, and thus requires there to be no current | ||||
| > echo | > echo | ||||
| > done | > done | ||||
| % Trying to strip revision 2 | % Trying to strip revision 2 | ||||
| saved backup bundle to $TESTTMP/treemanifests/2/.hg/strip-backup/145f5c75f9ac-a105cfbe-backup.hg | saved backup bundle to $TESTTMP/treemanifests/2/.hg/strip-backup/145f5c75f9ac-a105cfbe-backup.hg | ||||
| % Verifying | % Verifying | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| checking directory manifests | checking directory manifests | ||||
| dir/@0: parent-directory manifest refers to unknown revision 1c556153fe54 | |||||
| dir/@1: parent-directory manifest refers to unknown revision 1f76dba919fd | |||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| dir/other@1: 5d9299349fc0 not in manifests | |||||
| checked 3 changesets with 4 changes to 3 files | checked 3 changesets with 4 changes to 3 files | ||||
| 3 integrity errors encountered! | |||||
| (first damaged changeset appears to be 0) | |||||
| % Trying to strip revision 3 | % Trying to strip revision 3 | ||||
| saved backup bundle to $TESTTMP/treemanifests/3/.hg/strip-backup/e4e3de5c3cb2-f4c70376-backup.hg | saved backup bundle to $TESTTMP/treemanifests/3/.hg/strip-backup/e4e3de5c3cb2-f4c70376-backup.hg | ||||
| % Verifying | % Verifying | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| checking directory manifests | checking directory manifests | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| checked 3 changesets with 4 changes to 3 files | checked 3 changesets with 4 changes to 3 files | ||||
| $ cd .. | $ cd .. | ||||