rebase: remove now unnecessary logic to allow empty commit when branch changes
This was a workaround for a bug in the empty commit check in repo.commit(),
where the parent branch name was incorrectly compared with the wdir branch name
instead of the branch name passed via `extra`. The bug was fixed in D8724.
The workaround was introduced in
b2415e94b2f5.
Differential Revision: https://phab.mercurial-scm.org/D8725
--- a/hgext/rebase.py Fri Jul 10 00:44:18 2020 +0200
+++ b/hgext/rebase.py Thu Jul 09 07:00:32 2020 +0200
@@ -529,11 +529,8 @@
extra = {b'rebase_source': ctx.hex()}
for c in self.extrafns:
c(ctx, extra)
- keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
destphase = max(ctx.phase(), phases.draft)
overrides = {(b'phases', b'new-commit'): destphase}
- if keepbranch:
- overrides[(b'ui', b'allowemptycommit')] = True
with repo.ui.configoverride(overrides, b'rebase'):
if self.inmemory:
newnode = commitmemorynode(