This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12550

absorb: make `--edit-lines` imply `--apply-changes`
AcceptedPublic

Authored by martinvonz on Wed, Apr 13, 11:11 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

One of our users tried to use hg absorb -e but it seemed that it
would only bring up the editor if there were no changes the command
could automatically detect destination for. I spent probably half an
hour debugging why it worked that way. I finally figured out that it
does bring up the editor, but you have to answer "yes" to the "apply
changes" prompt *first*. That seems very unintuitive. If the user
wants to edit the changes, there seems to be little reason to present
them with a prompt first, so let's have -e/--edit-lines imply
-a/--apply-changes. All the tests using -e also already used
-a. I changed them to rely on the implied -a so we get coverage of
that.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Wed, Apr 13, 11:11 AM
Alphare accepted this revision.Thu, Apr 14, 4:45 AM
This revision is now accepted and ready to land.Thu, Apr 14, 4:45 AM

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (4 lines)
Mtests/test-absorb-edit-lines.t (6 lines)

Diff 33163

hgext/absorb.py

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(b'interactive'): if opts.get(b'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, matcher)[0] chunks = cmdutil.recordfilter(ui, origchunks, matcher)[0]
targetctx = overlaydiffcontext(stack[-1], chunks) targetctx = overlaydiffcontext(stack[-1], chunks)
if opts.get(b'edit_lines'):
# If we're going to open the editor, don't ask the user to confirm
# first
opts[b'apply_changes'] = True
fm = None fm = None
if opts.get(b'print_changes') or not opts.get(b'apply_changes'): if opts.get(b'print_changes') or not opts.get(b'apply_changes'):
fm = ui.formatter(b'absorb', opts) fm = ui.formatter(b'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( fm.write(
b"count", b"\n%d changesets affected\n", len(state.ctxaffected) b"count", b"\n%d changesets affected\n", len(state.ctxaffected)

tests/test-absorb-edit-lines.t

$ for i in 1 2 3; do $ for i in 1 2 3; do
> echo $i >> a > echo $i >> a
> hg commit -A a -m "commit $i" -q > hg commit -A a -m "commit $i" -q
> done > done
absorb --edit-lines will run the editor if filename is provided: absorb --edit-lines will run the editor if filename is provided:
$ hg absorb --edit-lines --apply-changes $ hg absorb --edit-lines
nothing applied nothing applied
[1] [1]
$ HGEDITOR=cat hg absorb --edit-lines --apply-changes a $ HGEDITOR=cat hg absorb --edit-lines a
HG: editing a HG: editing a
HG: "y" means the line to the right exists in the changeset to the top HG: "y" means the line to the right exists in the changeset to the top
HG: HG:
HG: /---- 4ec16f85269a commit 1 HG: /---- 4ec16f85269a commit 1
HG: |/--- 5c5f95224a50 commit 2 HG: |/--- 5c5f95224a50 commit 2
HG: ||/-- 43f0a75bede7 commit 3 HG: ||/-- 43f0a75bede7 commit 3
HG: ||| HG: |||
yyy : 1 yyy : 1
yy : 2 yy : 2
y : 3 y : 3
nothing applied nothing applied
[1] [1]
Edit the file using --edit-lines: Edit the file using --edit-lines:
$ cat > editortext << EOF $ cat > editortext << EOF
> y : a > y : a
> yy : b > yy : b
> y : c > y : c
> yy : d > yy : d
> y y : e > y y : e
> y : f > y : f
> yyy : g > yyy : g
> EOF > EOF
$ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a
$ hg cat -r 0 a $ hg cat -r 0 a
d d
e e
f f
g g
$ hg cat -r 1 a $ hg cat -r 1 a
b b
c c
d d
g g
$ hg cat -r 2 a $ hg cat -r 2 a
a a
b b
e e
g g