annotate tests/test-mq.t @ 41163:0101a35deae2

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 05 Jan 2019 15:20:33 -0500
parents c303d65d2e34
children e67a85e0f19e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1 $ checkundo()
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
2 > {
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
3 > if [ -f .hg/store/undo ]; then
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
4 > echo ".hg/store/undo still exists after $1"
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
5 > fi
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
6 > }
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
7
23172
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
8 $ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
9 > [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
10 > mq =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
11 > [mq]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
12 > plain = true
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
13 > EOF
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
14
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
15
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
16 help
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
17
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
18 $ hg help mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
19 mq extension - manage a stack of patches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
20
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
21 This extension lets you work with a stack of patches in a Mercurial
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
22 repository. It manages two stacks of patches - all known patches, and applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
23 patches (subset of known patches).
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
24
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
25 Known patches are represented as patch files in the .hg/patches directory.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
26 Applied patches are both patch files and changesets.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
27
30879
5fbf1da938a6 help: uppercase command placeholder
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
28 Common tasks (use 'hg help COMMAND' for more details):
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
29
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
30 create new patch qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
31 import existing patch qimport
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
32
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
33 print patch series qseries
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
34 print applied patches qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
35
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
36 add known patch to applied stack qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
37 remove patch from applied stack qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
38 refresh contents of top applied patch qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
39
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
40 By default, mq will automatically use git patches when required to avoid
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
41 losing file mode changes, copy records, binary files or empty files creations
26098
ce26928cbe41 spelling: behaviour -> behavior
timeless@mozdev.org
parents: 24763
diff changeset
42 or deletions. This behavior can be configured with:
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
43
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
44 [mq]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
45 git = auto/keep/yes/no
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
46
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
47 If set to 'keep', mq will obey the [diff] section configuration while
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
48 preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
49 will override the [diff] section and always generate git or regular patches,
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
50 possibly losing data in the second case.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
51
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 26969
diff changeset
52 It may be desirable for mq changesets to be kept in the secret phase (see 'hg
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 26969
diff changeset
53 help phases'), which can be enabled with the following setting:
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
54
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
55 [mq]
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
56 secret = True
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
57
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
58 You will by default be managing a patch queue named "patches". You can create
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 26969
diff changeset
59 other, independent patch queues with the 'hg qqueue' command.
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
60
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
61 If the working directory contains uncommitted files, qpush, qpop and qgoto
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
62 abort immediately. If -f/--force is used, the changes are discarded. Setting:
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
63
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
64 [mq]
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
65 keepchanges = True
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
66
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
67 make them behave as if --keep-changes were passed, and non-conflicting local
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
68 changes will be tolerated and preserved. If incompatible options such as
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
69 -f/--force or --exact are passed, this setting is ignored.
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
70
19826
4b1cbcfdabf7 mq: extract strip function as its standalone extension (issue3824)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18733
diff changeset
71 This extension used to provide a strip command. This command now lives in the
4b1cbcfdabf7 mq: extract strip function as its standalone extension (issue3824)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18733
diff changeset
72 strip extension.
4b1cbcfdabf7 mq: extract strip function as its standalone extension (issue3824)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18733
diff changeset
73
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
74 list of commands:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
75
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
76 Repository creation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
77
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
78 qclone clone main and patch repository at same time
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
79
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
80 Change creation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
81
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
82 qnew create a new patch
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
83 qrefresh update the current patch
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
84
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
85 Change manipulation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
86
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
87 qfold fold the named patches into the current patch
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
88
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
89 Change organization:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
90
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
91 qapplied print the patches already applied
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
92 qdelete remove patches from queue
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
93 qfinish move applied patches into repository history
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
94 qgoto push or pop patches until named patch is at top of stack
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
95 qguard set or print guards for a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
96 qheader print the header of the topmost or specified patch
16063
c36db39b3fee mq: fix qnext when all remaining patches are guarded
Patrick Mezard <pmezard@gmail.com>
parents: 16058
diff changeset
97 qnext print the name of the next pushable patch
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
98 qpop pop the current patch off the stack
16188
6b52963ced73 mq: fix qapplied --last and qprev documentation (issue3282)
Patrick Mezard <patrick@mezard.eu>
parents: 16064
diff changeset
99 qprev print the name of the preceding applied patch
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
100 qpush push the next patch onto the stack
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
101 qqueue manage multiple patch queues
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
102 qrename rename a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
103 qselect set or print guarded patches to push
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
104 qseries print the entire series file
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
105 qtop print the name of the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
106 qunapplied print the patches not yet applied
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
107
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
108 File content management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
109
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
110 qdiff diff of the current patch and subsequent modifications
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
111
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
112 Change import/export:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
113
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
114 qimport import a patch or existing changeset
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 39707
diff changeset
115
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 27729
diff changeset
116 (use 'hg help -v mq' to show built-in aliases and global options)
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
117
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
118 $ hg init a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
119 $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
120 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
121 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
122 adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
123
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
124 $ hg clone . ../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
125 updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
126 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
127
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
128 $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
129 $ echo z > b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
130 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
131 adding b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
132
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
133
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
134 qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
135
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
136 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
137
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
138 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
139 $ hg init b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
140
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
141
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
142 -R qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
143
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
144 $ hg -R b qinit
4071
165abe554c80 mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
145
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
146 $ hg init c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
147
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
148
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
149 qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
150
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
151 $ hg --cwd c qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
152 $ hg -R c/.hg/patches st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
153 A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
154 A series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
155
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
156
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
157 qinit; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
158
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
159 $ hg init d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
160 $ cd d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
161 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
162 $ hg qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
163
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
164 qinit -c should create both files if they don't exist
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
165
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
166 $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
167 ^\.hg
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
168 ^\.mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
169 syntax: glob
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
170 status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
171 guards
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
172 $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
173 $ hg qinit -c
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
174 abort: repository $TESTTMP/d/.hg/patches already exists!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
175 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
176 $ cd ..
11555
d8d0fc3988ca color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents: 11327
diff changeset
177
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
178 $ echo '% qinit; <stuff>; qinit -c'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
179 % qinit; <stuff>; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
180 $ hg init e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
181 $ cd e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
182 $ hg qnew A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
183 $ checkundo qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
184 $ echo foo > foo
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
185 $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
186 0: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
187 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
188 $ hg qrefresh
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
189 $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
190 0: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
191 $ hg qnew B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
192 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
193 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
194 $ echo status >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
195 $ echo bleh >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
196 $ hg qinit -c
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
197 adding .hg/patches/A
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
198 adding .hg/patches/B
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
199 $ hg -R .hg/patches status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
200 A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
201 A A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
202 A B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
203 A series
4071
165abe554c80 mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
204
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
205 qinit -c shouldn't touch these files if they already exist
10691
a778a367c20b mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr>
parents: 10397
diff changeset
206
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
207 $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
208 status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
209 bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
210 $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
211 A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
212 B
10710
47fbbc4845ff mq: test for init --mq with a destination argument
Cédric Duval <cedricduval@free.fr>
parents: 10691
diff changeset
213
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
214 add an untracked file
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
215
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
216 $ echo >> .hg/patches/flaf
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
217
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
218 status --mq with color (issue2096)
10691
a778a367c20b mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr>
parents: 10397
diff changeset
219
13987
e0f07847f8de color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents: 13507
diff changeset
220 $ hg status --mq --config extensions.color= --config color.mode=ansi --color=always
17910
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
221 \x1b[0;32;1mA \x1b[0m\x1b[0;32;1m.hgignore\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
222 \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mA\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
223 \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mB\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
224 \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mseries\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
225 \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mflaf\x1b[0m (esc)
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
226
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
227 try the --mq option on a command provided by an extension
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
228
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
229 $ hg purge --mq --verbose --config extensions.purge=
16930
9efe4a95c099 purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents: 16912
diff changeset
230 removing file flaf
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
231
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
232 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
233
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
234 #if no-outer-repo
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
235
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
236 init --mq without repo
10691
a778a367c20b mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr>
parents: 10397
diff changeset
237
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
238 $ mkdir f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
239 $ cd f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
240 $ hg init --mq
12070
fddacca3202e Merge with stable
Martin Geisler <mg@lazybytes.net>
parents: 12036
diff changeset
241 abort: there is no Mercurial repository here (.hg not found)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
242 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
243 $ cd ..
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
244
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
245 #endif
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
246
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
247 init --mq with repo path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
248
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
249 $ hg init g
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
250 $ hg init --mq g
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
251 $ test -d g/.hg/patches/.hg
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
252
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
253 init --mq with nonexistent directory
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
254
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
255 $ hg init --mq nonexistentdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
256 abort: repository nonexistentdir not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
257 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
258
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
259
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
260 init --mq with bundle (non "local")
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
261
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
262 $ hg -R a bundle --all a.bundle >/dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
263 $ hg init --mq a.bundle
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
264 abort: only a local queue repository may be initialized
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
265 [255]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
266
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
267 $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
268
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
269 $ hg qnew -m 'foo bar' test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
270
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
271 $ echo '# comment' > .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
272 $ echo >> .hg/patches/series.tmp # empty line
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
273 $ cat .hg/patches/series >> .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
274 $ mv .hg/patches/series.tmp .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
275
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
276
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
277 qrefresh
4173
7307d2e98b32 fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4090
diff changeset
278
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
279 $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
280 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
281 $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
282 foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
283
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
284 diff -r [a-f0-9]* a (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
285 --- a/a\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
286 \+\+\+ b/a\t(?P<date2>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
287 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
288 a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
289 +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
290
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
291 empty qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
292
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
293 $ hg qrefresh -X a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
294
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
295 revision:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
296
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
297 $ hg diff -r -2 -r -1
4173
7307d2e98b32 fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4090
diff changeset
298
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
299 patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
300
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
301 $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
302 foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
303
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
304
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
305 working dir diff:
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
306
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
307 $ hg diff --nodates -q
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
308 --- a/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
309 +++ b/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
310 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
311 a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
312 +a
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
313
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
314 restore things
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
315
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
316 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
317 $ checkundo qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
318
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
319
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
320 qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
321
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
322 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
323 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
324 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
325 $ checkundo qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
326
9151
f528d1a93491 tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents: 8167
diff changeset
327
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
328 qpush with dump of tag cache
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
329 Dump the tag cache to ensure that it has exactly one head after qpush.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
330
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
331 $ rm -f .hg/cache/tags2-visible
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
332 $ hg tags > /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
333
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
334 .hg/cache/tags2-visible (pre qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
335
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
336 $ cat .hg/cache/tags2-visible
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
337 1 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
338 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
339 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
340 now at: test.patch
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
341 $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
342 2: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
343 $ hg tags > /dev/null
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
344
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
345 .hg/cache/tags2-visible (post qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
346
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
347 $ cat .hg/cache/tags2-visible
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
348 2 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
349 $ checkundo qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
350 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
351
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
352
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
353 pop/push outside repo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
354 $ hg -R a qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
355 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
356 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
357 $ hg -R a qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
358 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
359 now at: test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
360
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
361 $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
362 $ hg qnew test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
363
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
364 qrefresh in subdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
365
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
366 $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
367 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
368 $ hg add a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
369 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
370
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
371 pop/push -a in subdir
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
372
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
373 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
374 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
375 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
376 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
377 $ hg --traceback qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
378 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
379 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
380 now at: test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
381
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
382
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
383 setting columns & formatted tests truncating (issue1912)
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
384
32026
57042e91521a color: turn on by default (but for windows)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30879
diff changeset
385 $ COLUMNS=4 hg qseries --config ui.formatted=true --color=no
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
386 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
387 test2.patch
32026
57042e91521a color: turn on by default (but for windows)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30879
diff changeset
388 $ COLUMNS=20 hg qseries --config ui.formatted=true -vs --color=no
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
389 0 A test.patch: f...
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
390 1 A test2.patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
391 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
392 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
393 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
394 $ hg qseries -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
395 0 A test.patch: foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
396 1 U test2.patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
397 $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
398 mq: 1 applied, 1 unapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
399 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
400 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
401 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
402 $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
403 mq: 2 applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
404 $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
405 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
406 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
407 $ hg qtop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
408 test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
409
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
410
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
411 prev
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
412
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
413 $ hg qapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
414 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
415
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
416 next
9439
f2acc0c00bec Backed out premature qprev/qnext removal
Matt Mackall <mpm@selenic.com>
parents: 9365
diff changeset
417
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
418 $ hg qunapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
419 all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
420 [1]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
421
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
422 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
423 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
424 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
425
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
426 commit should fail
9364
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9151
diff changeset
427
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
428 $ hg commit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
429 abort: cannot commit over an applied mq patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
430 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
431
15952
ec8a9e06cf05 mq-safety: don't apply safety on non-outgoing changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15926
diff changeset
432 push should fail if draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
433
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
434 $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
435 pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
436 abort: source has mq patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
437 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
438
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
439
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
440 import should fail
2846
b8d587cfa3bb mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2843
diff changeset
441
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
442 $ hg st .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
443 $ echo foo >> ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
444 $ hg diff > ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
445 $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
446 $ hg import ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
447 abort: cannot import over an applied patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
448 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
449 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
450
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
451 import --no-commit should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
452
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
453 $ hg import --no-commit ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
454 applying ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
455 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
456 M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
457 $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
458
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
459
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
460 qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
461
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
462 $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
463 test2.patch
2848
307439d6fede mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2846
diff changeset
464
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
465
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
466 qpush/qpop with index
7142
88f1b8081f1c Prevent import over an applied patch (closes issue795)
Brendan Cully <brendan@kublai.com>
parents: 7048
diff changeset
467
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
468 $ hg qnew test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
469 $ echo 1b > 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
470 $ hg add 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
471 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
472 $ hg qpush 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
473 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
474 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
475 $ hg qpop 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
476 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
477 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
478 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
479 $ hg qpush test.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
480 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
481 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
482 $ hg qpush test.patch+2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
483 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
484 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
485 $ hg qpop test2.patch-1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
486 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
487 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
488 $ hg qpop test2.patch-2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
489 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
490 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
491 $ hg qpush test1b.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
492 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
493 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
494 now at: test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
495
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
496
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
497 qpush --move
3081
760414dc7ac6 Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3027
diff changeset
498
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
499 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
500 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
501 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
502 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
503 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
504 $ hg qguard test1b.patch -- -negguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
505 $ hg qguard test2.patch -- +posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
506 $ hg qpush --move test2.patch # can't move guarded patch
14464
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents: 14347
diff changeset
507 cannot push 'test2.patch' - guarded by '+posguard'
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
508 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
509 $ hg qselect posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
510 number of unguarded, unapplied patches has changed from 2 to 3
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
511 $ hg qpush --move test2.patch # move to front
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
512 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
513 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
514 $ hg qpush --move test1b.patch # negative guard unselected
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
515 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
516 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
517 $ hg qpush --move test.patch # noop move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
518 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
519 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
520 $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
521 0 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
522 1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
523 2 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
524 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
525 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
526 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
527 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
528 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
529
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
530 cleaning up
11064
590b1d6ef50b mq: qpush --move, reorder patch series and apply only the patch
Mads Kiilerich <mads@kiilerich.com>
parents: 10710
diff changeset
531
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
532 $ hg qselect --none
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
533 guards deactivated
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
534 number of unguarded, unapplied patches has changed from 3 to 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
535 $ hg qguard --none test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
536 $ hg qguard --none test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
537 $ hg qpush --move test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
538 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
539 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
540 $ hg qpush --move test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
541 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
542 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
543 $ hg qpush --move bogus # nonexistent patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
544 abort: patch bogus not in series
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
545 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
546 $ hg qpush --move # no patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
547 abort: please specify the patch to move
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
548 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
549 $ hg qpush --move test.patch # already applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
550 abort: cannot push to a previous patch: test.patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
551 [255]
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
552 $ sed '2i\
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
553 > # make qtip index different in series and fullseries
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
554 > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
555 $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series
16303
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
556 $ cat `hg root`/.hg/patches/series
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
557 # comment
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
558 # make qtip index different in series and fullseries
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
559
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
560 test.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
561 test1b.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
562 test2.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
563 $ hg qpush --move test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
564 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
565 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
566
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
567
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
568 series after move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
569
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
570 $ cat `hg root`/.hg/patches/series
16303
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
571 # comment
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
572 # make qtip index different in series and fullseries
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
573
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
574 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
575 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
576 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
577
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
578
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
579 pop, qapplied, qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
580
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
581 $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
582 0 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
583 1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
584 2 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
585
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
586 qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
587
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
588 $ hg qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
589 only one patch applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
590 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
591
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
592 qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
593
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
594 $ hg qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
595 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
596
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
597 qapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
598
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
599 $ hg qapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
600 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
601
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
602 qapplied -1
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
603
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
604 $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
605 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
606
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
607 qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
608
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
609 $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
610 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
611 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
612 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
613
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
614 qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
615
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
616 $ hg qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
617 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
618 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
619
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
620 qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
621
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
622 $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
623 all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
624 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
625
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
626 qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
627
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
628 $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
629
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
630 popping
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
631
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
632 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
633 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
634 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
635
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
636 qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
637
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
638 $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
639 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
640
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
641 qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
642
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
643 $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
644 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
645
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
646 qunapplied test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
647
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
648 $ hg qunapplied test2.patch
9364
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9151
diff changeset
649
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
650 qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
651
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
652 $ hg qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
653 all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
654 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
655
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
656 popping -a
2848
307439d6fede mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2846
diff changeset
657
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
658 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
659 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
660 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
661 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
662
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
663 qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
664
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
665 $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
666
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
667 qapplied -1
4101
e2ed92f4c0f7 add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4096
diff changeset
668
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
669 $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
670 no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
671 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
672 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
673 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
674 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
675
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
676
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
677 push should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
678
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
679 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
680 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
681 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
682 $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
683 pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
684 searching for changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
685 adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
686 adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
687 adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
688 added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
689
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
690
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
691 we want to start with some patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
692
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
693 $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
694 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
695 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
696 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
697 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
698
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
699 % pops all patches and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
700
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
701 $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
702 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
703 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
704 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
705 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
706
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
707 % does nothing and succeeds
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
708
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
709 $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
710 no patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
711
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
712 % fails - nothing else to pop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
713
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
714 $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
715 no patches applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
716 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
717
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
718 % pushes a patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
719
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
720 $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
721 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
722 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
723
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
724 % pops a patch and succeeds
6472
8c4cd80afd3e mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
725
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
726 $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
727 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
728 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
729
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
730 % pushes up to test1b.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
731
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
732 $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
733 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
734 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
735 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
736
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
737 % does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
738
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
739 $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
740 qpush: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
741
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
742 % does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
743
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
744 $ hg qpop test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
745 qpop: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
746
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
747 % fails - can't push to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
748
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
749 $ hg qpush test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
750 abort: cannot push to a previous patch: test.patch
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
751 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
752
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
753 % fails - can't pop to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
754
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
755 $ hg qpop test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
756 abort: patch test2.patch is not applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
757 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
758
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
759 % pops up to test.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
760
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
761 $ hg qpop test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
762 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
763 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
764
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
765 % pushes all patches and succeeds
3027
a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents: 2990
diff changeset
766
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
767 $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
768 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
769 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
770 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
771
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
772 % does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
773
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
774 $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
775 all patches are currently applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
776
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
777 % fails - nothing else to push
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
778
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
779 $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
780 patch series already fully applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
781 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
782
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
783 % does nothing and succeeds
3334
534806df5b5a Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents: 3081
diff changeset
784
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
785 $ hg qpush test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
786 qpush: test2.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
787
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
788 strip
4219
6cb5be6bd70f mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents: 4182
diff changeset
789
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
790 $ cd ../../b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
791 $ echo x>x
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
792 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
793 adding x
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
794 $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
795 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
796 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
797 $ hg unbundle .hg/strip-backup/*
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
798 adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
799 adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
800 adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
801 added 1 changesets with 1 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 37526
diff changeset
802 new changesets 770eb8fce608 (1 drafts)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
803 (run 'hg update' to get a working copy)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
804
5979
b4858eb4b58f mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5534
diff changeset
805
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
806 strip with local changes, should complain
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
807
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
808 $ hg up
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
809 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
810 $ echo y>y
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
811 $ hg add y
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
812 $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
813 abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
814 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
815
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
816 --force strip with local changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
817
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
818 $ hg strip -f tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
819 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
820 saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
821 $ cd ..
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
822
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
823
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
824 cd b; hg qrefresh
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
825
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
826 $ hg init refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
827 $ cd refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
828 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
829 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
830 adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
831 $ hg qnew -mfoo foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
832 $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
833 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
834 $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
835 $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
836 $ echo f > f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
837 $ hg add f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
838 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
839 $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
840 foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
841
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
842 diff -r cb9a9f314b8b a
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
843 --- a/a\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
844 \+\+\+ b/a\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
845 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
846 a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
847 +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
848 diff -r cb9a9f314b8b b/f
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
849 --- /dev/null\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
850 \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
851 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
852 +f
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
853
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
854 hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
855
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
856 $ hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
857 $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
858 foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
859
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
860 diff -r cb9a9f314b8b b/f
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
861 --- /dev/null\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
862 \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
863 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
864 +f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
865 $ hg status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
866 M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
867
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
868
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
869 qpush failure
3699
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3697
diff changeset
870
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
871 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
872 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
873 $ hg qnew -mbar bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
874 $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
875 $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
876 $ hg add foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
877 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
878 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
879 popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
880 popping foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
881 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
882 $ echo bar > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
883 $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
884 applying foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
885 applying bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
886 file foo already exists
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
887 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
888 patch failed, unable to continue (try -v)
24365
f1eaf03dd608 commands: say "working directory" in full spelling
Yuya Nishihara <yuya@tcha.org>
parents: 23835
diff changeset
889 patch failed, rejects left in working directory
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26098
diff changeset
890 errors during apply, please fix and qrefresh bar
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
891 [2]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
892 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
893 ? foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
894 ? foo.rej
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
895
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
896
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
897 mq tags
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
898
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
899 $ hg log --template '{rev} {tags}\n' -r qparent:qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
900 0 qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
901 1 foo qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
902 2 bar qtip tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
903
14210
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
904 mq revset
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
905
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
906 $ hg log -r 'mq()' --template '{rev}\n'
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
907 1
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
908 2
30786
e2a6f383d314 tests: use "hg help revisions.<predicate>" instead of grepping
Martin von Zweigbergk <martinvonz@google.com>
parents: 29974
diff changeset
909 $ hg help revisions.mq
14210
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
910 "mq()"
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
911 Changesets managed by MQ.
30786
e2a6f383d314 tests: use "hg help revisions.<predicate>" instead of grepping
Martin von Zweigbergk <martinvonz@google.com>
parents: 29974
diff changeset
912
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
913
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
914 bad node in status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
915
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
916 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
917 popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
918 now at: foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
919 $ hg strip -qn tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
920 $ hg tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
921 changeset: 0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
922 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
923 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
924 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
925 summary: a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
926
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
927 $ hg branches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
928 default 0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
929 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
930 no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
931 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
932
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
933 $ cd ..
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
934
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
935
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
936 git patches
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
937
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
938 $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
939 > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
940 > git = True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
941 > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
942 $ hg init git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
943 $ cd git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
944 $ hg qinit
3699
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3697
diff changeset
945
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
946 $ hg qnew -m'new file' new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
947 $ echo foo > new
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
948 #if execbit
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
949 $ chmod +x new
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
950 #endif
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
951 $ hg add new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
952 $ hg qrefresh
33342
96eb3f50f75c test-mq: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents: 33262
diff changeset
953
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
954 $ cat .hg/patches/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
955 new file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
956
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
957 diff --git a/new b/new
33342
96eb3f50f75c test-mq: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents: 33262
diff changeset
958 new file mode 100755 (execbit !)
96eb3f50f75c test-mq: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents: 33262
diff changeset
959 new file mode 100644 (no-execbit !)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
960 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
961 +++ b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
962 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
963 +foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
964
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
965 $ hg qnew -m'copy file' copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
966 $ hg cp new copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
967 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
968 $ cat .hg/patches/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
969 copy file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
970
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
971 diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
972 copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
973 copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
974
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
975 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
976 popping copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
977 now at: new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
978 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
979 applying copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
980 now at: copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
981 $ hg qdiff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
982 diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
983 copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
984 copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
985 $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
986 > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
987 > git = False
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
988 > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
989 $ hg qdiff --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
990 diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
991 copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
992 copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
993 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
994
13507
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
995 empty lines in status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
996
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
997 $ hg init emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
998 $ cd emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
999 $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1000 $ printf '\n\n' > .hg/patches/status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1001 $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1002 $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1003
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1004 bad line in status (without ":")
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1005
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1006 $ hg init badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1007 $ cd badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1008 $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1009 $ printf 'babar has no colon in this line\n' > .hg/patches/status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1010 $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1011 malformated mq status line: ['babar has no colon in this line']
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1012 $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1013
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1014
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1015 test file addition in slow path
4065
8ee983e3d461 fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3700
diff changeset
1016
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1017 $ hg init slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1018 $ cd slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1019 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1020 $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1021 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1022 $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1023 $ hg qnew bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1024 $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1025 $ hg add bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1026 $ hg mv foo baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1027 $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1028 $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1029 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1030 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1031 $ hg ci -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1032 created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1033 $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1034 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
12101
0096f21c01dc tests: remove useless grep -v in test-mq.t
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12070
diff changeset
1035 $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1036 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1037 diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1038 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1039 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1040 +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1041 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1042 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1043 diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1044 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1045 rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1046 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1047 2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1048 $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1049 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1050 diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1051 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1052 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1053 +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1054 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1055 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1056 diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1057 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1058 rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1059 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1060 2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1061 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1062 $ grep 'diff --git' .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1063 diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1064 diff --git a/foo b/baz
5026
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
1065
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
1066
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1067 test file move chains in the slow path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1068
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1069 $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1070 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1071 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1072 $ hg ci -m 'change foo again'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1073 $ hg up -C 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1074 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1075 $ hg mv bar quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1076 $ hg mv baz bleh
12101
0096f21c01dc tests: remove useless grep -v in test-mq.t
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12070
diff changeset
1077 $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1078 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1079 diff --git a/foo b/bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1080 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1081 rename to bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1082 diff --git a/quux b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1083 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1084 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1085 +++ b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1086 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1087 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1088 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1089 3 bleh (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1090 $ hg mv quux fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1091 $ hg mv bleh barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1092 $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1093 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1094 diff --git a/foo b/barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1095 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1096 rename to barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1097 diff --git a/fred b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1098 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1099 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1100 +++ b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1101 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1102 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1103 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1104 3 barney (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1105
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1106
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1107 refresh omitting an added file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1108
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1109 $ hg qnew baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1110 $ echo newfile > newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1111 $ hg add newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1112 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1113 $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1114 C newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1115 $ hg qrefresh -X newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1116 $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1117 A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1118 $ hg revert newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1119 $ rm newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1120 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1121 popping baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1122 now at: bar
18067
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1123
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1124 test qdel/qrm
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1125
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1126 $ hg qdel baz
18067
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1127 $ echo p >> .hg/patches/series
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1128 $ hg qrm p
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1129 $ hg qser
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1130 bar
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1131
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1132 create a git patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1133
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1134 $ echo a > alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1135 $ hg add alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1136 $ hg qnew -f --git addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1137 $ grep diff .hg/patches/addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1138 diff --git a/alexander b/alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1139
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1140
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1141 create a git binary patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1142
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1143 $ cat > writebin.py <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1144 > import sys
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1145 > path = sys.argv[1]
37526
f5ffcac66c02 py3: make sure we write bytes to file
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1146 > open(path, 'wb').write(b'BIN\x00ARY')
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1147 > EOF
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39621
diff changeset
1148 $ "$PYTHON" writebin.py bucephalus
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1149
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39621
diff changeset
1150 $ "$PYTHON" "$TESTDIR/md5sum.py" bucephalus
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1151 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1152 $ hg add bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1153 $ hg qnew -f --git addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1154 $ grep diff .hg/patches/addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1155 diff --git a/bucephalus b/bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1156
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1157
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1158 check binary patches can be popped and pushed
4065
8ee983e3d461 fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3700
diff changeset
1159
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1160 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1161 popping addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1162 now at: addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1163 $ test -f bucephalus && echo % bucephalus should not be there
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
1164 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1165 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1166 applying addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1167 now at: addbucephalus
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
1168 $ test -f bucephalus
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39621
diff changeset
1169 $ "$PYTHON" "$TESTDIR/md5sum.py" bucephalus
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1170 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
4862
cba10652a901 mq: improve qclone error handling when patch directory is not a repository.
Brendan Cully <brendan@kublai.com>
parents: 4219
diff changeset
1171
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1172
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1173
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1174 strip again
4862
cba10652a901 mq: improve qclone error handling when patch directory is not a repository.
Brendan Cully <brendan@kublai.com>
parents: 4219
diff changeset
1175
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1176 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1177 $ hg init strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1178 $ cd strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1179 $ touch foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1180 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1181 $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1182 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1183 $ hg ci -m 'change foo 1'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1184 $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1186 $ echo 1 >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1187 $ hg ci -m 'change foo 2'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1188 created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1189 $ HGMERGE=true hg merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1190 merging foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1191 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1192 (branch merge, don't forget to commit)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1193 $ hg ci -m merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1194 $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1195 changeset: 3:99615015637b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1196 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1197 parent: 2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1198 parent: 1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1199 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1200 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1201 summary: merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1202
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1203 changeset: 2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1204 parent: 0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1205 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1206 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1207 summary: change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1208
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1209 changeset: 1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1210 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1211 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1212 summary: change foo 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1213
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1214 changeset: 0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1215 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1216 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1217 summary: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1218
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
1219 $ hg strip 1
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1220 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
1221 saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1222 $ checkundo strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1223 $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1224 changeset: 1:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1225 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1226 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1227 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1228 summary: change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1229
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1230 changeset: 0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1231 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1232 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1233 summary: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1234
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1235 $ cd ..
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
1236
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1237
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1238 qclone
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
1239
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1240 $ qlog()
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1241 > {
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1242 > echo 'main repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1243 > hg log --template ' rev {rev}: {desc}\n'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1244 > echo 'patch repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1245 > hg -R .hg/patches log --template ' rev {rev}: {desc}\n'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1246 > }
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1247 $ hg init qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1248 $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1249 $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1250 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1251 $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1252 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1253 $ hg qnew patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1254 $ echo bar >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1255 $ hg qrefresh -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1256 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1257
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1258
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1259 repo with unversioned patch dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1260
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1261 $ hg qclone qclonesource failure
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1262 abort: versioned patch repository not found (see init --mq)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
1263 [255]
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
1264
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1265 $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1266 $ hg qinit -c
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
1267 adding .hg/patches/patch1
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1268 $ hg qci -m checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1269 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1270 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1271 rev 1: change foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1272 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1273 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1274 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1275 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1276
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1277
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1278 repo with patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1279
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1280 $ hg qclone qclonesource qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1281 updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1282 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1284 $ cd qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1285 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1286 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1287 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1288 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1289 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1290 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1291
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1292
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1293 repo with patches unapplied
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
1294
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1295 $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1296 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1297 popping patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1298 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1299 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1300 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1301 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1302 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1303 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1304 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1305 $ hg qclone qclonesource qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1306 updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1307 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1308 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1309 $ cd qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1310 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1311 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1312 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1313 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1314 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1315 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1316
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1317
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
1318 Issue1033: test applying on an empty file
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
1319
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1320 $ hg init empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1321 $ cd empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1322 $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1323 $ hg ci -Am addempty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1324 adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1325 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1326 $ hg qnew -f -e changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1327 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1328 popping changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1329 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1330 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1331 applying changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1332 now at: changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1333 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1334
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1335 test qpush with --force, issue1087
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
1336
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1337 $ hg init forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1338 $ cd forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1339 $ echo hello > hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1340 $ echo bye > bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1341 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1342 adding bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1343 adding hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1344 $ hg qnew -d '0 0' empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1345 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1346 popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1347 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1348 $ echo world >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1349
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1350
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1351 qpush should fail, local changes
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1352
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1353 $ hg qpush
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1354 abort: local changes found
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1355 [255]
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1356
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1357
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1358 apply force, should not discard changes with empty patch
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1359
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1360 $ hg qpush -f
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1361 applying empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1362 patch empty is empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1363 now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1364 $ hg diff --config diff.nodates=True
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13987
diff changeset
1365 diff -r d58265112590 hello.txt
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1366 --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1367 +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1368 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1369 hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1370 +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1371 $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1372 diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1373 --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1374 +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1375 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1376 hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1377 +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1378 $ hg log -l1 -p
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13987
diff changeset
1379 changeset: 1:d58265112590
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1380 tag: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1381 tag: qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1382 tag: qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1383 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1384 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1385 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1386 summary: imported patch empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1387
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1388
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1389 $ hg qref -d '0 0'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1390 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1391 popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1392 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1393 $ echo universe >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1394 $ echo universe >> bye.txt
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
1395
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1396
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1397 qpush should fail, local changes
7621
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7296
diff changeset
1398
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1399 $ hg qpush
14191
e1c34ce39fae mq: don't suggest to refresh when qpushing with no applied patches
Idan Kamara <idankk86@gmail.com>
parents: 14162
diff changeset
1400 abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
1401 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1402
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1403
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1404 apply force, should discard changes in hello, but not bye
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1405
26943
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
1406 $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups'
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1407 applying empty
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
1408 creating directory: $TESTTMP/forcepush/.hg/origbackups
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
1409 saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1410 patching file hello.txt
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23172
diff changeset
1411 committing files:
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1412 hello.txt
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23172
diff changeset
1413 committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23172
diff changeset
1414 committing changelog
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1415 now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1416 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1417 M bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1418 $ hg diff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1419 diff -r ba252371dbc1 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1420 --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1421 +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1422 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1423 bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1424 +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1425 $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1426 diff -r 9ecee4f634e3 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1427 --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1428 +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1429 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1430 bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1431 +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1432 diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1433 --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1434 +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1435 @@ -1,1 +1,3 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1436 hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1437 +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1438 +universe
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1439
26943
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
1440 test that the previous call to qpush with -f (--force) and --config actually put
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
1441 the orig files out of the working copy
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
1442 $ ls .hg/origbackups
34146
9e4f82bc2b0b scmutil: don't append .orig to backups in origbackuppath (BC)
Mark Thomas <mbthomas@fb.com>
parents: 33342
diff changeset
1443 hello.txt
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1444
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1445 test popping revisions not in working dir ancestry
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1446
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1447 $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1448 0 A empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1449 $ hg up qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1450 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1451 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1452 popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1453 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1454
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1455 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1456 $ hg init deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1457 $ cd deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1458
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1459 $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1460 $ hg ci -Aqm0
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1461
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1462 $ hg qnew rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1463 $ hg rm a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1464 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1465
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1466 $ mkdir a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1467 $ touch a/a b/b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1468 $ hg add -q a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1469 $ hg qrefresh
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1470
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1471
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1472 test popping must remove files added in subdirectories first
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1473
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1474 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1475 popping rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1476 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1477 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1478
15728
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1479
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1480 test case preservation through patch pushing especially on case
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1481 insensitive filesystem
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1482
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1483 $ hg init casepreserve
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1484 $ cd casepreserve
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1485
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1486 $ hg qnew add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1487 $ echo a > TeXtFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1488 $ hg add TeXtFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1489 $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1490
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1491 $ hg qnew add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1492 $ echo b > AnOtHeRFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1493 $ hg add AnOtHeRFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1494 $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1495
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1496 $ hg qnew modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1497 $ echo c >> AnOtHeRFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1498 $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1499
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1500 $ hg qapplied
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1501 add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1502 add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1503 modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1504 $ hg qpop -a
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1505 popping modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1506 popping add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1507 popping add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1508 patch queue now empty
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1509
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1510 this qpush causes problems below, if case preservation on case
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1511 insensitive filesystem is not enough:
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1512 (1) unexpected "adding ..." messages are shown
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1513 (2) patching fails in modification of (1) files
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1514
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1515 $ hg qpush -a
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1516 applying add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1517 applying add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1518 applying modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1519 now at: modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1520
16028
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1521 Proper phase default with mq:
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1522
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1523 1. mq.secret=false
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1524
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1525 $ rm .hg/store/phaseroots
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1526 $ hg phase 'qparent::'
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22118
diff changeset
1527 -1: public
16028
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1528 0: draft
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1529 1: draft
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1530 2: draft
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1531 $ echo '[mq]' >> $HGRCPATH
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1532 $ echo 'secret=true' >> $HGRCPATH
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1533 $ rm -f .hg/store/phaseroots
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1534 $ hg phase 'qparent::'
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22118
diff changeset
1535 -1: public
16028
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1536 0: secret
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1537 1: secret
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
1538 2: secret
16029
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1539
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1540 Test that qfinish change phase when mq.secret=true
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1541
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1542 $ hg qfinish qbase
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1543 patch add-file1 finalized without changeset message
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1544 $ hg phase 'all()'
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1545 0: draft
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1546 1: secret
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1547 2: secret
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1548
16290
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1549 Test that qfinish respect phases.new-commit setting
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1550
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1551 $ echo '[phases]' >> $HGRCPATH
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1552 $ echo 'new-commit=secret' >> $HGRCPATH
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1553 $ hg qfinish qbase
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1554 patch add-file2 finalized without changeset message
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1555 $ hg phase 'all()'
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1556 0: draft
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1557 1: secret
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1558 2: secret
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1559
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1560 (restore env for next test)
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1561
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
1562 $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
1563 $ cp $TESTTMP/sedtmp $HGRCPATH
16290
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1564 $ hg qimport -r 1 --name add-file2
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
1565
16029
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1566 Test that qfinish preserve phase when mq.secret=false
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1567
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
1568 $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
1569 $ cp $TESTTMP/sedtmp $HGRCPATH
16029
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1570 $ hg qfinish qbase
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1571 patch add-file2 finalized without changeset message
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1572 $ hg phase 'all()'
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1573 0: draft
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1574 1: secret
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
1575 2: secret
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
1576
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1577 Test that secret mq patch does not break hgweb
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1578
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1579 $ cat > hgweb.cgi <<HGWEB
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1580 > from mercurial import demandimport; demandimport.enable()
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1581 > from mercurial.hgweb import hgweb
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1582 > from mercurial.hgweb import wsgicgi
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1583 > import cgitb
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1584 > cgitb.enable()
39621
23b749b84b8a py3: call hgweb.hgweb() with bytes values
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39480
diff changeset
1585 > app = hgweb(b'.', b'test')
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1586 > wsgicgi.launch(app)
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1587 > HGWEB
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1588 $ . "$TESTDIR/cgienv"
18733
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
1589 #if msys
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
1590 $ PATH_INFO=//tags; export PATH_INFO
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
1591 #else
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1592 $ PATH_INFO=/tags; export PATH_INFO
18733
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
1593 #endif
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1594 $ QUERY_STRING='style=raw'
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39621
diff changeset
1595 $ "$PYTHON" hgweb.cgi | grep '^tip'
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1596 tip [0-9a-f]{40} (re)
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1597
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
1598 $ cd ..
23127
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1599
23139
e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23128
diff changeset
1600 Test interaction with revset (issue4426)
23127
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1601
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1602 $ hg init issue4426
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1603 $ cd issue4426
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1604
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1605 $ echo a > a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1606 $ hg ci -Am a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1607 adding a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1608 $ echo a >> a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1609 $ hg ci -m a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1610 $ echo a >> a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1611 $ hg ci -m a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1612 $ hg qimport -r 0::
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1613
23128
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1614 reimport things
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1615
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1616 $ hg qimport -r 1::
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1617 abort: revision 2 is already managed
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1618 [255]
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1619
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
1620
23127
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
1621 $ cd ..