Mercurial > hg
comparison mercurial/repair.py @ 33166:5c9ad50fd62f
config: register the 'devel.strip-obsmarkers' config
The single explicit default that existed so far is converted to registered
config value.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 28 Jun 2017 13:32:36 +0200 |
| parents | d09ae850296d |
| children | 665271d601f5 |
comparison
equal
deleted
inserted
replaced
| 33165:1a6f28439135 | 33166:5c9ad50fd62f |
|---|---|
| 130 saverevs.difference_update(descendants) | 130 saverevs.difference_update(descendants) |
| 131 savebases = [cl.node(r) for r in saverevs] | 131 savebases = [cl.node(r) for r in saverevs] |
| 132 stripbases = [cl.node(r) for r in tostrip] | 132 stripbases = [cl.node(r) for r in tostrip] |
| 133 | 133 |
| 134 stripobsidx = obsmarkers = () | 134 stripobsidx = obsmarkers = () |
| 135 if repo.ui.configbool('devel', 'strip-obsmarkers', True): | 135 if repo.ui.configbool('devel', 'strip-obsmarkers'): |
| 136 obsmarkers = obsutil.exclusivemarkers(repo, stripbases) | 136 obsmarkers = obsutil.exclusivemarkers(repo, stripbases) |
| 137 if obsmarkers: | 137 if obsmarkers: |
| 138 stripobsidx = [i for i, m in enumerate(repo.obsstore) | 138 stripobsidx = [i for i, m in enumerate(repo.obsstore) |
| 139 if m in obsmarkers] | 139 if m in obsmarkers] |
| 140 | 140 |