This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9560

histedit: tweak `edit` message to try and guide users to our workflow
ClosedPublic

Authored by durin42 on Dec 10 2020, 11:47 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG3f82a915ab2a: histedit: tweak `edit` message to try and guide users to our workflow
Summary

histedit predates evolve, so it drops you on an _uncommitted_ version
of the commit you're amending/splitting, which is in contrast to git
which expects you to use git commit --amend (I think - I'm basing
this on internal bug reports). My hope is that this output will guide
users a little more towards the expected workflow.

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.Dec 10 2020, 11:47 AM
martinvonz requested changes to this revision.Dec 10 2020, 12:07 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
hgext/histedit.py
37

This line (same on line 60) sounds at least as confusing. How about "use commit, but edit before committing" or something like that?

This revision now requires changes to proceed.Dec 10 2020, 12:07 PM
durin42 marked an inline comment as done.Dec 10 2020, 1:15 PM

Sent D9561 to discuss the wording change there. PTAL?

martinvonz added inline comments.Dec 10 2020, 1:31 PM
hgext/histedit.py
802

What does "amend" mean here? Amend into the parent commit? Or amend relative to the original commit? I think it's the latter, but it sounds like the former to me. Maybe simply s/amend/rewrite/ would make it clearer?

durin42 updated this revision to Diff 24174.Dec 10 2020, 1:42 PM
durin42 marked an inline comment as done.Dec 10 2020, 1:43 PM
durin42 added inline comments.
hgext/histedit.py
802

I went with edit because characters are pretty precious at this point. If that's not clear enough (I honestly can't tell), please feel encouraged to suggest alternatives that can keep this line in its 80col limit.

martinvonz accepted this revision.Dec 10 2020, 1:45 PM
martinvonz added inline comments.
hgext/histedit.py
802

That seems good enough. My problem with "amend" is that hg amend is about squashing the working copy changes into the working copy parent, which I don't think is what we're doing here.

This revision is now accepted and ready to land.Dec 10 2020, 1:45 PM
durin42 marked an inline comment as done.Dec 10 2020, 1:57 PM
durin42 added a commit: rHG3f82a915ab2a: histedit: tweak `edit` message to try and guide users to our workflow.
Closed by commit rHG3f82a915ab2a: histedit: tweak `edit` message to try and guide users to our workflow (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24176

hgext/histedit.py

pick 7c2fd3b9020c Add delta pick 7c2fd3b9020c Add delta
# Edit history between c561b4e977df and 7c2fd3b9020c # Edit history between c561b4e977df and 7c2fd3b9020c
# #
# Commits are listed from least to most recent # Commits are listed from least to most recent
# #
# Commands: # Commands:
# p, pick = use commit # p, pick = use commit
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
martinvonzUnsubmitted
Done

This line (same on line 60) sounds at least as confusing. How about "use commit, but edit before committing" or something like that?

martinvonz: This line (same on line 60) sounds at least as confusing. How about "use commit, but edit…
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history # d, drop = remove commit from history
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# b, base = checkout changeset and apply further changesets from there # b, base = checkout changeset and apply further changesets from there
# #
In this file, lines beginning with ``#`` are ignored. You must specify a rule In this file, lines beginning with ``#`` are ignored. You must specify a rule
@action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True) @action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True)
class edit(histeditaction): class edit(histeditaction):
def run(self): def run(self):
repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
hg.update(repo, self.state.parentctxnode, quietempty=True) hg.update(repo, self.state.parentctxnode, quietempty=True)
applychanges(repo.ui, repo, rulectx, {}) applychanges(repo.ui, repo, rulectx, {})
hint = _(b'to edit %s, `hg histedit --continue` after making changes')
martinvonzUnsubmitted
Done

What does "amend" mean here? Amend into the parent commit? Or amend relative to the original commit? I think it's the latter, but it sounds like the former to me. Maybe simply s/amend/rewrite/ would make it clearer?

martinvonz: What does "amend" mean here? Amend into the parent commit? Or amend relative to the original…
durin42AuthorUnsubmitted
Done

I went with edit because characters are pretty precious at this point. If that's not clear enough (I honestly can't tell), please feel encouraged to suggest alternatives that can keep this line in its 80col limit.

