mercurial-scm/hg-stable: tests/test-amend.t annotate

annotate tests/test-amend.t @ 44306:141ceec06b55

test: simplify test-amend.t to avoid race condition Insted on relying on sleep, we could simply have the editor do the file change. This remove the reliance on "sleep" and avoid test failing on heavy load machine. To test this, I reverted the code change in 5558e3437872 and the test started failing again. Differential Revision: https://phab.mercurial-scm.org/D8065

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sat, 01 Feb 2020 09:14:36 +0100
parents	774cee0e95c6
children	1813f79017ac

rev	line source
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	1 #testcases obsstore-off obsstore-on
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	2
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	3 $ cat << EOF >> $HGRCPATH
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	4 > [extensions]
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	5 > amend=
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	6 > debugdrawdag=$TESTDIR/drawdag.py
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	7 > [diff]
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	8 > git=1
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	9 > EOF
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	10
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	11 #if obsstore-on
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	12 $ cat << EOF >> $HGRCPATH
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	13 > [experimental]
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34795 diff changeset	14 > evolution.createmarkers=True
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	15 > EOF
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	16 #endif
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	17
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	18 Basic amend
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	19
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	20 $ hg init repo1
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	21 $ cd repo1
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	22 $ hg debugdrawdag <<'EOS'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	23 > B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	24 > \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	25 > A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	26 > EOS
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	27
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	28 $ hg update B -q
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	29 $ echo 2 >> B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	30
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	31 $ hg amend
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	32 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/112478962961-7e959a55-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	33 #if obsstore-off
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	34 $ hg log -p -G --hidden -T '{rev} {node\|short} {desc}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	35 @ 1 be169c7e8dbe B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	36 \| diff --git a/B b/B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	37 \| new file mode 100644
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	38 \| --- /dev/null
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	39 \| +++ b/B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	40 \| @@ -0,0 +1,1 @@
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	41 \| +B2
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	42 \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	43 o 0 426bada5c675 A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	44 diff --git a/A b/A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	45 new file mode 100644
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	46 --- /dev/null
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	47 +++ b/A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	48 @@ -0,0 +1,1 @@
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	49 +A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	50 \ No newline at end of file
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	51
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	52 #else
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	53 $ hg log -p -G --hidden -T '{rev} {node\|short} {desc}\n'
34102 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34070 diff changeset	54 @ 2 be169c7e8dbe B
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	55 \| diff --git a/B b/B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	56 \| new file mode 100644
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	57 \| --- /dev/null
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	58 \| +++ b/B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	59 \| @@ -0,0 +1,1 @@
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	60 \| +B2
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	61 \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	62 \| x 1 112478962961 B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	63 \|/ diff --git a/B b/B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	64 \| new file mode 100644
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	65 \| --- /dev/null
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	66 \| +++ b/B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	67 \| @@ -0,0 +1,1 @@
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	68 \| +B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	69 \| \ No newline at end of file
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	70 \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	71 o 0 426bada5c675 A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	72 diff --git a/A b/A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	73 new file mode 100644
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	74 --- /dev/null
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	75 +++ b/A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	76 @@ -0,0 +1,1 @@
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	77 +A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	78 \ No newline at end of file
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	79
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	80 #endif
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	81
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	82 Nothing changed
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	83
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	84 $ hg amend
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	85 nothing changed
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	86 [1]
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	87
34136 ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	88 $ hg amend -d "0 0"
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	89 nothing changed
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	90 [1]
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	91
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	92 $ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	93 nothing changed
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	94 [1]
ae95853c250a cmdutil: fix amend when passing a date Boris Feld <boris.feld@octobus.net> parents: 34102 diff changeset	95
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	96 Matcher and metadata options
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	97
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	98 $ echo 3 > C
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	99 $ echo 4 > D
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	100 $ hg add C D
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	101 $ hg amend -m NEWMESSAGE -I C
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	102 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	103 $ hg log -r . -T '{node\|short} {desc} {files}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	104 c7ba14d9075b NEWMESSAGE B C
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	105 $ echo 5 > E
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	106 $ rm C
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	107 $ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	108 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b3e76daa-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	109 $ hg log -r . -T '{node\|short} {desc} {files} {author} {date}\n'
38310 88e7105b5cd9 templater: restore the original string format of {date} Yuya Nishihara <yuya@tcha.org> parents: 38297 diff changeset	110 14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	111
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	112 Amend with editor
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	113
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	114 $ cat > $TESTTMP/prefix.sh <<'EOF'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	115 > printf 'EDITED: ' > $TESTTMP/msg
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	116 > cat "$1" >> $TESTTMP/msg
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	117 > mv $TESTTMP/msg "$1"
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	118 > EOF
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	119 $ chmod +x $TESTTMP/prefix.sh
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	120
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	121 $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend --edit
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	122 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/14f6c4bcc865-6591f15d-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	123 $ hg log -r . -T '{node\|short} {desc}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	124 298f085230c3 EDITED: NEWMESSAGE
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	125 $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	126 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	127 $ hg log -r . -T '{node\|short} {desc}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	128 974f07f28537 EDITED: MSG
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	129
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	130 $ echo FOO > $TESTTMP/msg
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	131 $ hg amend -l $TESTTMP/msg -m BAR
43900 774cee0e95c6 amend: use cmdutil.check_at_most_one_arg() Martin von Zweigbergk <martinvonz@google.com> parents: 43899 diff changeset	132 abort: cannot specify both --message and --logfile
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	133 [255]
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	134 $ hg amend -l $TESTTMP/msg
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	135 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	136 $ hg log -r . -T '{node\|short} {desc}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	137 507be9bdac71 FOO
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	138
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	139 Interactive mode
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	140
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	141 $ touch F G
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	142 $ hg add F G
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	143 $ cat <<EOS \| hg amend -i --config ui.interactive=1
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	144 > y
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	145 > n
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	146 > EOS
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	147 diff --git a/F b/F
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	148 new file mode 100644
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 41214 diff changeset	149 examine changes to 'F'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 41214 diff changeset	150 (enter ? for help) [Ynesfdaq?] y
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	151
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	152 diff --git a/G b/G
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	153 new file mode 100644
42566 f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 41214 diff changeset	154 examine changes to 'G'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158) Kyle Lippincott <spectral@google.com> parents: 41214 diff changeset	155 (enter ? for help) [Ynesfdaq?] n
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	156
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	157 saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	158 $ hg log -r . -T '{files}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	159 B D F
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	160
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	161 Amend in the middle of a stack
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	162
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	163 $ hg init $TESTTMP/repo2
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	164 $ cd $TESTTMP/repo2
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	165 $ hg debugdrawdag <<'EOS'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	166 > C
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	167 > \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	168 > B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	169 > \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	170 > A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	171 > EOS
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	172
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	173 $ hg update -q B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	174 $ echo 2 >> B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	175 $ hg amend
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	176 abort: cannot amend changeset with children
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	177 [255]
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	178
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	179 #if obsstore-on
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	180
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	181 With allowunstable, amend could work in the middle of a stack
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	182
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	183 $ cat >> $HGRCPATH <<EOF
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	184 > [experimental]
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34795 diff changeset	185 > evolution.createmarkers=True
34867 7f183c643eb6 config: use 'experimental.evolution.allowunstable' Boris Feld <boris.feld@octobus.net> parents: 34866 diff changeset	186 > evolution.allowunstable=True
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	187 > EOF
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	188
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	189 $ hg amend
35709 1a09dad8b85a evolution: report new unstable changesets Martin von Zweigbergk <martinvonz@google.com> parents: 35512 diff changeset	190 1 new orphan changesets
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	191 $ hg log -T '{rev} {node\|short} {desc}\n' -G
34102 e8a7c1a0565a cmdutil: remove the redundant commit during amend Saurabh Singh <singhsrb@fb.com> parents: 34070 diff changeset	192 @ 3 be169c7e8dbe B
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	193 \|
35512 9b3f95d9783d graphlog: add another graph node type, unstable, using character "" (BC) Anton Shestakov <av6@dwimlabs.net>* parents: 35400 diff changeset	194 \| * 2 26805aba1e60 C
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	195 \| \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	196 \| x 1 112478962961 B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	197 \|/
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	198 o 0 426bada5c675 A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	199
34795 530b7361e3a9 amend: add a flag `-n/--note` to store note with amend Pulkit Goyal <7895pulkit@gmail.com> parents: 34136 diff changeset	200 Checking the note stored in the obsmarker
530b7361e3a9 amend: add a flag `-n/--note` to store note with amend Pulkit Goyal <7895pulkit@gmail.com> parents: 34136 diff changeset	201
530b7361e3a9 amend: add a flag `-n/--note` to store note with amend Pulkit Goyal <7895pulkit@gmail.com> parents: 34136 diff changeset	202 $ echo foo > bar
530b7361e3a9 amend: add a flag `-n/--note` to store note with amend Pulkit Goyal <7895pulkit@gmail.com> parents: 34136 diff changeset	203 $ hg add bar
34889 554885e10868 amend: error out if the note is greater than 255bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 34867 diff changeset	204 $ hg amend --note 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
554885e10868 amend: error out if the note is greater than 255bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 34867 diff changeset	205 abort: cannot store a note of more than 255 bytes
554885e10868 amend: error out if the note is greater than 255bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 34867 diff changeset	206 [255]
34795 530b7361e3a9 amend: add a flag `-n/--note` to store note with amend Pulkit Goyal <7895pulkit@gmail.com> parents: 34136 diff changeset	207 $ hg amend --note "adding bar"
530b7361e3a9 amend: add a flag `-n/--note` to store note with amend Pulkit Goyal <7895pulkit@gmail.com> parents: 34136 diff changeset	208 $ hg debugobsolete -r .
35017 a7e49a5b3e6f obsolete: activate effect-flag by default Boris Feld <boris.feld@octobus.net> parents: 34889 diff changeset	209 112478962961147124edd43549aedd1a335e44bf be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default Boris Feld <boris.feld@octobus.net> parents: 34889 diff changeset	210 be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'adding bar', 'operation': 'amend', 'user': 'test'}
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	211 #endif
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	212
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	213 Cannot amend public changeset
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	214
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	215 $ hg phase -r A --public
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	216 $ hg update -C -q A
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	217 $ hg amend -m AMEND
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	218 abort: cannot amend public changesets
35253 98f97eb20597 rewriteutil: use precheck() in uncommit and amend commands Pulkit Goyal <7895pulkit@gmail.com> parents: 35184 diff changeset	219 (see 'hg help phases' for details)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	220 [255]
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	221
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	222 Amend a merge changeset
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	223
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	224 $ hg init $TESTTMP/repo3
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	225 $ cd $TESTTMP/repo3
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	226 $ hg debugdrawdag <<'EOS'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	227 > C
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	228 > /\|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	229 > A B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	230 > EOS
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	231 $ hg update -q C
34070 24ce7b0edaf9 test-amend: match output using conditional test case name Jun Wu <quark@fb.com> parents: 33794 diff changeset	232 $ hg amend -m FOO
35400 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35253 diff changeset	233 saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/a35c07e8a2a4-15ff4612-amend.hg (obsstore-off !)
33404 0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	234 $ rm .hg/localtags
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	235 $ hg log -G -T '{desc}\n'
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	236 @ FOO
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	237 \|\
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	238 \| o B
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	239 \|
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	240 o A
0d5afd360e9e amend: new extension providing the amend command Jun Wu <quark@fb.com> parents: diff changeset	241
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	242
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	243 More complete test for status changes (issue5732)
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	244 -------------------------------------------------
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	245
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	246 Generates history of files having 3 states, r0_r1_wc:
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	247
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	248 r0: ground (content/missing)
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	249 r1: old state to be amended (content/missing, where missing means removed)
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	250 wc: changes to be included in r1 (content/missing-tracked/untracked)
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	251
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	252 $ hg init $TESTTMP/wcstates
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	253 $ cd $TESTTMP/wcstates
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	254
39723 5abc47d4ca6b tests: quote PYTHON usage Matt Harbison <matt_harbison@yahoo.com> parents: 38857 diff changeset	255 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	256 $ hg addremove -q --similarity 0
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	257 $ hg commit -m0
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	258
39723 5abc47d4ca6b tests: quote PYTHON usage Matt Harbison <matt_harbison@yahoo.com> parents: 38857 diff changeset	259 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	260 $ hg addremove -q --similarity 0
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	261 $ hg commit -m1
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	262
39723 5abc47d4ca6b tests: quote PYTHON usage Matt Harbison <matt_harbison@yahoo.com> parents: 38857 diff changeset	263 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	264 $ hg addremove -q --similarity 0
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	265 $ hg forget __*-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	266 $ rm __missing-*
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	267
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	268 amend r1 to include wc changes
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	269
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	270 $ hg amend
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	271 saved backup bundle to * (glob) (obsstore-off !)
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	272
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	273 clean/modified/removed/added states of the amended revision
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	274
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	275 $ hg status --all --change . 'glob:content1_*_content1-tracked'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	276 C content1_content1_content1-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	277 C content1_content2_content1-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	278 C content1_missing_content1-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	279 $ hg status --all --change . 'glob:content1_*_content[23]-tracked'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	280 M content1_content1_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	281 M content1_content2_content2-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	282 M content1_content2_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	283 M content1_missing_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	284 $ hg status --all --change . 'glob:content1_*_missing-tracked'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	285 M content1_content2_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	286 R content1_missing_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	287 C content1_content1_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	288 $ hg status --all --change . 'glob:content1__-untracked'
34974 0ba3b928f9a9 amend: do not take untracked files as modified or clean (issue5732) Yuya Nishihara <yuya@tcha.org> parents: 34973 diff changeset	289 R content1_content1_content1-untracked
0ba3b928f9a9 amend: do not take untracked files as modified or clean (issue5732) Yuya Nishihara <yuya@tcha.org> parents: 34973 diff changeset	290 R content1_content1_content3-untracked
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	291 R content1_content1_missing-untracked
34974 0ba3b928f9a9 amend: do not take untracked files as modified or clean (issue5732) Yuya Nishihara <yuya@tcha.org> parents: 34973 diff changeset	292 R content1_content2_content1-untracked
0ba3b928f9a9 amend: do not take untracked files as modified or clean (issue5732) Yuya Nishihara <yuya@tcha.org> parents: 34973 diff changeset	293 R content1_content2_content2-untracked
0ba3b928f9a9 amend: do not take untracked files as modified or clean (issue5732) Yuya Nishihara <yuya@tcha.org> parents: 34973 diff changeset	294 R content1_content2_content3-untracked
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	295 R content1_content2_missing-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	296 R content1_missing_content1-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	297 R content1_missing_content3-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	298 R content1_missing_missing-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	299 $ hg status --all --change . 'glob:missing_content2_*'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	300 A missing_content2_content2-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	301 A missing_content2_content3-tracked
34975 5f40efa472db amend: do not drop missing files (issue5732) Yuya Nishihara <yuya@tcha.org> parents: 34974 diff changeset	302 A missing_content2_missing-tracked
34973 b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	303 $ hg status --all --change . 'glob:missing_missing_*'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	304 A missing_missing_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	305
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	306 working directory should be all clean (with some missing/untracked files)
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	307
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	308 $ hg status --all 'glob:*_content?-tracked'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	309 C content1_content1_content1-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	310 C content1_content1_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	311 C content1_content2_content1-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	312 C content1_content2_content2-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	313 C content1_content2_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	314 C content1_missing_content1-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	315 C content1_missing_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	316 C missing_content2_content2-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	317 C missing_content2_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	318 C missing_missing_content3-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	319 $ hg status --all 'glob:*_missing-tracked'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	320 ! content1_content1_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	321 ! content1_content2_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	322 ! content1_missing_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	323 ! missing_content2_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	324 ! missing_missing_missing-tracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	325 $ hg status --all 'glob:*-untracked'
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	326 ? content1_content1_content1-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	327 ? content1_content1_content3-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	328 ? content1_content2_content1-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	329 ? content1_content2_content2-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	330 ? content1_content2_content3-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	331 ? content1_missing_content1-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	332 ? content1_missing_content3-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	333 ? missing_content2_content2-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	334 ? missing_content2_content3-untracked
b69c700b6de6 tests: add more complete test for status changes on amend Yuya Nishihara <yuya@tcha.org> parents: 34889 diff changeset	335 ? missing_missing_content3-untracked
38857 32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	336
41206 6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	337 =================================
6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	338 Test backup-bundle config option\|
6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	339 =================================
38857 32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	340 $ hg init $TESTTMP/repo4
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	341 $ cd $TESTTMP/repo4
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	342 $ echo a>a
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	343 $ hg ci -Aqma
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	344 $ echo oops>b
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	345 $ hg ci -Aqm "b"
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	346 $ echo partiallyfixed > b
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	347
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	348 #if obsstore-off
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	349 $ hg amend
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	350 saved backup bundle to $TESTTMP/repo4/.hg/strip-backup/95e899acf2ce-f11cb050-amend.hg
41206 6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	351 When backup-bundle config option is set:
38857 32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	352 $ cat << EOF >> $HGRCPATH
41206 6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	353 > [rewrite]
6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	354 > backup-bundle = False
38857 32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	355 > EOF
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	356 $ echo fixed > b
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	357 $ hg amend
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	358
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	359 #else
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	360 $ hg amend
41206 6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	361 When backup-bundle config option is set:
38857 32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	362 $ cat << EOF >> $HGRCPATH
41206 6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	363 > [rewrite]
6acbe86c6490 repair: move ui.history-editing-backup to [rewrite] section Yuya Nishihara <yuya@tcha.org> parents: 41173 diff changeset	364 > backup-bundle = False
38857 32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	365 > EOF
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	366 $ echo fixed > b
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	367 $ hg amend
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	368
32ece991955c amend: support "history-editing-backup" config option Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38310 diff changeset	369 #endif
41123 79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	370 ==========================================
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	371 Test update-timestamp config option\|
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	372 ==========================================
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	373
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	374 $ cat >> $HGRCPATH << EOF
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	375 > [extensions]
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	376 > amend=
41214 8633c716f908 tests: replace mockmakedate function in test-amend.t Taapas Agrawal <taapas2897@gmail.com> parents: 41206 diff changeset	377 > mockmakedate = $TESTDIR/mockmakedate.py
41123 79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	378 > EOF
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	379
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	380 $ hg init $TESTTMP/repo5
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	381 $ cd $TESTTMP/repo5
41125 14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	382 $ cat <<'EOF' >> .hg/hgrc
14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	383 > [ui]
14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	384 > logtemplate = 'user: {user}
14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	385 > date: {date\|date}
14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	386 > summary: {desc\|firstline}\n'
14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	387 > EOF
14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	388
41123 79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	389 $ echo a>a
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	390 $ hg ci -Am 'commit 1'
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	391 adding a
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	392
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	393 When updatetimestamp is False
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	394
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	395 $ hg amend --date '1997-1-1 0:1'
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	396 $ hg log --limit 1
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	397 user: test
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	398 date: Wed Jan 01 00:01:00 1997 +0000
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	399 summary: commit 1
41125 14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	400
41123 79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	401 When update-timestamp is True and no other change than the date
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	402
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	403 $ hg amend --config rewrite.update-timestamp=True
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	404 nothing changed
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	405 [1]
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	406 $ hg log --limit 1
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	407 user: test
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	408 date: Wed Jan 01 00:01:00 1997 +0000
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	409 summary: commit 1
41125 14271b524d76 test-amend: remove uninteresting fields from log output to deduplicate tests Yuya Nishihara <yuya@tcha.org> parents: 41123 diff changeset	410
41123 79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	411 When update-timestamp is True and there is other change than the date
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	412 $ hg amend --user foobar --config rewrite.update-timestamp=True
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	413 $ hg log --limit 1
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	414 user: foobar
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	415 date: Thu Jan 01 00:00:02 1970 +0000
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	416 summary: commit 1
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	417
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	418 When date option is applicable and update-timestamp is True
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	419 $ hg amend --date '1998-1-1 0:1' --config rewrite.update-timestamp=True
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	420 $ hg log --limit 1
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	421 user: foobar
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	422 date: Thu Jan 01 00:01:00 1998 +0000
79f8f032c706 amend: add config option to update time to current in hg amend (issue5828) Taapas Agrawal <taapas2897@gmail.com> parents: 39723 diff changeset	423 summary: commit 1
41128 126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	424
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	425 Unlike rewrite.update-timestamp, -D/--currentdate always updates the timestamp
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	426
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	427 $ hg amend -D
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	428 $ hg log --limit 1
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	429 user: foobar
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	430 date: Thu Jan 01 00:00:04 1970 +0000
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	431 summary: commit 1
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	432
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	433 $ hg amend -D --config rewrite.update-timestamp=True
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	434 $ hg log --limit 1
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	435 user: foobar
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	436 date: Thu Jan 01 00:00:05 1970 +0000
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	437 summary: commit 1
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	438
41173 4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	439 rewrite.update-timestamp can be negated by --no-currentdate
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	440
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	441 $ hg amend --config rewrite.update-timestamp=True --no-currentdate -u baz
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	442 $ hg log --limit 1
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	443 user: baz
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	444 date: Thu Jan 01 00:00:05 1970 +0000
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	445 summary: commit 1
4145fd3569c3 amend: turn currentdate into tri-state bool so config option can be negated Yuya Nishihara <yuya@tcha.org> parents: 41128 diff changeset	446
41128 126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	447 Bad combination of date options:
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	448
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	449 $ hg amend -D --date '0 0'
43899 2e672ccc2220 commit: use cmdutil.check_at_most_one_arg() Martin von Zweigbergk <martinvonz@google.com> parents: 43846 diff changeset	450 abort: cannot specify both --date and --currentdate
41128 126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	451 [255]
126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	452
42938 09d46b90f6f9 amend: enable support for closing the branch Matt Harbison <matt_harbison@yahoo.com> parents: 42643 diff changeset	453 Close branch
09d46b90f6f9 amend: enable support for closing the branch Matt Harbison <matt_harbison@yahoo.com> parents: 42643 diff changeset	454
42939 f10a0f5eedae amend: enable support for using the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 42938 diff changeset	455 $ hg amend --secret --close-branch
f10a0f5eedae amend: enable support for using the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 42938 diff changeset	456 $ hg log --limit 1 -T 'close={get(extras, "close")}\nphase={phase}\n'
42938 09d46b90f6f9 amend: enable support for closing the branch Matt Harbison <matt_harbison@yahoo.com> parents: 42643 diff changeset	457 close=1
42939 f10a0f5eedae amend: enable support for using the secret phase Matt Harbison <matt_harbison@yahoo.com> parents: 42938 diff changeset	458 phase=secret
42938 09d46b90f6f9 amend: enable support for closing the branch Matt Harbison <matt_harbison@yahoo.com> parents: 42643 diff changeset	459
41128 126101284e04 amend: add -D/--currentdate option Yuya Nishihara <yuya@tcha.org> parents: 41125 diff changeset	460 $ cd ..
42642 464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	461
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	462 Corner case of amend from issue6157:
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	463 - working copy parent has a change to file `a`
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	464 - working copy has the inverse change
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	465 - we amend the working copy parent for files other than `a`
42643 ce52377102db amend: stop committing unrequested file reverts (issue6157) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42642 diff changeset	466 hg used to include the changes to `a` anyway.
42642 464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	467
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	468 $ hg init 6157; cd 6157
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	469 $ echo a > a; echo b > b; hg commit -qAm_
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	470 $ echo a2 > a; hg commit -qm_
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	471 $ hg diff --stat -c .
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	472 a \| 2 +-
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	473 1 files changed, 1 insertions(+), 1 deletions(-)
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	474 $ echo a > a; echo b2 > b; hg amend -q b
464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	475 $ hg diff --stat -c .
42643 ce52377102db amend: stop committing unrequested file reverts (issue6157) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42642 diff changeset	476 a \| 2 +-
42642 464aa857c717 amend: add a test for a simplified version of issue6157 Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42566 diff changeset	477 b \| 2 +-
42643 ce52377102db amend: stop committing unrequested file reverts (issue6157) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42642 diff changeset	478 2 files changed, 2 insertions(+), 2 deletions(-)
43817 5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	479
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	480 Modifying a file while the editor is open can cause dirstate corruption
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	481 (issue6233)
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	482
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	483 $ cd $TESTTMP
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	484 $ hg init modify-during-amend; cd modify-during-amend
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	485 $ echo r0 > foo; hg commit -qAm "r0"
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	486 $ echo alpha > foo; hg commit -qm "alpha"
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	487 $ echo beta >> foo
44306 141ceec06b55 test: simplify test-amend.t to avoid race condition Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43900 diff changeset	488 $ cat > $TESTTMP/touchy_editor.sh <<EOF
141ceec06b55 test: simplify test-amend.t to avoid race condition Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43900 diff changeset	489 > sleep 1
141ceec06b55 test: simplify test-amend.t to avoid race condition Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43900 diff changeset	490 > echo delta >> $TESTTMP/modify-during-amend/foo
141ceec06b55 test: simplify test-amend.t to avoid race condition Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43900 diff changeset	491 > sleep 1
43817 5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	492 > echo hi > "\$1"
44306 141ceec06b55 test: simplify test-amend.t to avoid race condition Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43900 diff changeset	493 > sleep 1
43817 5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	494 > EOF
44306 141ceec06b55 test: simplify test-amend.t to avoid race condition Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43900 diff changeset	495 $ HGEDITOR="sh $TESTTMP/touchy_editor.sh" hg commit --amend
43846 36444dddaeb4 tests: replace [[]] bashism with portable [] invocation Augie Fackler <augie@google.com> parents: 43817 diff changeset	496 $ if (hg diff -c . \| grep 'delta' >/dev/null) \|\| [ -n "$(hg status)" ]; then
43817 5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	497 > echo "OK."
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	498 > else
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	499 > echo "Bug detected. 'delta' is not part of the commit OR the wdir"
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	500 > echo "Diff and status before rebuild:"
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	501 > hg diff
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	502 > hg status
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	503 > hg debugrebuilddirstate
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	504 > echo "Diff and status after rebuild:"
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	505 > hg diff
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	506 > hg status
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	507 > fi
5558e3437872 amend: check for file modifications when updating dirstate (issue6233) Kyle Lippincott <spectral@google.com> parents: 42939 diff changeset	508 OK.

Mercurial > public > mercurial-scm > hg-stable

annotate tests/test-amend.t @ 44306:141ceec06b55