Mercurial > evolve

changeset 6129:d3b77e5ee04e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewriteutil: make sure to provide branch kwarg to tomemctx() Earlier in this function we did extra[b'branch'] = head.branch(), so we definitely want to take branch from head. But inside tomemctx(), there's an `if branch is None` check that updates extra with wctx.branch(). That is not what we need, so let's provide the correct branch again, as a separate keyword argument, even though it's already correct in extra. Other uses of tomemctx() already provide branch. This patch could be on stable, but fixup series depends on it, and we're close enough to a feature release, so this should be fine.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 15 Feb 2022 14:26:38 +0300
parents 10ccdee05ec0
children cd07d6bd4e2a
files hgext3rd/evolve/rewriteutil.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/rewriteutil.py	Fri Feb 11 18:55:02 2022 +0300
+++ b/hgext3rd/evolve/rewriteutil.py	Tue Feb 15 14:26:38 2022 +0300
@@ -276,6 +276,7 @@
         if commitopts.get(b'edit'):
             editor = cmdutil.commitforceeditor
         new = wctx.tomemctx(text=message,
+                            branch=extra[b'branch'],
                             parents=newbases,
                             date=date,
                             extra=extra,