# HG changeset patch # User Durham Goode # Date 2017-08-09 00:25:38 # Node ID 6626d12e7a853e70b5f5ed3049af080ec3132f44 # Parent 5b2f331d0a33772ad22f4fa53b4de38a4ac8887f repair: refactor broken linkrev collection This refactors broken linkrev collection such that manifest collection is in a separate function. This allows extensions to replace the manifest collection with a non-revlog oriented version. I considered moving the collect changes function onto the manifestlog itself, so it would be behind the abstraction, but since the store we're building doesn't even have the concept of strip, embeding that concept in the manifestlog api seemed odd. Differential Revision: https://phab.mercurial-scm.org/D291 diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -67,16 +67,20 @@ def _collectfiles(repo, striprev): return sorted(files) +def _collectrevlog(revlog, striprev): + _, brokenset = revlog.getstrippoint(striprev) + return [revlog.linkrev(r) for r in brokenset] + +def _collectmanifest(repo, striprev): + return _collectrevlog(repo.manifestlog._revlog, striprev) + def _collectbrokencsets(repo, files, striprev): """return the changesets which will be broken by the truncation""" s = set() - def collectone(revlog): - _, brokenset = revlog.getstrippoint(striprev) - s.update([revlog.linkrev(r) for r in brokenset]) - collectone(repo.manifestlog._revlog) + s.update(_collectmanifest(repo, striprev)) for fname in files: - collectone(repo.file(fname)) + s.update(_collectrevlog(repo.file(fname), striprev)) return s