[PATCH] histedit: print action before running it

Augie Fackler raf at durin42.com
Fri Dec 18 10:27:45 CST 2015


On Tue, Dec 15, 2015 at 11:58:39AM -0800, Mateusz Kwapich wrote:
> # HG changeset patch
> # User Mateusz Kwapich <mitrandir at fb.com>
> # Date 1450209271 28800
> #      Tue Dec 15 11:54:31 2015 -0800
> # Node ID 552a82deb36fee623ed3ba0a6e873e65790f070d
> # Parent  ac6ba92bd08a14b951e216b335fde66c6a01ec69
> histedit: print action before running it

So, until I saw the patches from timeless for progress, I thought this
was a good idea. Now I'm less sure. Can you two chat here and figure
out which you think is better?

(I have a draft decision, which I won't disclose for fear of biasing the discussion.)

>
> Let's print the histedit action name before executing it - it will allow the
> users to understand the state of histedit in the moment of stopping for user
> intervention: They will know which actions did run successfully, and which
> action was being executed before the histedit stopped.
>
> It might be counter argued that such behavior is not happening in other
> commands like rebase. But in my opinion histedit is highly powerful and very
> interactive command so it should be more verbose.
>
> It's worth mentioning that almost every action prints not so helpful output
> like: (not helpful because you don't really know its context when it's printed)
>   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
> This change will make those lines at least meaningful. But I think we should
> get rid of them.
>
> If the output gets too noisy for some people with very long series we should consider
> changing this to progress bar above some fixed number of actions. (it's not so trivial
> because this progress bar will be colliding with update progress bar etc). Histedit is
> mainly an interactive tool for editing series of sane length so let's aim for
> this usecase now.
>
> diff --git a/hgext/color.py b/hgext/color.py
> --- a/hgext/color.py
> +++ b/hgext/color.py
> @@ -101,6 +101,7 @@
>    shelve.newest = green bold
>    shelve.name = blue bold
>
> +  histedit.action =  bold
>    histedit.remaining = red bold
>
>  Custom colors
> @@ -334,6 +335,7 @@
>             'diffstat.deleted': 'red',
>             'diffstat.inserted': 'green',
>             'histedit.remaining': 'red bold',
> +           'histedit.action': 'bold',
>             'ui.prompt': 'yellow',
>             'log.changeset': 'yellow',
>             'patchbomb.finalsummary': '',
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -1109,8 +1109,7 @@
>      while state.actions:
>          state.write()
>          actobj = state.actions.pop(0)
> -        ui.debug('histedit: processing %s %s\n' % (actobj.verb,\
> -                                                   actobj.torule()))
> +        ui.write("%s\n" % actobj.torule(), label="histedit.action")
>          parentctx, replacement_ = actobj.run()
>          state.parentctxnode = parentctx.node()
>          state.replacements.extend(replacement_)
> diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
> --- a/tests/test-histedit-arguments.t
> +++ b/tests/test-histedit-arguments.t
> @@ -71,6 +71,9 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick eb57da33312f 2 three
> +  pick c8e68270e35a 3 four
> +  pick 08d98a8350f3 4 five
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  Run on a revision not ancestors of the current working directory.
> @@ -92,6 +95,9 @@
>    > pick c8e68270e35a 3 four
>    > pick 08d98a8350f3 4 five
>    > EOF
> +  pick eb57da33312f 2 three
> +  pick c8e68270e35a 3 four
> +  pick 08d98a8350f3 4 five
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg up --quiet
>
> @@ -100,6 +106,9 @@
>    > pick c8e68270e35a 3 four
>    > pick 08d98a8350f3 4 five
>    > EOF
> +  pick eb57da33312f 2 three
> +  pick c8e68270e35a 3 four
> +  pick 08d98a8350f3 4 five
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg up --quiet
>
> @@ -110,6 +119,8 @@
>    > pick c8e68270e35a 3 four
>    > pick 08d98a8350f3 4 five
>    > EOF
> +  pick c8e68270e35a 3 four
> +  pick 08d98a8350f3 4 five
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  Run on a revision not descendants of the initial parent
> @@ -130,6 +141,7 @@
>    $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF
>    > edit 08d98a8350f3 4 five
>    > EOF
> +  edit 08d98a8350f3 4 five
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    reverting alpha
>    Make changes as needed, you may commit or record as needed now.
> @@ -235,6 +247,9 @@
>    > p    c8e68270e35a 3 four
>    > f 08d98a8350f3 4 five
>    > EOF
> +  pick eb57da33312f 2 three
> +  pick c8e68270e35a 3 four
> +  fold 08d98a8350f3 4 five
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    reverting alpha
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -252,7 +267,7 @@
>    HG: changed alpha
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/foo/.hg/strip-backup/e3f0c46fcc04-a16c3421-backup.hg (glob)
>    saved backup bundle to $TESTTMP/foo/.hg/strip-backup/c8e68270e35a-23a13bf9-backup.hg (glob)
>
>    $ hg update -q 2
> @@ -295,6 +310,7 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick 3d3ea1f3a10b 5 1234567890123456789012345678901234567890123456789012345\xe3\x81\x82... (esc)
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  Test --continue with --keep
> @@ -304,11 +320,13 @@
>    > edit eb57da33312f 2 three
>    > pick f3cfcca30c44 4 x
>    > EOF
> +  edit eb57da33312f 2 three
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
>    [1]
>    $ echo edit >> alpha
>    $ hg histedit -q --continue
> +  pick f3cfcca30c44 4 x
>    $ hg log -G -T '{rev}:{node|short} {desc}'
>    @  6:8fda0c726bf2 x
>    |
> @@ -331,6 +349,7 @@
>    $ hg histedit . -q --commands - << EOF
>    > edit 8fda0c726bf2 6 x
>    > EOF
> +  edit 8fda0c726bf2 6 x
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
>    [1]
> @@ -426,6 +445,8 @@
>    > pick 463b8c0d2973
>    > pick 8cdc02b9bc63
>    > EOF
> +  pick 463b8c0d2973 4 head 1 draft 1
> +  pick 8cdc02b9bc63 5 head 1 draft 2
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  Default base revision should stop at branchpoint
> @@ -435,6 +456,8 @@
>    > pick 931820154288
>    > pick 4c35cdf97d5e
>    > EOF
> +  pick 931820154288 6 head 2 commit 1
> +  pick 4c35cdf97d5e 7 head 2 commit 2
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  Default base revision should stop at merge commit
> @@ -444,4 +467,6 @@
>    > pick 6f2f0241f119
>    > pick 8cde254db839
>    > EOF
> +  pick 6f2f0241f119 11 commit 1 after merge
> +  pick 8cde254db839 12 commit 2 after merge
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t
> --- a/tests/test-histedit-base.t
> +++ b/tests/test-histedit-base.t
> @@ -54,8 +54,12 @@
>    > pick 5fddd98957c8 C
>    > pick 32af7686d403 D
>    > EOF
> +  base 02de42196ebe 7 H
> +  pick 42ccdea3bb16 1 B
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 5fddd98957c8 2 C
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 32af7686d403 3 D
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -83,7 +87,11 @@
>    > drop f778d1cbddac C
>    > pick 0937e82309df D
>    > EOF
> +  base cd010b8cd998 0 A
> +  pick 3d41b7cc7085 5 B
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  drop f778d1cbddac 6 C
> +  pick 0937e82309df 7 D
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -109,6 +117,10 @@
>    > base cd010b8cd998
>    > pick 476cc3e4168d D
>    > EOF
> +  base cd010b8cd998 0 A
> +  pick d273e35dcdf2 5 B
> +  base cd010b8cd998 0 A
> +  pick 476cc3e4168d 6 D
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -153,6 +165,9 @@
>    > drop d7a6f907a822 D
>    > pick 591369deedfd X
>    > EOF
> +  base d273e35dcdf2 5 B
> +  drop d7a6f907a822 6 D
> +  pick 591369deedfd 7 X
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging B
>    warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
> @@ -182,6 +197,9 @@
>    > drop d7a6f907a822 D
>    > pick 591369deedfd X
>    > EOF
> +  base d273e35dcdf2 5 B
> +  drop d7a6f907a822 6 D
> +  pick 591369deedfd 7 X
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging B
>    warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
> diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t
> --- a/tests/test-histedit-bookmark-motion.t
> +++ b/tests/test-histedit-bookmark-motion.t
> @@ -77,6 +77,11 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick d2ae7f538514 1 b
> +  pick 177f92b77385 2 c
> +  pick 055a42cdd887 3 d
> +  pick e860deea161a 4 e
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg histedit 1 --commands - --verbose << EOF | grep histedit
>    > pick 177f92b77385 2 c
> @@ -138,6 +143,9 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick b346ab9a313d 1 c
> +  pick 59d9f330561f 2 d
> +  pick cacdfd884a93 3 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg histedit 1 --commands - --verbose << EOF | grep histedit
>    > pick b346ab9a313d 1 c
> diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t
> --- a/tests/test-histedit-commute.t
> +++ b/tests/test-histedit-commute.t
> @@ -71,6 +71,10 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick 177f92b77385 2 c
> +  pick 055a42cdd887 3 d
> +  pick e860deea161a 4 e
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  edit the history
> @@ -84,8 +88,12 @@
>    > pick 055a42cdd887 d
>    > EOF
>    $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
> +  pick 177f92b77385 2 c
> +  pick e860deea161a 4 e
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 055a42cdd887 3 d
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -138,8 +146,12 @@
>    > pick d8249471110a e
>    > pick 8ade9693061e f
>    > EOF
> +  pick 177f92b77385 2 c
> +  pick 07114f51870f 5 d
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
> +  pick d8249471110a 3 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 8ade9693061e 4 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -184,9 +196,13 @@
>    > pick 915da888f2de e
>    > pick 177f92b77385 c
>    > EOF
> +  pick 10517e47bbbb 3 d
>    0 files updated, 0 files merged, 4 files removed, 0 files unresolved
> +  pick 7eca9b5b1148 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 915da888f2de 4 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 177f92b77385 2 c
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log --graph
> @@ -229,7 +245,11 @@
>    > pick 38b92f448761 c
>    > pick de71b079d9ce e
>    > EOF
> +  pick 799205341b6b 2 d
> +  pick be9ae3a309c6 3 f
> +  pick 38b92f448761 5 c
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
> +  pick de71b079d9ce 4 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log --graph
> @@ -349,6 +369,9 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick ece0b8d93dda 6 c
> +  pick 803ef1c6fcfd 7 e
> +  pick 9c863c565126 8 extra commit to c
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  should also work if a commit message is missing
> @@ -380,6 +403,9 @@
>       summary:     Checked in text file
>
>    $ hg histedit 0
> +  pick 141947992243 0 Checked in text file
> +  pick 3b3e956f9171 1
> +  pick bd22688093b3 2 Update file.
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cd ..
>
> @@ -416,14 +442,17 @@
>    > EOF
>
>    $ HGEDITOR="sh ./editor.sh" hg histedit 0
> +  pick b0f4233702ca 0 initial commit
> +  fold 5e8704a8f2d2 1 moved and changed
>    1 files updated, 0 files merged, 1 files removed, 0 files unresolved
> -  adding another-dir/initial-file (glob)
> -  removing initial-dir/initial-file (glob)
> +  adding another-dir/initial-file
> +  removing initial-dir/initial-file
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 40e7299e8fa7 2 renamed
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/d60ca57757c3-a1f0c075-backup.hg (glob)
>    saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/b0f4233702ca-d99e7186-backup.hg (glob)
>
>    $ hg --config diff.git=yes export 0
> diff --git a/tests/test-histedit-drop.t b/tests/test-histedit-drop.t
> --- a/tests/test-histedit-drop.t
> +++ b/tests/test-histedit-drop.t
> @@ -59,8 +59,12 @@
>    > pick 652413bf663e f
>    > pick 055a42cdd887 d
>    > EOF
> +  drop 177f92b77385 2 c
> +  pick e860deea161a 4 e
>    0 files updated, 0 files merged, 4 files removed, 0 files unresolved
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 055a42cdd887 3 d
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -127,6 +131,9 @@
>    > pick a4f7421b80f7 f
>    > drop f518305ce889 d
>    > EOF
> +  pick ee283cb5f2d5 2 e
> +  pick a4f7421b80f7 3 f
> +  drop f518305ce889 4 d
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    $ hg log --graph
>    @  changeset:   3:a4f7421b80f7
> @@ -161,6 +168,10 @@
>    > pick cb9a9f314b8b a
>    > pick ee283cb5f2d5 e
>    > EOF
> +  drop a4f7421b80f7 3 f
> +  drop d2ae7f538514 1 b
> +  pick cb9a9f314b8b 0 a
> +  pick ee283cb5f2d5 2 e
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log --graph
> diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t
> --- a/tests/test-histedit-edit.t
> +++ b/tests/test-histedit-edit.t
> @@ -66,6 +66,9 @@
>    > pick 652413bf663e f
>    > pick 3c6a8ed2ebe8 g
>    > EOF
> +  pick 177f92b77385 2 c
> +  pick 055a42cdd887 3 d
> +  edit e860deea161a 4 e
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
> @@ -141,7 +144,9 @@
>    (use 'hg histedit --continue' or 'hg histedit --abort')
>    [255]
>    $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  drop 3c6a8ed2ebe8 6 g
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>    $ hg log --graph
> @@ -192,6 +197,7 @@
>    > pick a5e1ba2f7afb foobaz
>    > pick b5f70786f9b0 g
>    > EOF
> +  edit 1a60820cd1f6 4 wat
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
> @@ -234,6 +240,7 @@
>    $ hg histedit tip --commands - 2>&1 <<EOF| fixbundle
>    > edit b5f70786f9b0 f
>    > EOF
> +  edit b5f70786f9b0 6 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
> @@ -282,6 +289,7 @@
>    > mv tmp "\$1"
>    > EOF
>    $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle
> +  mess a107ee126658 6 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg status
> @@ -324,6 +332,7 @@
>    $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle
>    > mess 1fd3b2fe7754 f
>    > EOF
> +  mess 1fd3b2fe7754 6 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    abort: emulating unexpected abort
>    $ test -f .hg/last-message.txt
> @@ -351,6 +360,7 @@
>    $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF
>    > mess 1fd3b2fe7754 f
>    > EOF
> +  mess 1fd3b2fe7754 6 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    adding f
>    ==== before editing
> @@ -405,6 +415,7 @@
>    $ hg histedit tip --commands - 2>&1 << EOF | fixbundle
>    > mess 1fd3b2fe7754 f
>    > EOF
> +  mess 1fd3b2fe7754 6 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg status
> @@ -428,6 +439,7 @@
>    $ hg histedit --commands - 0 2>&1 << EOF
>    > edit cb9a9f314b8b a > $EDITED
>    > EOF
> +  edit cb9a9f314b8b 0 a
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    adding a
>    Make changes as needed, you may commit or record as needed now.
> @@ -457,6 +469,7 @@
>    > mv tmp "\$1"
>    > EOF
>    $ HGEDITOR="sh ../edit.sh" hg histedit 2
> +  fold 0012be4a27ea 2 extend a
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    reverting a
>    1 files updated, 0 files merged, 1 files removed, 0 files unresolved
> diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t
> --- a/tests/test-histedit-fold-non-commute.t
> +++ b/tests/test-histedit-fold-non-commute.t
> @@ -86,6 +86,9 @@
>
>  edit the history
>    $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
> +  pick 65a9a84f33fd 3 c
> +  pick 00f1c5383965 4 d
> +  fold 39522b764e3d 7 does not commute with e
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -120,6 +123,7 @@
>
>
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 7b4e2f4b7bcd 5 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -131,6 +135,7 @@
>    (no more unresolved files)
>    $ hg histedit --continue 2>&1 | fixbundle
>    7b4e2f4b7bcd: empty changeset
> +  pick 500cac37a696 6 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -249,6 +254,9 @@
>
>  edit the history
>    $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
> +  pick 65a9a84f33fd 3 c
> +  pick 00f1c5383965 4 d
> +  roll 39522b764e3d 7 does not commute with e
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -261,6 +269,7 @@
>    $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 7b4e2f4b7bcd 5 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -272,6 +281,7 @@
>    (no more unresolved files)
>    $ hg histedit --continue 2>&1 | fixbundle
>    7b4e2f4b7bcd: empty changeset
> +  pick 500cac37a696 6 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
> --- a/tests/test-histedit-fold.t
> +++ b/tests/test-histedit-fold.t
> @@ -54,11 +54,15 @@
>    > fold 177f92b77385 c
>    > pick 055a42cdd887 d
>    > EOF
> +  pick e860deea161a 4 e
>    0 files updated, 0 files merged, 4 files removed, 0 files unresolved
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  fold 177f92b77385 2 c
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 055a42cdd887 3 d
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -115,10 +119,14 @@
>    > pick 6de59d13424a f
>    > pick 9c277da72c9b d
>    > EOF
> +  pick d2ae7f538514 1 b
> +  roll ee283cb5f2d5 2 e
>    0 files updated, 0 files merged, 4 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 6de59d13424a 3 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 9c277da72c9b 4 d
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -184,6 +192,8 @@
>    > pick 8e03a72b6f83 f
>    > fold c4a9eb7989fc d
>    > EOF
> +  pick 8e03a72b6f83 2 f
> +  fold c4a9eb7989fc 3 d
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    adding d
>    allow non-folding commit
> @@ -245,6 +255,8 @@
>    > pick e860deea161a e
>    > fold a00ad806cb55 f
>    > EOF
> +  pick e860deea161a 4 e
> +  fold a00ad806cb55 5 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -294,6 +306,9 @@
>    > drop 888f9082bf99 2 +5
>    > fold 251d831eeec5 3 +6
>    > EOF
> +  pick 617f94f13c0f 1 +4
> +  drop 888f9082bf99 2 +5
> +  fold 251d831eeec5 3 +6
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging file
>    warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
> @@ -355,6 +370,9 @@
>    > drop 888f9082bf99 2 +5
>    > fold 251d831eeec5 3 +6
>    > EOF
> +  pick 617f94f13c0f 1 +4
> +  drop 888f9082bf99 2 +5
> +  fold 251d831eeec5 3 +6
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging file
>    warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
> @@ -445,6 +463,8 @@
>    > pick 1c4f440a8085 rename
>    > fold e0371e0426bc b
>    > EOF
> +  pick 1c4f440a8085 1 rename
> +  fold e0371e0426bc 2 b
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    reverting b.txt
>    1 files updated, 0 files merged, 1 files removed, 0 files unresolved
> @@ -492,10 +512,13 @@
>    > fold a1a953ffb4b0 c
>    > pick 6c795aa153cb a
>    > EOF
> +  pick 199b6bb90248 1 b
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
> +  fold a1a953ffb4b0 2 c
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 6c795aa153cb 0 a
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
> @@ -536,10 +559,14 @@
>    > fold b7389cc4d66e 3 foo2
>    > fold 21679ff7675c 4 foo3
>    > EOF
> +  pick 578c7455730c 1 a
> +  pick 0e01aeef5fa8 2 foo1
> +  _multifold b7389cc4d66e 3 foo2
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    reverting foo
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  fold 21679ff7675c 4 foo3
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging foo
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
> diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t
> --- a/tests/test-histedit-no-change.t
> +++ b/tests/test-histedit-no-change.t
> @@ -90,11 +90,14 @@
>    | pick 055a42cdd887 3 d
>    | edit e860deea161a 4 e
>    | pick 652413bf663e 5 f
> +  pick 055a42cdd887 3 d
> +  edit e860deea161a 4 e
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
>    $ continueediting true "(leaving commit message unaltered)"
>    % finalize changeset editing (leaving commit message unaltered)
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -143,11 +146,13 @@
>    | edit 055a42cdd887 3 d
>    | edit e860deea161a 4 e
>    | pick 652413bf663e 5 f
> +  edit 055a42cdd887 3 d
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
>    $ continueediting true "(leaving commit message unaltered)"
>    % finalize changeset editing (leaving commit message unaltered)
> +  edit e860deea161a 4 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    Make changes as needed, you may commit or record as needed now.
>    When you are finished, run hg histedit --continue to resume.
> diff --git a/tests/test-histedit-non-commute-abort.t b/tests/test-histedit-non-commute-abort.t
> --- a/tests/test-histedit-non-commute-abort.t
> +++ b/tests/test-histedit-non-commute-abort.t
> @@ -69,7 +69,11 @@
>    > pick e860deea161a e
>    > pick 652413bf663e f
>    > EOF
> +  pick 177f92b77385 2 c
> +  pick 055a42cdd887 3 d
> +  pick bfa474341cc9 6 does not commute with e
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
> +  pick e860deea161a 4 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
> --- a/tests/test-histedit-non-commute.t
> +++ b/tests/test-histedit-non-commute.t
> @@ -87,6 +87,9 @@
>
>  edit the history
>    $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
> +  pick 65a9a84f33fd 3 c
> +  pick 00f1c5383965 4 d
> +  pick 39522b764e3d 7 does not commute with e
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -144,6 +147,9 @@
>
>  edit the history
>    $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
> +  pick 65a9a84f33fd 3 c
> +  pick 00f1c5383965 4 d
> +  pick 39522b764e3d 7 does not commute with e
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -154,6 +160,7 @@
>    $ hg resolve --mark e
>    (no more unresolved files)
>    $ hg histedit --continue 2>&1 | fixbundle
> +  pick 7b4e2f4b7bcd 5 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -168,6 +175,7 @@
>    (no more unresolved files)
>    $ hg histedit --continue 2>&1 | fixbundle
>    7b4e2f4b7bcd: empty changeset
> +  pick 500cac37a696 6 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> @@ -231,6 +239,9 @@
>
>  edit the history, this time with a fold action
>    $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
> +  pick 65a9a84f33fd 3 c
> +  pick 00f1c5383965 4 d
> +  mess 39522b764e3d 7 does not commute with e
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -240,6 +251,7 @@
>    $ hg resolve --mark e
>    (no more unresolved files)
>    $ hg histedit --continue 2>&1 | fixbundle
> +  pick 7b4e2f4b7bcd 5 e
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    merging e
>    warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
> @@ -250,6 +262,7 @@
>    (no more unresolved files)
>    $ hg histedit --continue 2>&1 | fixbundle
>    7b4e2f4b7bcd: empty changeset
> +  pick 500cac37a696 6 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
> --- a/tests/test-histedit-obsolete.t
> +++ b/tests/test-histedit-obsolete.t
> @@ -56,6 +56,11 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick d2ae7f538514 1 b
> +  pick 177f92b77385 2 c
> +  pick 055a42cdd887 3 d
> +  pick e860deea161a 4 e
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
>    > pick 177f92b77385 2 c
> @@ -108,6 +113,9 @@
>    > drop 59d9f330561f 7 d
>    > pick cacdfd884a93 8 f
>    > EOF
> +  pick b346ab9a313d 6 c
> +  drop 59d9f330561f 9 d
> +  pick cacdfd884a93 10 f
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log --graph
> @@ -123,6 +131,8 @@
>    > pick b346ab9a313d 6 c
>    > pick c13eb81022ca 8 f
>    > EOF
> +  pick b346ab9a313d 6 c
> +  pick c13eb81022ca 11 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>
> @@ -137,6 +147,7 @@
>    $ hg histedit -r '.' --commands - <<EOF
>    > edit b346ab9a313d 6 c
>    > EOF
> +  edit b346ab9a313d 6 c
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    adding c
>    Make changes as needed, you may commit or record as needed now.
> @@ -178,6 +189,8 @@
>    > pick 40db8afa467b 10 c
>    > drop 947ece25170f 11 f
>    > EOF
> +  pick 40db8afa467b 12 c
> +  drop 947ece25170f 13 f
>    0 files updated, 0 files merged, 1 files removed, 0 files unresolved
>    $ hg log -G
>    @  12:40db8afa467b c
> @@ -198,8 +211,11 @@
>    > pick 40db8afa467b 10 c
>    > drop 1b3b05f35ff0 13 h
>    > EOF
> +  pick 47a8561c0449 14 g
>    0 files updated, 0 files merged, 3 files removed, 0 files unresolved
> +  pick 40db8afa467b 12 c
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  drop 1b3b05f35ff0 15 h
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log -G
>    @  17:ee6544123ab8 c
> @@ -284,6 +300,7 @@
>    > pick c62e7241a4f2 15 j
>    > pick 14bda137d5b3 16 k
>    > EOF
> +  edit 947ece25170f 13 f
>    0 files updated, 0 files merged, 6 files removed, 0 files unresolved
>    adding f
>    Make changes as needed, you may commit or record as needed now.
> @@ -291,10 +308,15 @@
>    [1]
>    $ echo f >> f
>    $ hg histedit --continue
> +  pick d22905de3528 14 g
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick ee4a24fc4dfa 15 h
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 9cd3934e05af 16 i
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick c62e7241a4f2 17 j
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 14bda137d5b3 18 k
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log -G
> @@ -333,6 +355,7 @@
>    > pick c62e7241a4f2 15 j
>    > pick 14bda137d5b3 16 k
>    > EOF
> +  edit 947ece25170f 13 f
>    0 files updated, 0 files merged, 6 files removed, 0 files unresolved
>    adding f
>    Make changes as needed, you may commit or record as needed now.
> @@ -340,10 +363,15 @@
>    [1]
>    $ echo f >> f
>    $ hg histedit --continue
> +  pick d22905de3528 14 g
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick ee4a24fc4dfa 15 h
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 9cd3934e05af 16 i
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick c62e7241a4f2 17 j
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 14bda137d5b3 18 k
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log -G
> @@ -382,10 +410,16 @@
>    > pick ee4a24fc4dfa 13 h
>    > pick 14bda137d5b3 16 k
>    > EOF
> +  pick 947ece25170f 13 f
> +  pick c62e7241a4f2 17 j
>    0 files updated, 0 files merged, 5 files removed, 0 files unresolved
> +  pick d22905de3528 14 g
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 9cd3934e05af 16 i
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick ee4a24fc4dfa 15 h
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 14bda137d5b3 18 k
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg log -G
> @@ -429,15 +463,21 @@
>    > pick 9cd3934e05af 14 i
>    > fold 14bda137d5b3 16 k
>    > EOF
> +  pick ee4a24fc4dfa 15 h
>    0 files updated, 0 files merged, 6 files removed, 0 files unresolved
> +  fold 947ece25170f 13 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick d22905de3528 14 g
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  fold c62e7241a4f2 17 j
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  pick 9cd3934e05af 16 i
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  fold 14bda137d5b3 18 k
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>    2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> diff --git a/tests/test-histedit-outgoing.t b/tests/test-histedit-outgoing.t
> --- a/tests/test-histedit-outgoing.t
> +++ b/tests/test-histedit-outgoing.t
> @@ -53,6 +53,9 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick 055a42cdd887 3 d
> +  pick e860deea161a 4 e
> +  pick 652413bf663e 5 f
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cd ..
>
> @@ -85,6 +88,9 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick 2a4042b45417 0 g
> +  pick 68c46b4927ce 1 h
> +  pick 51281e65ba79 2 i
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cd ..
>
> @@ -109,6 +115,7 @@
>    #  d, drop = remove commit from history
>    #  m, mess = edit commit message without changing commit content
>    #
> +  pick f26599ee3441 6 create foo branch
>    0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
>  test to check number of roots in outgoing revisions
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list