Mercurial > hg

diff hgext/absorb.py @ 42351:86f17fc31aa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
absorb: fix interactive mode I didn't know existed While investigating a bug in `hg absorb -e` I unintentionally discovered `hg absorb --interactive` and its brokenness. This adds a test and restores the functionality. Note that this interface is still marked experimental, so we can change this to be more sophisticated in the future. Differential Revision: https://phab.mercurial-scm.org/D6411
author Augie Fackler <augie@google.com>
date Mon, 20 May 2019 14:00:12 -0400
parents b3fc78c028ef
children c1bf63ac30c5
line wrap: on
line diff
--- a/hgext/absorb.py	Fri May 17 11:13:12 2019 -0400
+++ b/hgext/absorb.py	Mon May 20 14:00:12 2019 -0400
@@ -935,7 +935,7 @@
     if opts.get('interactive'):
         diff = patch.diff(repo, stack[-1].node(), targetctx.node(), matcher)
         origchunks = patch.parsepatch(diff)
-        chunks = cmdutil.recordfilter(ui, origchunks)[0]
+        chunks = cmdutil.recordfilter(ui, origchunks, matcher)[0]
         targetctx = overlaydiffcontext(stack[-1], chunks)
     fm = None
     if opts.get('print_changes') or not opts.get('apply_changes'):