This is an archive of the discontinued Mercurial Phabricator instance.

Differential D601

test-amend: match output using conditional test case name
ClosedPublic

Authored by quark on Sep 1 2017, 2:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG24ce7b0edaf9: test-amend: match output using conditional test case name
Summary

D466 allows output to be conditionally matched by test name. This patch
changes test-amend.t to use that feature, instead of duplicating hg amend
command or use -q to silent its output.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Sep 1 2017, 2:14 PM
Closed by commit rHG24ce7b0edaf9: test-amend: match output using conditional test case name (authored by quark). · Explain WhySep 2 2017, 8:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-amend.t (28 lines)

Diff 1576

tests/test-amend.t

> B > B
> | > |
> A > A
> EOS > EOS
$ hg update B -q $ hg update B -q
$ echo 2 >> B $ echo 2 >> B
#if obsstore-off
$ hg amend $ hg amend
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/112478962961-af2c0941-amend.hg (glob) saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/112478962961-af2c0941-amend.hg (glob) (obsstore-off !)
#if obsstore-off
$ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n' $ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n'
@ 1 be169c7e8dbe B @ 1 be169c7e8dbe B
| diff --git a/B b/B | diff --git a/B b/B
| new file mode 100644 | new file mode 100644
| --- /dev/null | --- /dev/null
| +++ b/B | +++ b/B
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@
| +B2 | +B2
| |
o 0 426bada5c675 A o 0 426bada5c675 A
diff --git a/A b/A diff --git a/A b/A
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/A +++ b/A
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+A +A
\ No newline at end of file \ No newline at end of file
#else #else
$ hg amend
$ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n' $ hg log -p -G --hidden -T '{rev} {node|short} {desc}\n'
@ 3 be169c7e8dbe B @ 3 be169c7e8dbe B
| diff --git a/B b/B | diff --git a/B b/B
| new file mode 100644 | new file mode 100644
| --- /dev/null | --- /dev/null
| +++ b/B | +++ b/B
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@
| +B2 | +B2
nothing changed nothing changed
[1] [1]
Matcher and metadata options Matcher and metadata options
$ echo 3 > C $ echo 3 > C
$ echo 4 > D $ echo 4 > D
$ hg add C D $ hg add C D
$ hg amend -m NEWMESSAGE -I C -q $ hg amend -m NEWMESSAGE -I C
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-c24d73fe-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{node|short} {desc} {files}\n' $ hg log -r . -T '{node|short} {desc} {files}\n'
c7ba14d9075b NEWMESSAGE B C c7ba14d9075b NEWMESSAGE B C
$ echo 5 > E $ echo 5 > E
$ rm C $ rm C
$ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D -q $ hg amend -d '2000 1000' -u 'Foo <foo@example.com>' -A C D
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/c7ba14d9075b-b26ed45c-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n' $ hg log -r . -T '{node|short} {desc} {files} {author} {date}\n'
14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000 14f6c4bcc865 NEWMESSAGE B D Foo <foo@example.com> 2000.01000
Amend with editor Amend with editor
$ cat > $TESTTMP/prefix.sh <<'EOF' $ cat > $TESTTMP/prefix.sh <<'EOF'
> printf 'EDITED: ' > $TESTTMP/msg > printf 'EDITED: ' > $TESTTMP/msg
> cat "$1" >> $TESTTMP/msg > cat "$1" >> $TESTTMP/msg
> mv $TESTTMP/msg "$1" > mv $TESTTMP/msg "$1"
> EOF > EOF
$ chmod +x $TESTTMP/prefix.sh $ chmod +x $TESTTMP/prefix.sh
$ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend --edit -q $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend --edit
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/14f6c4bcc865-6591f15d-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n' $ hg log -r . -T '{node|short} {desc}\n'
298f085230c3 EDITED: NEWMESSAGE 298f085230c3 EDITED: NEWMESSAGE
$ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG -q $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n' $ hg log -r . -T '{node|short} {desc}\n'
974f07f28537 EDITED: MSG 974f07f28537 EDITED: MSG
$ echo FOO > $TESTTMP/msg $ echo FOO > $TESTTMP/msg
$ hg amend -l $TESTTMP/msg -m BAR $ hg amend -l $TESTTMP/msg -m BAR
abort: options --message and --logfile are mutually exclusive abort: options --message and --logfile are mutually exclusive
[255] [255]
$ hg amend -l $TESTTMP/msg -q $ hg amend -l $TESTTMP/msg
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n' $ hg log -r . -T '{node|short} {desc}\n'
507be9bdac71 FOO 507be9bdac71 FOO
Interactive mode Interactive mode
$ touch F G $ touch F G
$ hg add F G $ hg add F G
$ cat <<EOS | hg amend -i --config ui.interactive=1 -q $ cat <<EOS | hg amend -i --config ui.interactive=1
> y > y
> n > n
> EOS > EOS
diff --git a/F b/F diff --git a/F b/F
new file mode 100644 new file mode 100644
examine changes to 'F'? [Ynesfdaq?] y examine changes to 'F'? [Ynesfdaq?] y
diff --git a/G b/G diff --git a/G b/G
new file mode 100644 new file mode 100644
examine changes to 'G'? [Ynesfdaq?] n examine changes to 'G'? [Ynesfdaq?] n
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-7ae43d04-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{files}\n' $ hg log -r . -T '{files}\n'
B D F B D F
Amend in the middle of a stack Amend in the middle of a stack
$ hg init $TESTTMP/repo2 $ hg init $TESTTMP/repo2
$ cd $TESTTMP/repo2 $ cd $TESTTMP/repo2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
o 0 426bada5c675 A o 0 426bada5c675 A
#endif #endif
Cannot amend public changeset Cannot amend public changeset
$ hg phase -r A --public $ hg phase -r A --public
$ hg update -C -q A $ hg update -C -q A
$ hg amend -m AMEND -q $ hg amend -m AMEND
abort: cannot amend public changesets abort: cannot amend public changesets
[255] [255]
Amend a merge changeset Amend a merge changeset
$ hg init $TESTTMP/repo3 $ hg init $TESTTMP/repo3
$ cd $TESTTMP/repo3 $ cd $TESTTMP/repo3
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> C > C
> /| > /|
> A B > A B
> EOS > EOS
$ hg update -q C $ hg update -q C
$ hg amend -m FOO -q $ hg amend -m FOO
saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/a35c07e8a2a4-15ff4612-amend.hg (glob) (obsstore-off !)
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G -T '{desc}\n' $ hg log -G -T '{desc}\n'
@ FOO @ FOO
|\ |\
| o B | o B
| |
o A o A