Mercurial > evolve
changeset 2740:51afc979d88d
topic: rename the internal topic option
we'll use it more widely so I give it a more generic name. It is an internal option so not wories regarding compatibility.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 14 Jul 2017 01:53:56 +0200 |
| parents | 7d86594cb829 |
| children | 51d669b16fa8 |
| files | hgext3rd/topic/__init__.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Fri Jul 14 01:49:43 2017 +0200 +++ b/hgext3rd/topic/__init__.py Fri Jul 14 01:53:56 2017 +0200 @@ -615,7 +615,7 @@ # running. if repo.ui.hasconfig('experimental', 'topicrebase'): isrebase = True - if repo.ui.configbool('_internal', 'updating-to-t0'): + if repo.ui.configbool('_internal', 'keep-topic'): ist0 = True if ((not partial and not branchmerge) or isrebase) and not ist0: ot = repo.currenttopic @@ -640,7 +640,7 @@ thezeros = set(['t0', 'b0']) overrides = {} if node in thezeros or rev in thezeros: - overrides[('_internal', 'updating-to-t0')] = 'yes' + overrides[('_internal', 'keep-topic')] = 'yes' with repo.ui.configoverride(overrides, source='topic-extension'): return orig(ui, repo, node, rev, clean, date, check, merge, tool)