Mercurial > public > mercurial-scm > hg-stable
diff mercurial/repair.py @ 33149:d09ae850296d
obsutil: move 'exclusivemarkers' to the new modules
We have a new 'obsutil' module now. We move the high level utility there to
bring 'obsolete.py' back to a more reasonable size.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 27 Jun 2017 01:11:56 +0200 |
| parents | 208de1534ebd |
| children | 5c9ad50fd62f |
line wrap: on
line diff
--- a/mercurial/repair.py Tue Jun 27 01:03:01 2017 +0200 +++ b/mercurial/repair.py Tue Jun 27 01:11:56 2017 +0200 @@ -20,6 +20,7 @@ error, exchange, obsolete, + obsutil, util, ) @@ -132,7 +133,7 @@ stripobsidx = obsmarkers = () if repo.ui.configbool('devel', 'strip-obsmarkers', True): - obsmarkers = obsolete.exclusivemarkers(repo, stripbases) + obsmarkers = obsutil.exclusivemarkers(repo, stripbases) if obsmarkers: stripobsidx = [i for i, m in enumerate(repo.obsstore) if m in obsmarkers]