This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6411

absorb: fix interactive mode I didn't know existed
ClosedPublic

Authored by durin42 on May 20 2019, 2:00 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG86f17fc31aa8: absorb: fix interactive mode I didn't know existed
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 20 2019, 2:00 PM
pulkit accepted this revision.May 20 2019, 5:23 PM
Closed by commit rHG86f17fc31aa8: absorb: fix interactive mode I didn't know existed (authored by durin42). · Explain WhyMay 20 2019, 5:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (2 lines)
Mtests/test-absorb.t (17 lines)

Diff 15202

hgext/absorb.py

pats = () pats = ()
if opts is None: if opts is None:
opts = {} opts = {}
state = fixupstate(stack, ui=ui, opts=opts) state = fixupstate(stack, ui=ui, opts=opts)
matcher = scmutil.match(targetctx, pats, opts) matcher = scmutil.match(targetctx, pats, opts)
if opts.get('interactive'): if opts.get('interactive'):
diff = patch.diff(repo, stack[-1].node(), targetctx.node(), matcher) diff = patch.diff(repo, stack[-1].node(), targetctx.node(), matcher)
origchunks = patch.parsepatch(diff) origchunks = patch.parsepatch(diff)
chunks = cmdutil.recordfilter(ui, origchunks)[0] chunks = cmdutil.recordfilter(ui, origchunks, matcher)[0]
targetctx = overlaydiffcontext(stack[-1], chunks) targetctx = overlaydiffcontext(stack[-1], chunks)
fm = None fm = None
if opts.get('print_changes') or not opts.get('apply_changes'): if opts.get('print_changes') or not opts.get('apply_changes'):
fm = ui.formatter('absorb', opts) fm = ui.formatter('absorb', opts)
state.diffwith(targetctx, matcher, fm) state.diffwith(targetctx, matcher, fm)
if fm is not None: if fm is not None:
fm.startitem() fm.startitem()
fm.write("count", "\n%d changesets affected\n", len(state.ctxaffected)) fm.write("count", "\n%d changesets affected\n", len(state.ctxaffected))

tests/test-absorb.t

$ hg absorb --dry-run --print-changes $ hg absorb --dry-run --print-changes
showing changes for foo.py showing changes for foo.py
@@ -0,1 +0,1 @@ @@ -0,1 +0,1 @@
99b4ae7 - 99b4ae7 -
99b4ae7 +bla 99b4ae7 +bla
1 changesets affected 1 changesets affected
99b4ae7 foo 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 $ hg absorb --apply-changes
1 of 1 chunk(s) applied 1 of 1 chunk(s) applied
$ hg diff -c . $ hg diff -c .
diff --git a/foo.py b/foo.py diff --git a/foo.py b/foo.py
new file mode 100755 new file mode 100755
--- /dev/null --- /dev/null
+++ b/foo.py +++ b/foo.py
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@