Mercurial > hg
comparison tests/test-absorb-edit-lines.t @ 49072:3cd57e2be49b
absorb: make `--edit-lines` imply `--apply-changes`
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.
Differential Revision: https://phab.mercurial-scm.org/D12550
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 13 Apr 2022 07:58:49 -0700 |
parents | 31dfa7dac4c9 |
children |
comparison
equal
deleted
inserted
replaced
49071:9caf23927d04 | 49072:3cd57e2be49b |
---|---|
13 > hg commit -A a -m "commit $i" -q | 13 > hg commit -A a -m "commit $i" -q |
14 > done | 14 > done |
15 | 15 |
16 absorb --edit-lines will run the editor if filename is provided: | 16 absorb --edit-lines will run the editor if filename is provided: |
17 | 17 |
18 $ hg absorb --edit-lines --apply-changes | 18 $ hg absorb --edit-lines |
19 nothing applied | 19 nothing applied |
20 [1] | 20 [1] |
21 $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a | 21 $ HGEDITOR=cat hg absorb --edit-lines a |
22 HG: editing a | 22 HG: editing a |
23 HG: "y" means the line to the right exists in the changeset to the top | 23 HG: "y" means the line to the right exists in the changeset to the top |
24 HG: | 24 HG: |
25 HG: /---- 4ec16f85269a commit 1 | 25 HG: /---- 4ec16f85269a commit 1 |
26 HG: |/--- 5c5f95224a50 commit 2 | 26 HG: |/--- 5c5f95224a50 commit 2 |
41 > yy : d | 41 > yy : d |
42 > y y : e | 42 > y y : e |
43 > y : f | 43 > y : f |
44 > yyy : g | 44 > yyy : g |
45 > EOF | 45 > EOF |
46 $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a | 46 $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a |
47 $ hg cat -r 0 a | 47 $ hg cat -r 0 a |
48 d | 48 d |
49 e | 49 e |
50 f | 50 f |
51 g | 51 g |