test-mq-qnew.t
322 lines
| 8.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-mq-qnew.t
|
r12466 | |||
$ catpatch() { | ||||
> cat $1 | sed -e "s/^\(# Parent \).*/\1/" | ||||
> } | ||||
$ echo "[extensions]" >> $HGRCPATH | ||||
$ echo "mq=" >> $HGRCPATH | ||||
$ runtest() { | ||||
> hg init mq | ||||
> cd mq | ||||
> | ||||
> echo a > a | ||||
> hg ci -Ama | ||||
> | ||||
> echo '% qnew should refuse bad patch names' | ||||
> hg qnew series | ||||
> hg qnew status | ||||
> hg qnew guards | ||||
|
r14051 | > hg qnew . | ||
> hg qnew .. | ||||
|
r12466 | > hg qnew .hgignore | ||
> hg qnew .mqfoo | ||||
> hg qnew 'foo#bar' | ||||
> hg qnew 'foo:bar' | ||||
|
r25454 | > hg qnew "`echo foo; echo bar`" | ||
|
r31556 | > hg qnew ' foo' | ||
> hg qnew 'foo ' | ||||
|
r12466 | > | ||
> hg qinit -c | ||||
> | ||||
> echo '% qnew with name containing slash' | ||||
|
r12878 | > hg qnew foo/ | ||
|
r12466 | > hg qnew foo/bar.patch | ||
|
r12879 | > hg qnew foo | ||
|
r12466 | > hg qseries | ||
> hg qpop | ||||
> hg qdelete foo/bar.patch | ||||
> | ||||
> echo '% qnew with uncommitted changes' | ||||
> echo a > somefile | ||||
> hg add somefile | ||||
> hg qnew uncommitted.patch | ||||
> hg st | ||||
> hg qseries | ||||
> | ||||
> echo '% qnew implies add' | ||||
> hg -R .hg/patches st | ||||
> | ||||
> echo '% qnew missing' | ||||
> hg qnew missing.patch missing | ||||
> | ||||
> echo '% qnew -m' | ||||
> hg qnew -m 'foo bar' mtest.patch | ||||
> catpatch .hg/patches/mtest.patch | ||||
> | ||||
> echo '% qnew twice' | ||||
> hg qnew first.patch | ||||
> hg qnew first.patch | ||||
> | ||||
> touch ../first.patch | ||||
> hg qimport ../first.patch | ||||
> | ||||
> echo '% qnew -f from a subdirectory' | ||||
> hg qpop -a | ||||
> mkdir d | ||||
> cd d | ||||
> echo b > b | ||||
> hg ci -Am t | ||||
> echo b >> b | ||||
> hg st | ||||
> hg qnew -g -f p | ||||
> catpatch ../.hg/patches/p | ||||
> | ||||
> echo '% qnew -u with no username configured' | ||||
> HGUSER= hg qnew -u blue red | ||||
> catpatch ../.hg/patches/red | ||||
> | ||||
> echo '% qnew -e -u with no username configured' | ||||
> HGUSER= hg qnew -e -u chartreuse fucsia | ||||
> catpatch ../.hg/patches/fucsia | ||||
> | ||||
> echo '% fail when trying to import a merge' | ||||
> hg init merge | ||||
> cd merge | ||||
> touch a | ||||
> hg ci -Am null | ||||
> echo a >> a | ||||
> hg ci -m a | ||||
> hg up -r 0 | ||||
> echo b >> a | ||||
> hg ci -m b | ||||
> hg merge -f 1 | ||||
> hg resolve --mark a | ||||
> hg qnew -f merge | ||||
> | ||||
> cd ../../.. | ||||
> rm -r mq | ||||
> } | ||||
plain headers | ||||
$ echo "[mq]" >> $HGRCPATH | ||||
$ echo "plain=true" >> $HGRCPATH | ||||
$ mkdir sandbox | ||||
$ (cd sandbox ; runtest) | ||||
adding a | ||||
% qnew should refuse bad patch names | ||||
abort: "series" cannot be used as the name of a patch | ||||
abort: "status" cannot be used as the name of a patch | ||||
abort: "guards" cannot be used as the name of a patch | ||||
|
r14051 | abort: "." cannot be used as the name of a patch | ||
abort: ".." cannot be used as the name of a patch | ||||
|
r14054 | abort: patch name cannot begin with ".hg" | ||
abort: patch name cannot begin with ".mq" | ||||
|
r25453 | abort: '#' cannot be used in the name of a patch | ||
abort: ':' cannot be used in the name of a patch | ||||
|
r25454 | abort: '\n' cannot be used in the name of a patch | ||
|
r31556 | abort: patch name cannot begin or end with whitespace | ||
abort: patch name cannot begin or end with whitespace | ||||
|
r12466 | % qnew with name containing slash | ||
|
r35394 | abort: path ends in directory separator: foo/ | ||
|
r12879 | abort: "foo" already exists as a directory | ||
|
r12466 | foo/bar.patch | ||
popping foo/bar.patch | ||||
patch queue now empty | ||||
% qnew with uncommitted changes | ||||
uncommitted.patch | ||||
% qnew implies add | ||||
A .hgignore | ||||
A series | ||||
A uncommitted.patch | ||||
% qnew missing | ||||
|
r15521 | abort: missing: * (glob) | ||
|
r12466 | % qnew -m | ||
foo bar | ||||
% qnew twice | ||||
abort: patch "first.patch" already exists | ||||
abort: patch "first.patch" already exists | ||||
% qnew -f from a subdirectory | ||||
popping first.patch | ||||
popping mtest.patch | ||||
popping uncommitted.patch | ||||
patch queue now empty | ||||
adding d/b | ||||
M d/b | ||||
diff --git a/d/b b/d/b | ||||
--- a/d/b | ||||
+++ b/d/b | ||||
@@ -1,1 +1,2 @@ | ||||
b | ||||
+b | ||||
% qnew -u with no username configured | ||||
From: blue | ||||
% qnew -e -u with no username configured | ||||
From: chartreuse | ||||
% fail when trying to import a merge | ||||
adding a | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
merging a | ||||
|
r26614 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||
|
r12466 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r35722 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | ||
|
r21947 | (no more unresolved files) | ||
|
r42800 | abort: cannot manage merge changesets | ||
|
r12466 | $ rm -r sandbox | ||
hg headers | ||||
$ echo "plain=false" >> $HGRCPATH | ||||
$ mkdir sandbox | ||||
$ (cd sandbox ; runtest) | ||||
adding a | ||||
% qnew should refuse bad patch names | ||||
abort: "series" cannot be used as the name of a patch | ||||
abort: "status" cannot be used as the name of a patch | ||||
abort: "guards" cannot be used as the name of a patch | ||||
|
r14051 | abort: "." cannot be used as the name of a patch | ||
abort: ".." cannot be used as the name of a patch | ||||
|
r14054 | abort: patch name cannot begin with ".hg" | ||
abort: patch name cannot begin with ".mq" | ||||
|
r25453 | abort: '#' cannot be used in the name of a patch | ||
abort: ':' cannot be used in the name of a patch | ||||
|
r25454 | abort: '\n' cannot be used in the name of a patch | ||
|
r31556 | abort: patch name cannot begin or end with whitespace | ||
abort: patch name cannot begin or end with whitespace | ||||
|
r12466 | % qnew with name containing slash | ||
|
r35394 | abort: path ends in directory separator: foo/ | ||
|
r12879 | abort: "foo" already exists as a directory | ||
|
r12466 | foo/bar.patch | ||
popping foo/bar.patch | ||||
patch queue now empty | ||||
% qnew with uncommitted changes | ||||
uncommitted.patch | ||||
% qnew implies add | ||||
A .hgignore | ||||
A series | ||||
A uncommitted.patch | ||||
% qnew missing | ||||
|
r15521 | abort: missing: * (glob) | ||
|
r12466 | % qnew -m | ||
# HG changeset patch | ||||
# Parent | ||||
foo bar | ||||
% qnew twice | ||||
abort: patch "first.patch" already exists | ||||
abort: patch "first.patch" already exists | ||||
% qnew -f from a subdirectory | ||||
popping first.patch | ||||
popping mtest.patch | ||||
popping uncommitted.patch | ||||
patch queue now empty | ||||
adding d/b | ||||
M d/b | ||||
# HG changeset patch | ||||
# Parent | ||||
|
r22519 | |||
|
r12466 | diff --git a/d/b b/d/b | ||
--- a/d/b | ||||
+++ b/d/b | ||||
@@ -1,1 +1,2 @@ | ||||
b | ||||
+b | ||||
% qnew -u with no username configured | ||||
# HG changeset patch | ||||
|
r22520 | # User blue | ||
|
r12466 | # Parent | ||
|
r22519 | |||
|
r12466 | % qnew -e -u with no username configured | ||
# HG changeset patch | ||||
|
r22520 | # User chartreuse | ||
|
r12466 | # Parent | ||
|
r22519 | |||
|
r12466 | % fail when trying to import a merge | ||
adding a | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
merging a | ||||
|
r26614 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||
|
r12466 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r35722 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | ||
|
r21947 | (no more unresolved files) | ||
|
r42800 | abort: cannot manage merge changesets | ||
|
r12466 | $ rm -r sandbox | ||
|
r20768 | |||
Test saving last-message.txt | ||||
$ hg init repo | ||||
$ cd repo | ||||
|
r20859 | $ cat > $TESTTMP/commitfailure.py <<EOF | ||
|
r26587 | > from mercurial import error | ||
|
r20768 | > def reposetup(ui, repo): | ||
> class commitfailure(repo.__class__): | ||||
> def commit(self, *args, **kwargs): | ||||
|
r46273 | > raise error.Abort(b'emulating unexpected abort') | ||
|
r20768 | > repo.__class__ = commitfailure | ||
> EOF | ||||
|
r21234 | $ cat >> .hg/hgrc <<EOF | ||
|
r20768 | > [extensions] | ||
|
r21234 | > # this failure occurs before editor invocation | ||
|
r20859 | > commitfailure = $TESTTMP/commitfailure.py | ||
|
r20768 | > EOF | ||
|
r20859 | $ cat > $TESTTMP/editor.sh << EOF | ||
|
r20768 | > echo "==== before editing" | ||
> cat \$1 | ||||
> echo "====" | ||||
> echo "test saving last-message.txt" >> \$1 | ||||
> EOF | ||||
|
r21234 | (test that editor is not invoked before transaction starting) | ||
$ rm -f .hg/last-message.txt | ||||
$ HGEDITOR="sh $TESTTMP/editor.sh" hg qnew -e patch | ||||
abort: emulating unexpected abort | ||||
[255] | ||||
|
r21930 | $ test -f .hg/last-message.txt | ||
|
r21234 | [1] | ||
(test that editor is invoked and commit message is saved into | ||||
"last-message.txt") | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [extensions] | ||||
> commitfailure = ! | ||||
> [hooks] | ||||
> # this failure occurs after editor invocation | ||||
> pretxncommit.unexpectedabort = false | ||||
> EOF | ||||
|
r20768 | $ rm -f .hg/last-message.txt | ||
|
r21421 | $ hg status | ||
|
r20859 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg qnew -e patch | ||
|
r20768 | ==== before editing | ||
|
r21234 | |||
|
r21421 | |||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to use default message. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'default' | ||||
HG: no files changed | ||||
|
r20768 | ==== | ||
|
r21234 | transaction abort! | ||
rollback completed | ||||
|
r41398 | note: commit message saved in .hg/last-message.txt | ||
|
r45227 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it | ||
|
r21234 | abort: pretxncommit.unexpectedabort hook exited with status 1 | ||
|
r20768 | [255] | ||
$ cat .hg/last-message.txt | ||||
|
r21234 | |||
|
r21421 | |||
|
r20768 | test saving last-message.txt | ||
|
r21234 | $ cat >> .hg/hgrc <<EOF | ||
> [hooks] | ||||
> pretxncommit.unexpectedabort = | ||||
> EOF | ||||