durin42: I went with edit because characters are pretty precious at this point. If that's not clear…
martinvonzUnsubmitted
Not Done

That seems good enough. My problem with "amend" is that hg amend is about squashing the working copy changes into the working copy parent, which I don't think is what we're doing here.

martinvonz: That seems good enough. My problem with "amend" is that `hg amend` is about squashing the…
raise error.InterventionRequired( raise error.InterventionRequired(
_(b'Editing (%s), you may commit or record as needed now.') _(b'Editing (%s), commit as needed now to split the change')
% node.short(self.node), % node.short(self.node),
hint=_(b'hg histedit --continue to resume'), hint=hint % node.short(self.node),
) )
def commiteditor(self): def commiteditor(self):
return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit') return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit')
@action([b'fold', b'f'], _(b'use commit, but combine it with the one above')) @action([b'fold', b'f'], _(b'use commit, but combine it with the one above'))
class fold(histeditaction): class fold(histeditaction):

tests/test-histedit-arguments.t

| |
o 2 eb57 three o 2 eb57 three
| |
~ ~
$ HGEDITOR=cat hg histedit -r 4 --commands - << EOF $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF
> edit 08d98a8350f3 4 five > edit 08d98a8350f3 4 five
> EOF > EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Editing (08d98a8350f3), you may commit or record as needed now. Editing (08d98a8350f3), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 08d98a8350f3, `hg histedit --continue` after making changes)
[240] [240]
$ hg graft --continue $ hg graft --continue
abort: no graft in progress abort: no graft in progress
(continue: hg histedit --continue) (continue: hg histedit --continue)
[20] [20]
$ mv .hg/histedit-state .hg/histedit-state.back $ mv .hg/histedit-state .hg/histedit-state.back
Test --continue with --keep Test --continue with --keep
$ hg strip -q -r . --config extensions.strip= $ hg strip -q -r . --config extensions.strip=
$ hg histedit '.^' -q --keep --commands - << EOF $ hg histedit '.^' -q --keep --commands - << EOF
> edit eb57da33312f 2 three > edit eb57da33312f 2 three
> pick f3cfcca30c44 4 x > pick f3cfcca30c44 4 x
> EOF > EOF
Editing (eb57da33312f), you may commit or record as needed now. Editing (eb57da33312f), commit as needed now to split the change
(hg histedit --continue to resume) (to edit eb57da33312f, `hg histedit --continue` after making changes)
[240] [240]
$ echo edit >> alpha $ echo edit >> alpha
$ hg histedit -q --continue $ hg histedit -q --continue
$ hg log -G -T '{rev}:{node|short} {desc}' $ hg log -G -T '{rev}:{node|short} {desc}'
@ 6:8fda0c726bf2 x @ 6:8fda0c726bf2 x
| |
o 5:63379946892c three o 5:63379946892c three
| |
o 0:6058cbb6cfd7 one o 0:6058cbb6cfd7 one
Test that abort fails gracefully on exception Test that abort fails gracefully on exception
---------------------------------------------- ----------------------------------------------
$ hg histedit . -q --commands - << EOF $ hg histedit . -q --commands - << EOF
> edit 8fda0c726bf2 6 x > edit 8fda0c726bf2 6 x
> EOF > EOF
Editing (8fda0c726bf2), you may commit or record as needed now. Editing (8fda0c726bf2), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 8fda0c726bf2, `hg histedit --continue` after making changes)
[240] [240]
Corrupt histedit state file Corrupt histedit state file
$ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit
$ mv ../corrupt-histedit .hg/histedit-state $ mv ../corrupt-histedit .hg/histedit-state
$ hg abort $ hg abort
warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !) abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !)
abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !) abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[240] [240]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --cont $ hg histedit --cont
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
Editing (6f2f0241f119), you may commit or record as needed now. Editing (6f2f0241f119), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 6f2f0241f119, `hg histedit --continue` after making changes)
[240] [240]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg commit --amend -m 'reject this fold' $ hg commit --amend -m 'reject this fold'
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[20] [20]

tests/test-histedit-commute.t

$ cat > $EDITED <<EOF $ cat > $EDITED <<EOF
> edit 177f92b77385 c > edit 177f92b77385 c
> pick e860deea161a e > pick e860deea161a e
> pick 652413bf663e f > pick 652413bf663e f
> pick 055a42cdd887 d > pick 055a42cdd887 d
> EOF > EOF
$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
0 files updated, 0 files merged, 4 files removed, 0 files unresolved 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
Editing (177f92b77385), you may commit or record as needed now. Editing (177f92b77385), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 177f92b77385, `hg histedit --continue` after making changes)
rules should end up in .hg/histedit-last-edit.txt: rules should end up in .hg/histedit-last-edit.txt:
$ cat .hg/histedit-last-edit.txt $ cat .hg/histedit-last-edit.txt
edit 177f92b77385 c edit 177f92b77385 c
pick e860deea161a e pick e860deea161a e
pick 652413bf663e f pick 652413bf663e f
pick 055a42cdd887 d pick 055a42cdd887 d

tests/test-histedit-edit.t

$ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle $ hg histedit 177f92b77385 --commands - 2>&1 << EOF| fixbundle
> pick 177f92b77385 c > pick 177f92b77385 c
> pick 055a42cdd887 d > pick 055a42cdd887 d
> edit e860deea161a e > edit e860deea161a e
> pick 652413bf663e f > pick 652413bf663e f
> pick 3c6a8ed2ebe8 g > pick 3c6a8ed2ebe8 g
> EOF > EOF
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
Editing (e860deea161a), you may commit or record as needed now. Editing (e860deea161a), commit as needed now to split the change
(hg histedit --continue to resume) (to edit e860deea161a, `hg histedit --continue` after making changes)
try to update and get an error try to update and get an error
$ hg update tip $ hg update tip
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[20] [20]
edit the plan via the editor edit the plan via the editor
Stripping necessary commits should not break --abort Stripping necessary commits should not break --abort
$ hg histedit 1a60820cd1f6 --commands - 2>&1 << EOF| fixbundle $ hg histedit 1a60820cd1f6 --commands - 2>&1 << EOF| fixbundle
> edit 1a60820cd1f6 wat > edit 1a60820cd1f6 wat
> pick a5e1ba2f7afb foobaz > pick a5e1ba2f7afb foobaz
> pick b5f70786f9b0 g > pick b5f70786f9b0 g
> EOF > EOF
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
Editing (1a60820cd1f6), you may commit or record as needed now. Editing (1a60820cd1f6), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 1a60820cd1f6, `hg histedit --continue` after making changes)
$ mv .hg/histedit-state .hg/histedit-state.bak $ mv .hg/histedit-state .hg/histedit-state.bak
$ hg strip -q -r b5f70786f9b0 $ hg strip -q -r b5f70786f9b0
$ mv .hg/histedit-state.bak .hg/histedit-state $ mv .hg/histedit-state.bak .hg/histedit-state
$ hg histedit --abort $ hg histedit --abort
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
foobaz foobaz
$ hg histedit tip --commands - 2>&1 <<EOF| fixbundle $ hg histedit tip --commands - 2>&1 <<EOF| fixbundle
> edit b5f70786f9b0 f > edit b5f70786f9b0 f
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (b5f70786f9b0), you may commit or record as needed now. Editing (b5f70786f9b0), commit as needed now to split the change
(hg histedit --continue to resume) (to edit b5f70786f9b0, `hg histedit --continue` after making changes)
$ hg status $ hg status
A f A f
$ hg summary $ hg summary
parent: 5:a5e1ba2f7afb parent: 5:a5e1ba2f7afb
foobaz foobaz
branch: default branch: default
commit: 1 added (new branch head) commit: 1 added (new branch head)
$ cd .. $ cd ..
$ hg clone -qr0 r r0 $ hg clone -qr0 r r0
$ cd r0 $ cd r0
$ hg phase -fdr0 $ hg phase -fdr0
$ hg histedit --commands - 0 2>&1 << EOF $ hg histedit --commands - 0 2>&1 << EOF
> edit cb9a9f314b8b a > $EDITED > edit cb9a9f314b8b a > $EDITED
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (cb9a9f314b8b), you may commit or record as needed now. Editing (cb9a9f314b8b), commit as needed now to split the change
(hg histedit --continue to resume) (to edit cb9a9f314b8b, `hg histedit --continue` after making changes)
[240] [240]
$ HGEDITOR=true hg histedit --continue $ HGEDITOR=true hg histedit --continue
saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg
$ hg log -G $ hg log -G
@ changeset: 0:0efcea34f18a @ changeset: 0:0efcea34f18a
tag: tip tag: tip
user: test user: test

