upstream/mercurial-mirror Commit - r27406:11be6b7f

histedit: omit useless message from update (_histedit)...

timeless -

r27406:11be6b7f default

parent child

hgext/histedit.py

0 +1 -1

                     state.replacements.extend(replacement_)
                 state.write()
-                hg.update(repo, state.parentctxnode)
+                hg.update(repo, state.parentctxnode, quietempty=True)
                 mapping, tmpnodes, created, ntm = processreplacement(state)
                 if mapping:

tests/test-histedit-arguments.t

0 0 -10

               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             Run on a revision not ancestors of the current working directory.
             --------------------------------------------------------------------
               > pick c8e68270e35a 3 four
               > pick 08d98a8350f3 4 five
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg up --quiet
               $ HGEDITOR=cat hg histedit 'tip:2' --commands - << EOF
               > pick c8e68270e35a 3 four
               > pick 08d98a8350f3 4 five
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg up --quiet
             Test config specified default
               > pick c8e68270e35a 3 four
               > pick 08d98a8350f3 4 five
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             Run on a revision not descendants of the initial parent
             --------------------------------------------------------------------
               $ mv .hg/histedit-state.back .hg/histedit-state
               $ hg histedit --continue
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-backup.hg (glob)
               $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
               @  4 f5ed five
               HG: branch 'default'
               HG: changed alpha
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-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/*-backup.hg (glob)
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             Test --continue with --keep
               > pick 463b8c0d2973
               > pick 8cdc02b9bc63
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             Default base revision should stop at branchpoint
               > pick 931820154288
               > pick 4c35cdf97d5e
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             Default base revision should stop at merge commit
               > pick 6f2f0241f119
               > pick 8cde254db839
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-base.t

0 0 -4

               > pick 5fddd98957c8 C
               > pick 32af7686d403 D
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg tglog
               @  7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D'
               > drop f778d1cbddac C
               > pick 0937e82309df D
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg tglog
               @  6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D'
               > base cd010b8cd998
               > pick 476cc3e4168d D
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg tglog
               @  6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D'
               $ hg resolve --mark B
               (no more unresolved files)
               $ hg histedit --continue | fixbundle
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg tglog
               @  6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
               |

tests/test-histedit-bookmark-motion.t

0 0 -2

               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg histedit 1 --commands - --verbose << EOF | grep histedit
               > pick 177f92b77385 2 c
               > drop d2ae7f538514 1 b
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg histedit 1 --commands - --verbose << EOF | grep histedit
               > pick b346ab9a313d 1 c
               > pick cacdfd884a93 3 f

tests/test-histedit-commute.t

0 0 -8

               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             edit the history
             (use a hacky editor to check histedit-last-edit.txt backup)
               > EOF
               $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
 files updated, 0 files merged, 3 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             rules should end up in .hg/histedit-last-edit.txt:
               $ cat .hg/histedit-last-edit.txt
               > pick 8ade9693061e f
               > EOF
 files updated, 0 files merged, 3 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log --graph
               @  changeset:   5:7eca9b5b1148
               > pick 177f92b77385 c
               > EOF
 files updated, 0 files merged, 4 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log --graph
               @  changeset:   5:38b92f448761
               |  tag:         tip
               > pick de71b079d9ce e
               > EOF
 files updated, 0 files merged, 2 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log --graph
               @  changeset:   7:803ef1c6fcfd
               |  tag:         tip
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             should also work if a commit message is missing
               $ BUNDLE="$TESTDIR/missing-comment.hg"
                  summary:     Checked in text file
               $ hg histedit 0
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ cd ..
               $ cd ..
               removing initial-dir/initial-file (glob)
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-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/*-backup.hg (glob)

tests/test-histedit-drop.t

0 0 -1

               > pick 055a42cdd887 d
               > EOF
 files updated, 0 files merged, 4 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             log after edit
               $ hg log --graph

tests/test-histedit-edit.t

0 0 -5

               (use 'hg histedit --continue' or 'hg histedit --abort')
               [255]
               $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log --graph
               @  changeset:   6:b5f70786f9b0
               HG: user: test
               HG: branch 'default'
               HG: added f
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob)
               $ hg status
               > EOF
               $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle
 files updated, 0 files merged, 1 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg status
               $ hg log --limit 1
               changeset:   6:1fd3b2fe7754
               > mess 1fd3b2fe7754 f
               > EOF
 files updated, 0 files merged, 1 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg status
               $ hg log --limit 1
               changeset:   6:62feedb1200e
               When you are finished, run hg histedit --continue to resume.
               [1]
               $ HGEDITOR=true hg histedit --continue
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob)
               $ hg log -G

tests/test-histedit-fold-non-commute.t

0 0 -2

               (no more unresolved files)
               $ hg histedit --continue 2>&1 | fixbundle
 b4e2f4b7bcd: empty changeset
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             log after edit
               $ hg log --graph
               (no more unresolved files)
               $ hg histedit --continue 2>&1 | fixbundle
 b4e2f4b7bcd: empty changeset
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             log after edit
               $ hg log --graph

tests/test-histedit-fold.t

0 0 -8

 files updated, 0 files merged, 4 files removed, 0 files unresolved
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             log after edit
               $ hg logt --graph
 files updated, 0 files merged, 4 files removed, 0 files unresolved
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ HGEDITOR=$OLDHGEDITOR
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             tip after edit
               $ hg log --rev .
               (no more unresolved files)
               $ hg histedit --continue
 d831eeec5: empty changeset
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/*-backup.hg (glob)
               $ hg logt --graph
               @  1:617f94f13c0f +4
               HG: branch 'default'
               HG: changed file
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob)
               saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob)
               $ hg logt -G
               reverting b.txt
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 1 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg logt --follow b.txt
 :cf858d235c76 rename
 files updated, 0 files merged, 3 files removed, 0 files unresolved
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               commit 9599899f62c05f4377548c32bf1c9f1a39634b0c
               $ hg logt
               merging foo
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg logt
 :e8bedbda72c1 merged foos
 :578c7455730c a

tests/test-histedit-no-change.t

0 0 -1

               When you are finished, run hg histedit --continue to resume.
               $ continueediting true "(leaving commit message unaltered)"
               % finalize changeset editing (leaving commit message unaltered)
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             check state of working copy

tests/test-histedit-non-commute.t

0 0 -2

               (no more unresolved files)
               $ hg histedit --continue 2>&1 | fixbundle
 b4e2f4b7bcd: empty changeset
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             log after edit
               $ hg log --graph
               (no more unresolved files)
               $ hg histedit --continue 2>&1 | fixbundle
 b4e2f4b7bcd: empty changeset
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             post message fix
               $ hg log --graph

tests/test-histedit-obsolete.t

0 0 -9

               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
               > pick 177f92b77385 2 c
               > drop d2ae7f538514 1 b
               > pick cacdfd884a93 8 f
               > EOF
 files updated, 0 files merged, 3 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log --graph
               @  11:c13eb81022ca f
               |
               > pick b346ab9a313d 6 c
               > pick c13eb81022ca 8 f
               > EOF
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               [1]
               $ echo c >> c
               $ hg histedit --continue
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log -r 'unstable()'
 :c13eb81022ca f (no-eol)
               > drop 1b3b05f35ff0 13 h
               > EOF
 files updated, 0 files merged, 3 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log -G
               @  17:ee6544123ab8 c
               |
               [1]
               $ echo f >> f
               $ hg histedit --continue
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log -G
               @  24:12925f763c90 (secret) k
               |
               [1]
               $ echo f >> f
               $ hg histedit --continue
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log -G
               @  24:12925f763c90 (secret) k
               |
               > pick 14bda137d5b3 16 k
               > EOF
 files updated, 0 files merged, 5 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log -G
               @  23:9e712162b2c1 (secret) k
               |
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 2 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg log -G
               @  27:769e8ee8708e (secret) i
               |

tests/test-histedit-outgoing.t

0 0 -3

               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ cd ..
             show the error from unrelated repos
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ cd ..
             test sensitivity to branch in URL:
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #
-files updated, 0 files merged, 0 files removed, 0 files unresolved
             test to check number of roots in outgoing revisions

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages