# HG changeset patch # User Augie Fackler # Date 2019-05-20 18:00:12 # Node ID 86f17fc31aa8a0c26c11db6a532293463ee6428a # Parent e0ac310bd0336f5583ae3ca179cb04670584fbc9 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 diff --git a/hgext/absorb.py b/hgext/absorb.py --- a/hgext/absorb.py +++ b/hgext/absorb.py @@ -935,7 +935,7 @@ def absorb(ui, repo, stack=None, targetc 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'): diff --git a/tests/test-absorb.t b/tests/test-absorb.t --- a/tests/test-absorb.t +++ b/tests/test-absorb.t @@ -399,6 +399,23 @@ Executable files: 1 changesets affected 99b4ae7 foo + $ hg absorb --dry-run --interactive --print-changes + diff -r 99b4ae712f84 foo.py + 1 hunks, 1 lines changed + examine changes to 'foo.py'? [Ynesfdaq?] y + + @@ -1,1 +1,1 @@ + - + +bla + record this change to 'foo.py'? [Ynesfdaq?] y + + showing changes for foo.py + @@ -0,1 +0,1 @@ + 99b4ae7 - + 99b4ae7 +bla + + 1 changesets affected + 99b4ae7 foo $ hg absorb --apply-changes 1 of 1 chunk(s) applied $ hg diff -c .