Mercurial > evolve
changeset 6839:12a031f3587f
topic: remove obsolete "b" prefix recognition
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 25 Aug 2024 17:55:37 +0400 |
| parents | 514babbbe282 |
| children | 83a8122cfd8c |
| files | hgext3rd/topic/__init__.py hgext3rd/topic/stack.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Sun Aug 25 17:22:40 2024 +0400 +++ b/hgext3rd/topic/__init__.py Sun Aug 25 17:55:37 2024 +0400 @@ -575,7 +575,7 @@ else: # hg <= 5.5 (2c86b9587740) extensions.wrapfunction(merge, 'update', mergeupdatewrap) - # We need to check whether t0 or b0 or s0 is passed to override the default update + # We need to check whether t0 or s0 is passed to override the default update # behaviour of changing topic and I can't find a better way # to do that as scmutil.revsingle returns the rev number and hence we can't # plug into logic for this into mergemod.update(). @@ -1739,7 +1739,7 @@ def checkt0(orig, ui, repo, node=None, rev=None, *args, **kwargs): - thezeros = set([b't0', b'b0', b's0']) + thezeros = set([b't0', b's0']) configoverride = util.nullcontextmanager() if node in thezeros or rev in thezeros: configoverride = repo.ui.configoverride({
--- a/hgext3rd/topic/stack.py Sun Aug 25 17:22:40 2024 +0400 +++ b/hgext3rd/topic/stack.py Sun Aug 25 17:55:37 2024 +0400 @@ -288,9 +288,9 @@ for idx, r in enumerate(st, 0): ctx = repo[r] - # special case for t0, b0 as it's hard to plugin into rest of the logic + # special case for t0, s0 as it's hard to plug into rest of the logic if idx == 0: - # t0, b0 can be None + # t0, s0 can be null changeset if r == -1: continue entries.append((idx, False, ctx))