tests/test-histedit-no-backup.t

Test when `backup-bundle` config option is enabled: Test when `backup-bundle` config option is enabled:
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF $ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one > pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file
Editing (7d5187087c79), you may commit or record as needed now. Editing (7d5187087c79), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 7d5187087c79, `hg histedit --continue` after making changes)
[240] [240]
$ hg abort $ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg
Test when `backup-bundle` config option is not enabled Test when `backup-bundle` config option is not enabled
Enable config option: Enable config option:
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [rewrite] > [rewrite]
> backup-bundle = False > backup-bundle = False
> EOF > EOF
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF $ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one > pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file
Editing (7d5187087c79), you may commit or record as needed now. Editing (7d5187087c79), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 7d5187087c79, `hg histedit --continue` after making changes)
[240] [240]
$ hg abort $ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-no-change.t

o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
$ startediting 2 3 "(not changing anything)" # edit the 2nd of 3 changesets $ startediting 2 3 "(not changing anything)" # edit the 2nd of 3 changesets
% start editing the history (not changing anything) % start editing the history (not changing anything)
| pick 055a42cdd887 3 d | pick 055a42cdd887 3 d
| edit e860deea161a 4 e | edit e860deea161a 4 e
| pick 652413bf663e 5 f | pick 652413bf663e 5 f
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
Editing (e860deea161a), you may commit or record as needed now. Editing (e860deea161a), commit as needed now to split the change
(hg histedit --continue to resume) (to edit e860deea161a, `hg histedit --continue` after making changes)
$ continueediting true "(leaving commit message unaltered)" $ continueediting true "(leaving commit message unaltered)"
% finalize changeset editing (leaving commit message unaltered) % finalize changeset editing (leaving commit message unaltered)
check state of working copy check state of working copy
$ hg id $ hg id
794fe033d0a0 tip 794fe033d0a0 tip
o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
$ startediting 1,2 3 "(not changing anything)" # edit the 1st two of 3 changesets $ startediting 1,2 3 "(not changing anything)" # edit the 1st two of 3 changesets
% start editing the history (not changing anything) % start editing the history (not changing anything)
| edit 055a42cdd887 3 d | edit 055a42cdd887 3 d
| edit e860deea161a 4 e | edit e860deea161a 4 e
| pick 652413bf663e 5 f | pick 652413bf663e 5 f
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
Editing (055a42cdd887), you may commit or record as needed now. Editing (055a42cdd887), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 055a42cdd887, `hg histedit --continue` after making changes)
$ continueediting true "(leaving commit message unaltered)" $ continueediting true "(leaving commit message unaltered)"
% finalize changeset editing (leaving commit message unaltered) % finalize changeset editing (leaving commit message unaltered)
Editing (e860deea161a), you may commit or record as needed now. Editing (e860deea161a), commit as needed now to split the change
(hg histedit --continue to resume) (to edit e860deea161a, `hg histedit --continue` after making changes)
$ graphlog "log after first edit" $ graphlog "log after first edit"
% log after first edit % log after first edit
@ 6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d" @ 6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d"
| |
| o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" | o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
| | | |
| o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" | o 4 e860deea161a2f77de56603b340ebbb4536308ae "e"
| | | |
aborting and not changing files can skip mentioning updating (no) files aborting and not changing files can skip mentioning updating (no) files
$ hg up $ hg up
5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --close-branch -m 'closebranch' $ hg commit --close-branch -m 'closebranch'
$ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
% start editing the history (not changing anything) % start editing the history (not changing anything)
| edit 292aec348d9e 6 closebranch | edit 292aec348d9e 6 closebranch
Editing (292aec348d9e), you may commit or record as needed now. Editing (292aec348d9e), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 292aec348d9e, `hg histedit --continue` after making changes)
$ hg histedit --abort $ hg histedit --abort
$ cd .. $ cd ..

tests/test-histedit-obsolete.t

