Mercurial > hg
comparison hgext/rebase.py @ 34492:a5a810df4c81
configitems: register the 'experimental.rebaseskipobsolete' config
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 30 Jun 2017 03:42:06 +0200 |
parents | f61f5af5ed31 |
children | c4a2db2cc0fb |
comparison
equal
deleted
inserted
replaced
34491:eb1517776f8a | 34492:a5a810df4c81 |
---|---|
70 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | 70 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
71 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | 71 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
72 # be specifying the version(s) of Mercurial they are tested with, or | 72 # be specifying the version(s) of Mercurial they are tested with, or |
73 # leave the attribute unspecified. | 73 # leave the attribute unspecified. |
74 testedwith = 'ships-with-hg-core' | 74 testedwith = 'ships-with-hg-core' |
75 | |
76 configtable = {} | |
77 configitem = registrar.configitem(configtable) | |
78 | |
79 configitem('experimental', 'rebaseskipobsolete', | |
80 default=True, | |
81 ) | |
75 | 82 |
76 def _nothingtorebase(): | 83 def _nothingtorebase(): |
77 return 1 | 84 return 1 |
78 | 85 |
79 def _savegraft(ctx, extra): | 86 def _savegraft(ctx, extra): |
305 | 312 |
306 obsoleterevs: iterable of all obsolete revisions in rebaseset | 313 obsoleterevs: iterable of all obsolete revisions in rebaseset |
307 destmap: {srcrev: destrev} destination revisions | 314 destmap: {srcrev: destrev} destination revisions |
308 """ | 315 """ |
309 self.obsoletenotrebased = {} | 316 self.obsoletenotrebased = {} |
310 if not self.ui.configbool('experimental', 'rebaseskipobsolete', | 317 if not self.ui.configbool('experimental', 'rebaseskipobsolete'): |
311 default=True): | |
312 return | 318 return |
313 obsoleteset = set(obsoleterevs) | 319 obsoleteset = set(obsoleterevs) |
314 self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, | 320 self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, |
315 obsoleteset, destmap) | 321 obsoleteset, destmap) |
316 skippedset = set(self.obsoletenotrebased) | 322 skippedset = set(self.obsoletenotrebased) |