test-histedit-bookmark-motion.t
179 lines
| 5.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-histedit-bookmark-motion.t
Augie Fackler
|
r17064 | $ . "$TESTDIR/histedit-helpers.sh" | ||
Augie Fackler
|
r17065 | $ cat >> $HGRCPATH <<EOF | ||
Augie Fackler
|
r17064 | > [extensions] | ||
> graphlog= | ||||
> histedit= | ||||
> EOF | ||||
$ hg init r | ||||
$ cd r | ||||
Augie Fackler
|
r17065 | |||
Augie Fackler
|
r17064 | $ for x in a b c d e f ; do | ||
> echo $x > $x | ||||
> hg add $x | ||||
> hg ci -m $x | ||||
> done | ||||
$ hg book -r 1 will-move-backwards | ||||
$ hg book -r 2 two | ||||
$ hg book -r 2 also-two | ||||
$ hg book -r 3 three | ||||
$ hg book -r 4 four | ||||
$ hg book -r tip five | ||||
$ hg log --graph | ||||
@ changeset: 5:652413bf663e | ||||
| bookmark: five | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
o changeset: 4:e860deea161a | ||||
| bookmark: four | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: e | ||||
| | ||||
o changeset: 3:055a42cdd887 | ||||
| bookmark: three | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
o changeset: 2:177f92b77385 | ||||
| bookmark: also-two | ||||
| bookmark: two | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: c | ||||
| | ||||
o changeset: 1:d2ae7f538514 | ||||
| bookmark: will-move-backwards | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: b | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
$ HGEDITOR=cat hg histedit 1 | ||||
pick d2ae7f538514 1 b | ||||
pick 177f92b77385 2 c | ||||
pick 055a42cdd887 3 d | ||||
pick e860deea161a 4 e | ||||
pick 652413bf663e 5 f | ||||
# Edit history between d2ae7f538514 and 652413bf663e | ||||
# | ||||
# Commands: | ||||
# p, pick = use commit | ||||
# e, edit = use commit, but stop for amending | ||||
# f, fold = use commit, but fold into previous commit (combines N and N-1) | ||||
# d, drop = remove commit from history | ||||
# m, mess = edit message without changing commit content | ||||
# | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cat >> commands.txt <<EOF | ||||
> pick 177f92b77385 2 c | ||||
> drop d2ae7f538514 1 b | ||||
> pick 055a42cdd887 3 d | ||||
> fold e860deea161a 4 e | ||||
> pick 652413bf663e 5 f | ||||
> EOF | ||||
$ hg histedit 1 --commands commands.txt --verbose | grep histedit | ||||
Pierre-Yves David
|
r17758 | histedit: moving bookmarks two from 177f92b77385 to d36c0562f908 | ||
Pierre-Yves David
|
r17750 | histedit: moving bookmarks three from 055a42cdd887 to ae467701c500 | ||
Pierre-Yves David
|
r17758 | histedit: moving bookmarks four from e860deea161a to ae467701c500 | ||
Pierre-Yves David
|
r17750 | histedit: moving bookmarks also-two from 177f92b77385 to d36c0562f908 | ||
Pierre-Yves David
|
r17758 | histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b | ||
Pierre-Yves David
|
r17750 | histedit: moving bookmarks five from 652413bf663e to 0efacef7cb48 | ||
Mads Kiilerich
|
r17087 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob) | ||
saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg (glob) | ||||
Augie Fackler
|
r17064 | $ hg log --graph | ||
@ changeset: 3:0efacef7cb48 | ||||
| bookmark: five | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
o changeset: 2:ae467701c500 | ||||
| bookmark: four | ||||
| bookmark: three | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
o changeset: 1:d36c0562f908 | ||||
| bookmark: also-two | ||||
| bookmark: two | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: c | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
bookmark: will-move-backwards | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
$ HGEDITOR=cat hg histedit 1 | ||||
pick d36c0562f908 1 c | ||||
pick ae467701c500 2 d | ||||
pick 0efacef7cb48 3 f | ||||
# Edit history between d36c0562f908 and 0efacef7cb48 | ||||
# | ||||
# Commands: | ||||
# p, pick = use commit | ||||
# e, edit = use commit, but stop for amending | ||||
# f, fold = use commit, but fold into previous commit (combines N and N-1) | ||||
# d, drop = remove commit from history | ||||
# m, mess = edit message without changing commit content | ||||
# | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cat > commands.txt << EOF | ||||
> pick d36c0562f908 1 c | ||||
> pick 0efacef7cb48 3 f | ||||
> pick ae467701c500 2 d | ||||
> EOF | ||||
$ hg histedit 1 --commands commands.txt --verbose | grep histedit | ||||
Pierre-Yves David
|
r17758 | histedit: moving bookmarks three from ae467701c500 to 1be9c35b4cb2 | ||
histedit: moving bookmarks four from ae467701c500 to 1be9c35b4cb2 | ||||
Pierre-Yves David
|
r17750 | histedit: moving bookmarks five from 0efacef7cb48 to 1be9c35b4cb2 | ||
Mads Kiilerich
|
r17087 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg (glob) | ||
Augie Fackler
|
r17064 | |||
We expect 'five' to stay at tip, since the tipmost bookmark is most | ||||
likely the useful signal. | ||||
$ hg log --graph | ||||
@ changeset: 3:1be9c35b4cb2 | ||||
| bookmark: five | ||||
| bookmark: four | ||||
| bookmark: three | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
o changeset: 2:7c044e3e33a9 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
o changeset: 1:d36c0562f908 | ||||
| bookmark: also-two | ||||
| bookmark: two | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: c | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
bookmark: will-move-backwards | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||