adding c adding c
$ echo a > d $ echo a > d
$ hg ci -Am c $ hg ci -Am c
adding d adding d
$ echo "pick `hg log -r 0 -T '{node|short}'`" > plan $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
$ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan
$ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan
$ hg histedit -r 'all()' --commands plan $ hg histedit -r 'all()' --commands plan
Editing (1b2d564fad96), you may commit or record as needed now. Editing (1b2d564fad96), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 1b2d564fad96, `hg histedit --continue` after making changes)
[240] [240]
$ hg st $ hg st
A b A b
A c A c
? plan ? plan
$ hg commit --amend b $ hg commit --amend b
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'histedit', 'user': 'test'} 114f4176969ef342759a8a57e6bccefc4234829b 49d44ab2be1b67a79127568a67c9c99430633b48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'histedit', 'user': 'test'}
With some node gone missing during the edit. With some node gone missing during the edit.
$ echo "pick `hg log -r 0 -T '{node|short}'`" > plan $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
$ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan
$ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan
$ hg histedit -r 'all()' --commands plan $ hg histedit -r 'all()' --commands plan
Editing (49d44ab2be1b), you may commit or record as needed now. Editing (49d44ab2be1b), commit as needed now to split the change
(hg histedit --continue to resume) (to edit 49d44ab2be1b, `hg histedit --continue` after making changes)
[240] [240]
$ hg st $ hg st
A b A b
A d A d
? plan ? plan
$ hg commit --amend -X . -m XXXXXX $ hg commit --amend -X . -m XXXXXX
$ hg commit --amend -X . -m b2 $ hg commit --amend -X . -m b2
$ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
$ hg up '.^' $ hg up '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r 'children(.)' $ hg log -r 'children(.)'
11:c13eb81022ca f (no-eol) 11:c13eb81022ca f (no-eol)
$ hg histedit -r '.' --commands - <<EOF $ hg histedit -r '.' --commands - <<EOF
> edit b346ab9a313d 6 c > edit b346ab9a313d 6 c
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (b346ab9a313d), you may commit or record as needed now. Editing (b346ab9a313d), commit as needed now to split the change
(hg histedit --continue to resume) (to edit b346ab9a313d, `hg histedit --continue` after making changes)
[240] [240]
$ echo c >> c $ echo c >> c
$ hg histedit --continue $ hg histedit --continue
1 new orphan changesets 1 new orphan changesets
$ hg log -r 'orphan()' $ hg log -r 'orphan()'
11:c13eb81022ca f (no-eol) 11:c13eb81022ca f (no-eol)
> edit b449568bf7fc 11 f > edit b449568bf7fc 11 f
> pick 6b70183d2492 12 g > pick 6b70183d2492 12 g
> pick 7395e1ff83bd 13 h > pick 7395e1ff83bd 13 h
> pick b605fb7503f2 14 i > pick b605fb7503f2 14 i
> pick 3a6c53ee7f3d 15 j > pick 3a6c53ee7f3d 15 j
> pick ee118ab9fa44 16 k > pick ee118ab9fa44 16 k
> EOF > EOF
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
Editing (b449568bf7fc), you may commit or record as needed now. Editing (b449568bf7fc), commit as needed now to split the change
(hg histedit --continue to resume) (to edit b449568bf7fc, `hg histedit --continue` after making changes)
[240] [240]
$ echo f >> f $ echo f >> f
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 24:12e89af74238 (secret) k @ 24:12e89af74238 (secret) k
| |
o 23:636a8687b22e (secret) j o 23:636a8687b22e (secret) j
| |
> edit b449568bf7fc 11 f > edit b449568bf7fc 11 f
> pick 6b70183d2492 12 g > pick 6b70183d2492 12 g
> pick 7395e1ff83bd 13 h > pick 7395e1ff83bd 13 h
> pick b605fb7503f2 14 i > pick b605fb7503f2 14 i
> pick 3a6c53ee7f3d 15 j > pick 3a6c53ee7f3d 15 j
> pick ee118ab9fa44 16 k > pick ee118ab9fa44 16 k
> EOF > EOF
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
Editing (b449568bf7fc), you may commit or record as needed now. Editing (b449568bf7fc), commit as needed now to split the change
(hg histedit --continue to resume) (to edit b449568bf7fc, `hg histedit --continue` after making changes)
[240] [240]
$ echo f >> f $ echo f >> f
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 24:12e89af74238 (secret) k @ 24:12e89af74238 (secret) k
| |
o 23:636a8687b22e (secret) j o 23:636a8687b22e (secret) j
| |
$ hg histedit -r 'b449568bf7fc' --commands - << EOF $ hg histedit -r 'b449568bf7fc' --commands - << EOF
> pick b449568bf7fc 13 f > pick b449568bf7fc 13 f
> pick 7395e1ff83bd 15 h > pick 7395e1ff83bd 15 h
> pick 6b70183d2492 14 g > pick 6b70183d2492 14 g
> pick b605fb7503f2 16 i > pick b605fb7503f2 16 i
> roll 3a6c53ee7f3d 17 j > roll 3a6c53ee7f3d 17 j
> edit ee118ab9fa44 18 k > edit ee118ab9fa44 18 k
> EOF > EOF
Editing (ee118ab9fa44), you may commit or record as needed now. Editing (ee118ab9fa44), commit as needed now to split the change
(hg histedit --continue to resume) (to edit ee118ab9fa44, `hg histedit --continue` after making changes)
[240] [240]
#if abortcommand #if abortcommand
when in dry-run mode when in dry-run mode
$ hg abort --dry-run $ hg abort --dry-run
histedit in progress, will be aborted histedit in progress, will be aborted
#endif #endif
$ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.evolution.track-operation=1 $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.evolution.track-operation=1
> pick b449568bf7fc 13 f > pick b449568bf7fc 13 f
> pick 7395e1ff83bd 15 h > pick 7395e1ff83bd 15 h
> pick 6b70183d2492 14 g > pick 6b70183d2492 14 g
> pick b605fb7503f2 16 i > pick b605fb7503f2 16 i
> pick 3a6c53ee7f3d 17 j > pick 3a6c53ee7f3d 17 j
> edit ee118ab9fa44 18 k > edit ee118ab9fa44 18 k
> EOF > EOF
Editing (ee118ab9fa44), you may commit or record as needed now. Editing (ee118ab9fa44), commit as needed now to split the change
(hg histedit --continue to resume) (to edit ee118ab9fa44, `hg histedit --continue` after making changes)
[240] [240]
$ hg histedit --continue --config experimental.evolution.track-operation=1 $ hg histedit --continue --config experimental.evolution.track-operation=1
$ hg log -G $ hg log -G
@ 23:175d6b286a22 (secret) k @ 23:175d6b286a22 (secret) k
| |
o 22:44ca09d59ae4 (secret) j o 22:44ca09d59ae4 (secret) j
| |
o 21:31747692a644 (secret) i o 21:31747692a644 (secret) i

tests/test-qrecord.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: foo bar summary: foo bar
$ hg histedit tip --commands - 2>&1 <<EOF $ hg histedit tip --commands - 2>&1 <<EOF
> edit ea55e2ae468f foo bar > edit ea55e2ae468f foo bar
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Editing (ea55e2ae468f), you may commit or record as needed now. Editing (ea55e2ae468f), commit as needed now to split the change
(hg histedit --continue to resume) (to edit ea55e2ae468f, `hg histedit --continue` after making changes)
[240] [240]
$ echo 'foo bar' > a $ echo 'foo bar' > a
$ hg qrecord -d '0 0' -m aaa a.patch <<EOF $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
> y > y
> y > y
> n > n
> y > y
> y > y
> n > n
> EOF > EOF
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[20] [20]

tests/test-rebase-pull.t

[20] [20]
$ hg update --clean --quiet $ hg update --clean --quiet
Abort pull early if another operation (histedit) is in progress: Abort pull early if another operation (histedit) is in progress:
$ hg histedit . -q --commands - << EOF $ hg histedit . -q --commands - << EOF
> edit d80cc2da061e histedit: generate unfinished state > edit d80cc2da061e histedit: generate unfinished state
> EOF > EOF
Editing (d80cc2da061e), you may commit or record as needed now. Editing (d80cc2da061e), commit as needed now to split the change
(hg histedit --continue to resume) (to edit d80cc2da061e, `hg histedit --continue` after making changes)
[240] [240]
$ hg pull --rebase $ hg pull --rebase
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[20] [20]
$ hg histedit --abort --quiet $ hg histedit --abort --quiet
Abort pull early with pending uncommitted merge: Abort pull early with pending uncommitted merge: