annotate tests/test-mq.t @ 19179:12459bfa4b59

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 09 May 2013 18:34:04 -0500
parents 1663fe10f693
children 4b1cbcfdabf7
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
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
8 $ echo "[extensions]" >> $HGRCPATH
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
9 $ echo "mq=" >> $HGRCPATH
2848
307439d6fede mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2846
diff changeset
10
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
11 $ echo "[mq]" >> $HGRCPATH
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
12 $ echo "plain=true" >> $HGRCPATH
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
13
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
14
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
15 help
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
16
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
17 $ hg help mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
18 mq extension - manage a stack of patches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
19
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
20 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
21 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
22 patches (subset of known patches).
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
23
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
24 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
25 Applied patches are both patch files and changesets.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
26
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
27 Common tasks (use "hg help command" for more details):
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
28
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
29 create new patch qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
30 import existing patch qimport
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
31
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
32 print patch series qseries
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
33 print applied patches qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
34
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
35 add known patch to applied stack qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
36 remove patch from applied stack qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
37 refresh contents of top applied patch qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
38
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
39 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
40 losing file mode changes, copy records, binary files or empty files creations
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
41 or deletions. This behaviour can be configured with:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
42
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
43 [mq]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
44 git = auto/keep/yes/no
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
45
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
46 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
47 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
48 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
49 possibly losing data in the second case.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
50
16040
c0b2986b37b8 mq: fix secret description in help
Matt Mackall <mpm@selenic.com>
parents: 16029
diff changeset
51 It may be desirable for mq changesets to be kept in the secret phase (see "hg
c0b2986b37b8 mq: fix secret description in help
Matt Mackall <mpm@selenic.com>
parents: 16029
diff changeset
52 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
53
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
54 [mq]
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
55 secret = True
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
56
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
57 You will by default be managing a patch queue named "patches". You can create
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
58 other, independent patch queues with the "hg qqueue" command.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
59
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
60 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
61 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
62
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
63 [mq]
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
64 keepchanges = True
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
65
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
66 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
67 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
68 -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
69
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
70 list of commands:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
71
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
72 qapplied print the patches already applied
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
73 qclone clone main and patch repository at same time
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
74 qdelete remove patches from queue
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
75 qdiff diff of the current patch and subsequent modifications
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
76 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
77 qfold fold the named patches into the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
78 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
79 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
80 qheader print the header of the topmost or specified patch
16152
816211dfa3a5 mq: expand qimport summary
Matt Mackall <mpm@selenic.com>
parents: 16064
diff changeset
81 qimport import a patch or existing changeset
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
82 qnew create a new patch
16063
c36db39b3fee mq: fix qnext when all remaining patches are guarded
Patrick Mezard <pmezard@gmail.com>
parents: 16058
diff changeset
83 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
84 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
85 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
86 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
87 qqueue manage multiple patch queues
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
88 qrefresh update the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
89 qrename rename a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
90 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
91 qseries print the entire series file
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
92 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
93 qunapplied print the patches not yet applied
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
94 strip strip changesets and all their descendants from the repository
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
95
13230
827a1cc127bf commands: clarify which aliases "hg help -v" show (issue2572)
Martin Geisler <mg@aragost.com>
parents: 12942
diff changeset
96 use "hg -v help mq" to show builtin aliases and global options
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
97
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
98 $ hg init a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
99 $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
100 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
101 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
102 adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
103
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
104 $ hg clone . ../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
105 updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
106 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
107
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
108 $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
109 $ echo z > b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
110 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
111 adding b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
112
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
113
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
114 qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
115
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
116 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
117
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
118 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
119 $ hg init b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
120
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
121
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
122 -R qinit
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 -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
125
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
126 $ hg init c
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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
129 qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
130
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
131 $ hg --cwd c qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
132 $ hg -R c/.hg/patches st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
133 A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
134 A series
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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
137 qinit; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
138
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
139 $ hg init d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
140 $ cd d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
141 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
142 $ hg qinit -c
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 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
145
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
146 $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
147 ^\.hg
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
148 ^\.mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
149 syntax: glob
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
150 status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
151 guards
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
152 $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
153 $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
154 abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
155 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
156 $ cd ..
11555
d8d0fc3988ca color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents: 11327
diff changeset
157
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
158 $ echo '% qinit; <stuff>; qinit -c'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
159 % qinit; <stuff>; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
160 $ hg init e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
161 $ cd e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
162 $ hg qnew A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
163 $ checkundo qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
164 $ echo foo > foo
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
165 $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
166 0: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
167 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
168 $ hg qrefresh
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
169 $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
170 0: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
171 $ hg qnew B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
172 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
173 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
174 $ echo status >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
175 $ echo bleh >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
176 $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
177 adding .hg/patches/A (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
178 adding .hg/patches/B (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
179 $ hg -R .hg/patches status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
180 A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
181 A A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
182 A B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
183 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
184
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
185 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
186
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
187 $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
188 status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
189 bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
190 $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
191 A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
192 B
10710
47fbbc4845ff mq: test for init --mq with a destination argument
Cédric Duval <cedricduval@free.fr>
parents: 10691
diff changeset
193
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
194 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
195
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
196 $ 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
197
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
198 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
199
13987
e0f07847f8de color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents: 13507
diff changeset
200 $ 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
201 \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
202 \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
203 \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
204 \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
205 \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
206
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
207 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
208
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
209 $ hg purge --mq --verbose --config extensions.purge=
16930
9efe4a95c099 purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents: 16912
diff changeset
210 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
211
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
212 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
213
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
214 #if no-outer-repo
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
215
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
216 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
217
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
218 $ mkdir f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
219 $ cd f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
220 $ hg init --mq
12070
fddacca3202e Merge with stable
Martin Geisler <mg@lazybytes.net>
parents: 12036
diff changeset
221 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
222 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
223 $ cd ..
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
224
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
225 #endif
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
226
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
227 init --mq with repo path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
228
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
229 $ hg init g
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
230 $ hg init --mq g
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
231 $ test -d g/.hg/patches/.hg
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
232
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
233 init --mq with nonexistent directory
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
234
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
235 $ hg init --mq nonexistentdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
236 abort: repository nonexistentdir not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
237 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
238
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
239
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
240 init --mq with bundle (non "local")
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
241
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
242 $ hg -R a bundle --all a.bundle >/dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
243 $ hg init --mq a.bundle
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
244 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
245 [255]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
246
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
247 $ cd a
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 qnew -m 'foo bar' test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
250
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
251 $ echo '# comment' > .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
252 $ echo >> .hg/patches/series.tmp # empty line
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
253 $ cat .hg/patches/series >> .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
254 $ mv .hg/patches/series.tmp .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
255
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
256
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
257 qrefresh
4173
7307d2e98b32 fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4090
diff changeset
258
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
259 $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
260 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
261 $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
262 foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
263
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
264 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
265 --- 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
266 \+\+\+ b/a\t(?P<date2>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
267 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
268 a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
269 +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
270
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
271 empty qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
272
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
273 $ hg qrefresh -X a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
274
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
275 revision:
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 $ 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
278
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
279 patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
280
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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
284
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
285 working dir diff:
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
286
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
287 $ hg diff --nodates -q
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
288 --- a/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
289 +++ b/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
290 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
291 a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
292 +a
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
293
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
294 restore things
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
295
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
296 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
297 $ checkundo qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
298
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
299
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
300 qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
301
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
302 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
303 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
304 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
305 $ checkundo qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
306
9151
f528d1a93491 tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents: 8167
diff changeset
307
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
308 qpush with dump of tag cache
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
309 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
310
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
311 $ rm -f .hg/cache/tags
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
312 $ hg tags > /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
313
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
314 .hg/cache/tags (pre qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
315
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
316 $ cat .hg/cache/tags
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
317 1 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
318
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
319 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
320 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
321 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
322 $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
323 2: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
324 $ hg tags > /dev/null
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
325
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
326 .hg/cache/tags (post qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
327
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
328 $ cat .hg/cache/tags
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
329 2 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
330
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
331 $ checkundo qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
332 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
333
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
334
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
335 pop/push outside repo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
336 $ hg -R a qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
337 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
338 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
339 $ hg -R a qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
340 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
341 now at: test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
342
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
343 $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
344 $ hg qnew test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
345
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
346 qrefresh in subdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
347
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
348 $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
349 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
350 $ hg add a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
351 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
352
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
353 pop/push -a in subdir
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
354
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
355 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
356 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
357 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
358 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
359 $ hg --traceback qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
360 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
361 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
362 now at: 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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
365 setting columns & formatted tests truncating (issue1912)
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
366
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
367 $ COLUMNS=4 hg qseries --config ui.formatted=true
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
368 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
369 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
370 $ COLUMNS=20 hg qseries --config ui.formatted=true -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
371 0 A test.patch: f...
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
372 1 A test2.patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
373 $ hg qpop
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 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
376 $ hg qseries -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
377 0 A test.patch: foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
378 1 U test2.patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
379 $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
380 mq: 1 applied, 1 unapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
381 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
382 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
383 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
384 $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
385 mq: 2 applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
386 $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
387 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
388 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
389 $ hg qtop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
390 test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
391
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
392
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
393 prev
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
394
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
395 $ hg qapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
396 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
397
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
398 next
9439
f2acc0c00bec Backed out premature qprev/qnext removal
Matt Mackall <mpm@selenic.com>
parents: 9365
diff changeset
399
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
400 $ hg qunapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
401 all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
402 [1]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
403
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
404 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
405 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
406 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
407
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
408 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
409
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
410 $ hg commit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
411 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
412 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
413
15952
ec8a9e06cf05 mq-safety: don't apply safety on non-outgoing changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15926
diff changeset
414 push should fail if draft
11894
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 $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
417 pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
418 abort: source has mq patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
419 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
420
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
421
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
422 import should fail
2846
b8d587cfa3bb mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2843
diff changeset
423
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
424 $ hg st .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
425 $ echo foo >> ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
426 $ hg diff > ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
427 $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
428 $ hg import ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
429 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
430 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
431 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
432
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
433 import --no-commit should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
434
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
435 $ hg import --no-commit ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
436 applying ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
437 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
438 M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
439 $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
440
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
441
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
442 qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
443
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
444 $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
445 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
446
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
447
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
448 qpush/qpop with index
7142
88f1b8081f1c Prevent import over an applied patch (closes issue795)
Brendan Cully <brendan@kublai.com>
parents: 7048
diff changeset
449
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
450 $ hg qnew test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
451 $ echo 1b > 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
452 $ hg add 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
453 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
454 $ hg qpush 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
455 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
456 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
457 $ hg qpop 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
458 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
459 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
460 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
461 $ hg qpush test.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
462 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
463 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
464 $ hg qpush test.patch+2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
465 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
466 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
467 $ hg qpop test2.patch-1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
468 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
469 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
470 $ hg qpop test2.patch-2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
471 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
472 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
473 $ hg qpush test1b.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
474 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
475 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
476 now at: test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
477
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
478
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
479 qpush --move
3081
760414dc7ac6 Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3027
diff changeset
480
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
481 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
482 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
483 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
484 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
485 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
486 $ hg qguard test1b.patch -- -negguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
487 $ hg qguard test2.patch -- +posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
488 $ 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
489 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
490 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
491 $ hg qselect posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
492 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
493 $ hg qpush --move test2.patch # move to front
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
494 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
495 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
496 $ hg qpush --move test1b.patch # negative guard unselected
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
497 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
498 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
499 $ hg qpush --move test.patch # noop move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
500 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
501 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
502 $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
503 0 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
504 1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
505 2 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
506 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
507 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
508 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
509 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
510 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
511
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
512 cleaning up
11064
590b1d6ef50b mq: qpush --move, reorder patch series and apply only the patch
Mads Kiilerich <mads@kiilerich.com>
parents: 10710
diff changeset
513
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
514 $ hg qselect --none
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
515 guards deactivated
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
516 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
517 $ hg qguard --none test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
518 $ hg qguard --none test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
519 $ hg qpush --move test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
520 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
521 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
522 $ hg qpush --move test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
523 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
524 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
525 $ hg qpush --move bogus # nonexistent patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
526 abort: patch bogus not in series
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
527 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
528 $ hg qpush --move # no patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
529 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
530 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
531 $ hg qpush --move test.patch # already applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
532 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
533 [255]
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
534 $ sed '2i\
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
535 > # 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
536 > ' `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
537 $ 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
538 $ 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
539 # comment
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
540 # 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
541
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
542 test.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
543 test1b.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
544 test2.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
545 $ hg qpush --move test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
546 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
547 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
548
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
549
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
550 series after move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
551
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
552 $ 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
553 # comment
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
554 # 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
555
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
556 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
557 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
558 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
559
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
560
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
561 pop, qapplied, qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
562
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
563 $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
564 0 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
565 1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
566 2 A test2.patch
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 qapplied -1 test.patch
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 $ hg qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
571 only one patch applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
572 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
573
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
574 qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
575
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
576 $ hg qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
577 test.patch
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 qapplied -1 test2.patch
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 qapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
582 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
583
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
584 qapplied -1
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
585
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
586 $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
587 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
588
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
589 qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
590
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
591 $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
592 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
593 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
594 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
595
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
596 qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
597
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
598 $ hg qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
599 test.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 qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
603
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
604 $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
605 all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
606 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
607
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
608 qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
609
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
610 $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
611
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
612 popping
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 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
615 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
616 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
617
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
618 qunapplied -1
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 $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
621 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
622
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
623 qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
624
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
625 $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
626 test2.patch
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 qunapplied test2.patch
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 $ 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
631
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
632 qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
633
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
634 $ hg qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
635 all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
636 [1]
11894
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 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
639
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
640 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
641 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
642 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
643 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
645 qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
646
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
647 $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
648
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
649 qapplied -1
4101
e2ed92f4c0f7 add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4096
diff changeset
650
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
651 $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
652 no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
653 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
654 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
655 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
656 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
657
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
658
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
659 push should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
660
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
661 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
662 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
663 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
664 $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
665 pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
666 searching for changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
667 adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
668 adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
669 adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
670 added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
671
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
672
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
673 we want to start with some patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
674
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
675 $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
676 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
677 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
678 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
679 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
680
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
681 % pops all patches and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
682
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
683 $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
684 popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
685 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
686 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
687 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
688
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
689 % does nothing and succeeds
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
690
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
691 $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
692 no patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
693
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
694 % fails - nothing else to pop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
695
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
696 $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
697 no patches applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
698 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
699
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
700 % pushes a patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
701
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
702 $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
703 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
704 now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
705
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
706 % pops a patch and succeeds
6472
8c4cd80afd3e mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
707
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
708 $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
709 popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
710 patch queue now empty
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 % pushes up to test1b.patch and succeeds
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 qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
715 applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
716 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
717 now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
718
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
719 % does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
720
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
721 $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
722 qpush: test1b.patch is already at the top
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 % does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
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 test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
727 qpop: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
728
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
729 % fails - can't push to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
730
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
731 $ hg qpush test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
732 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
733 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
734
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
735 % fails - can't pop to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
736
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
737 $ hg qpop test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
738 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
739 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
740
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
741 % pops up to test.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
742
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
743 $ hg qpop test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
744 popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
745 now at: test.patch
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 % 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
748
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
749 $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
750 applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
751 applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
752 now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
753
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
754 % does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
755
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
756 $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
757 all patches are currently applied
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 % fails - nothing else to push
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 qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
762 patch series already fully applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
763 [1]
11894
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 % does nothing and succeeds
3334
534806df5b5a Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents: 3081
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 test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
768 qpush: test2.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
769
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
770 strip
4219
6cb5be6bd70f mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents: 4182
diff changeset
771
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
772 $ cd ../../b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
773 $ echo x>x
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
774 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
775 adding x
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
776 $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
777 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
778 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
779 $ hg unbundle .hg/strip-backup/*
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
780 adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
781 adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
782 adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
783 added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
784 (run 'hg update' to get a working copy)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
785
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
786
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
787 strip with local changes, should complain
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
788
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
789 $ hg up
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
790 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
791 $ echo y>y
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
792 $ hg add y
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
793 $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
794 abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
795 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
796
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
797 --force strip with local changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
798
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
799 $ hg strip -f tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
800 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
801 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
802 $ cd ..
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
803
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
804
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
805 cd b; hg qrefresh
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
806
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
807 $ hg init refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
808 $ cd refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
809 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
810 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
811 adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
812 $ hg qnew -mfoo foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
813 $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
814 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
815 $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
816 $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
817 $ echo f > f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
818 $ hg add f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
819 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
820 $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
821 foo
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 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
824 --- 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
825 \+\+\+ b/a\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
826 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
827 a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
828 +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
829 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
830 --- /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
831 \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
832 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
833 +f
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
834
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
835 hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
836
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
837 $ hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
838 $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
839 foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
840
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
841 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
842 --- /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
843 \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
844 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
845 +f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
846 $ hg status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
847 M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
848
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
849
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
850 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
851
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
852 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
853 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
854 $ hg qnew -mbar bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
855 $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
856 $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
857 $ hg add foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
858 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
859 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
860 popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
861 popping foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
862 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
863 $ echo bar > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
864 $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
865 applying foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
866 applying bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
867 file foo already exists
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
868 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
869 patch failed, unable to continue (try -v)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
870 patch failed, rejects left in working dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
871 errors during apply, please fix and refresh bar
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
872 [2]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
873 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
874 ? foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
875 ? foo.rej
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
876
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
877
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
878 mq tags
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
879
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
880 $ hg log --template '{rev} {tags}\n' -r qparent:qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
881 0 qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
882 1 foo qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
883 2 bar qtip tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
884
14210
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
885 mq revset
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
886
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
887 $ 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
888 1
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
889 2
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
890 $ hg help revsets | grep -i mq
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
891 "mq()"
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
892 Changesets managed by MQ.
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
893
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
894 bad node in status
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 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
897 popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
898 now at: foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
899 $ hg strip -qn tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
900 $ hg tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
901 changeset: 0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
902 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
903 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
904 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
905 summary: a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
906
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
907 $ hg branches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
908 default 0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
909 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
910 no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
911 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
912
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
913 $ cd ..
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
914
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
915
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
916 git patches
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
917
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
918 $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
919 > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
920 > git = True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
921 > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
922 $ hg init git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
923 $ cd git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
924 $ 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
925
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
926 $ hg qnew -m'new file' new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
927 $ echo foo > new
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
928 #if execbit
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
929 $ chmod +x new
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
930 #endif
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
931 $ hg add new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
932 $ hg qrefresh
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
933 #if execbit
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
934 $ cat .hg/patches/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
935 new file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
936
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
937 diff --git a/new b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
938 new file mode 100755
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
939 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
940 +++ b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
941 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
942 +foo
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
943 #else
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
944 $ cat .hg/patches/new
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
945 new file
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
946
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
947 diff --git a/new b/new
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
948 new file mode 100644
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
949 --- /dev/null
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
950 +++ b/new
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
951 @@ -0,0 +1,1 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
952 +foo
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
953 #endif
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
954
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
955 $ hg qnew -m'copy file' copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
956 $ hg cp new copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
957 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
958 $ cat .hg/patches/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
959 copy file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
960
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
961 diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
962 copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
963 copy to copy
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 qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
966 popping copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
967 now at: new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
968 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
969 applying copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
970 now at: copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
971 $ hg qdiff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
972 diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
973 copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
974 copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
975 $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
976 > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
977 > git = False
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
978 > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
979 $ hg qdiff --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
980 diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
981 copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
982 copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
983 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
984
13507
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
985 empty lines in status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
986
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
987 $ hg init emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
988 $ cd emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
989 $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
990 $ 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
991 $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
992 $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
993
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
994 bad line in status (without ":")
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
995
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
996 $ hg init badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
997 $ cd badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
998 $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
999 $ 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
1000 $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1001 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
1002 $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
1003
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1004
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1005 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
1006
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1007 $ hg init slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1008 $ cd slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1009 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1010 $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1011 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1012 $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1013 $ hg qnew bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1014 $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1015 $ hg add bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1016 $ hg mv foo baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1017 $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1018 $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1019 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
1020 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1021 $ hg ci -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1022 created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1023 $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1024 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
1025 $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1026 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1027 diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1028 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1029 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1030 +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1031 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1032 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1033 diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1034 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1035 rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1036 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1037 2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1038 $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1039 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1040 diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1041 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1042 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1043 +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1044 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1045 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1046 diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1047 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1048 rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1049 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1050 2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1051 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1052 $ grep 'diff --git' .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1053 diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1054 diff --git a/foo b/baz
5026
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
1055
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
1056
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1057 test file move chains in the slow path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1058
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1059 $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1060 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
1061 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1062 $ hg ci -m 'change foo again'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1063 $ hg up -C 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1064 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
1065 $ hg mv bar quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1066 $ 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
1067 $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1068 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1069 diff --git a/foo b/bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1070 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1071 rename to bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1072 diff --git a/quux b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1073 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1074 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1075 +++ b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1076 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1077 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1078 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1079 3 bleh (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1080 $ hg mv quux fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1081 $ hg mv bleh barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1082 $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1083 $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1084 diff --git a/foo b/barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1085 rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1086 rename to barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1087 diff --git a/fred b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1088 new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1089 --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1090 +++ b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1091 @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1092 +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1093 $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1094 3 barney (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1095
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1096
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1097 refresh omitting an added file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1098
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1099 $ hg qnew baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1100 $ echo newfile > newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1101 $ hg add newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1102 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1103 $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1104 C newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1105 $ hg qrefresh -X newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1106 $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1107 A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1108 $ hg revert newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1109 $ rm newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1110 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1111 popping baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1112 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
1113
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
1114 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
1115
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1116 $ 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
1117 $ 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
1118 $ 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
1119 $ 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
1120 bar
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1121
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1122 create a git patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1123
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1124 $ echo a > alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1125 $ hg add alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1126 $ hg qnew -f --git addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1127 $ grep diff .hg/patches/addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1128 diff --git a/alexander b/alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1129
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1130
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1131 create a git binary patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1132
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1133 $ cat > writebin.py <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1134 > import sys
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1135 > path = sys.argv[1]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1136 > open(path, 'wb').write('BIN\x00ARY')
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1137 > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1138 $ python writebin.py bucephalus
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 $ python "$TESTDIR/md5sum.py" bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1141 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1142 $ hg add bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1143 $ hg qnew -f --git addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1144 $ grep diff .hg/patches/addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1145 diff --git a/bucephalus b/bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1146
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1147
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1148 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
1149
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1150 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1151 popping addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1152 now at: addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1153 $ 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
1154 [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1155 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1156 applying addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1157 now at: addbucephalus
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
1158 $ test -f bucephalus
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1159 $ python "$TESTDIR/md5sum.py" bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1160 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
1161
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1162
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1163
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1164 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
1165
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1166 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1167 $ hg init strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1168 $ cd strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1169 $ touch foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1170 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1171 $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1172 $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1173 $ hg ci -m 'change foo 1'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1174 $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1175 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
1176 $ echo 1 >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1177 $ hg ci -m 'change foo 2'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1178 created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1179 $ HGMERGE=true hg merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1180 merging foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1181 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
1182 (branch merge, don't forget to commit)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1183 $ hg ci -m merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1184 $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1185 changeset: 3:99615015637b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1186 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1187 parent: 2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1188 parent: 1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1189 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1190 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1191 summary: merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1192
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1193 changeset: 2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1194 parent: 0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1195 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1196 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1197 summary: change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1198
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1199 changeset: 1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1200 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1201 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1202 summary: change foo 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1203
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1204 changeset: 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: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1208
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
1209 $ hg strip 1
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1210 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
1211 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
1212 $ checkundo strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1213 $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1214 changeset: 1:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1215 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1216 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1217 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1218 summary: change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1219
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1220 changeset: 0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1221 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1222 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1223 summary: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1224
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1225 $ cd ..
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
1226
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1227
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1228 qclone
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
1229
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1230 $ qlog()
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1231 > {
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1232 > echo 'main repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1233 > hg log --template ' rev {rev}: {desc}\n'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1234 > echo 'patch repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1235 > 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
1236 > }
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1237 $ hg init qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1238 $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1239 $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1240 $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1241 $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1242 $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1243 $ hg qnew patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1244 $ echo bar >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1245 $ hg qrefresh -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1246 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1247
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1248
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1249 repo with unversioned patch dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1250
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1251 $ hg qclone qclonesource failure
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1252 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
1253 [255]
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
1254
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1255 $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1256 $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
1257 adding .hg/patches/patch1 (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1258 $ hg qci -m checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1259 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1260 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1261 rev 1: change foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1262 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1263 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1264 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1265 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1266
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1267
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1268 repo with patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1269
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1270 $ hg qclone qclonesource qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1271 updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1272 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
1273 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
1274 $ cd qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1275 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1276 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1277 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1278 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1279 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1280 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1281
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1282
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1283 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
1284
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1285 $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1286 $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1287 popping patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1288 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1289 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1290 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1291 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1292 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1293 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1294 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1295 $ hg qclone qclonesource qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1296 updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1297 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
1298 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
1299 $ cd qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1300 $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1301 main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1302 rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1303 patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1304 rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1305 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1306
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1307
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
1308 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
1309
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1310 $ hg init empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1311 $ cd empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1312 $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1313 $ hg ci -Am addempty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1314 adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1315 $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1316 $ hg qnew -f -e changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1317 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1318 popping changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1319 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1320 $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1321 applying changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1322 now at: changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1323 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1324
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1325 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
1326
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1327 $ hg init forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1328 $ cd forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1329 $ echo hello > hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1330 $ echo bye > bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1331 $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1332 adding bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1333 adding hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1334 $ hg qnew -d '0 0' empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1335 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1336 popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1337 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1338 $ echo world >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1339
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1340
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1341 qpush should fail, local changes
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1342
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1343 $ 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
1344 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
1345 [255]
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1346
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1347
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1348 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
1349
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
1350 $ hg qpush -f
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1351 applying empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1352 patch empty is empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1353 now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1354 $ 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
1355 diff -r d58265112590 hello.txt
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1356 --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1357 +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1358 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1359 hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1360 +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1361 $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1362 diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1363 --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1364 +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1365 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1366 hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1367 +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1368 $ 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
1369 changeset: 1:d58265112590
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1370 tag: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1371 tag: qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1372 tag: qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1373 tag: tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1374 user: test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1375 date: Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1376 summary: imported patch empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1377
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1378
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1379 $ hg qref -d '0 0'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1380 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1381 popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1382 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1383 $ echo universe >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1384 $ 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
1385
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1386
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1387 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
1388
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1389 $ 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
1390 abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
1391 [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1392
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1393
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1394 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
1395
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1396 $ hg qpush -f --verbose
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1397 applying empty
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1398 saving current version of hello.txt as hello.txt.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1399 patching file hello.txt
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1400 hello.txt
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1401 now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1402 $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1403 M bye.txt
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
1404 ? hello.txt.orig
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1405 $ hg diff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1406 diff -r ba252371dbc1 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1407 --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1408 +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1409 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1410 bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1411 +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1412 $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1413 diff -r 9ecee4f634e3 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1414 --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1415 +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1416 @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1417 bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1418 +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1419 diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1420 --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1421 +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1422 @@ -1,1 +1,3 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1423 hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1424 +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1425 +universe
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1426
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1427
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1428 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
1429
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1430 $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1431 0 A empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1432 $ hg up qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1433 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
1434 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1435 popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1436 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1437
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1438 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1439 $ hg init deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1440 $ cd deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1441
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1442 $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1443 $ 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
1444
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1445 $ hg qnew rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1446 $ hg rm a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1447 $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1448
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1449 $ mkdir a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1450 $ touch a/a b/b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1451 $ hg add -q a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1452 $ hg qrefresh
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
1453
11894
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 test popping must remove files added in subdirectories first
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1456
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1457 $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1458 popping rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1459 patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1460 $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
1461
15728
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1462
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1463 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
1464 insensitive filesystem
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1465
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1466 $ 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
1467 $ cd casepreserve
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1468
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1469 $ 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
1470 $ 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
1471 $ 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
1472 $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1473
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1474 $ 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
1475 $ 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
1476 $ 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
1477 $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1478
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1479 $ 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
1480 $ 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
1481 $ hg qrefresh
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 qapplied
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1484 add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1485 add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1486 modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1487 $ 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
1488 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
1489 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
1490 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
1491 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
1492
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1493 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
1494 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
1495 (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
1496 (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
1497
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
1498 $ 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
1499 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
1500 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
1501 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
1502 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
1503
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
1504 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
1505
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
1506 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
1507
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
1508 $ 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
1509 $ hg phase 'qparent::'
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
1510 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
1511 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
1512 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
1513 $ 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
1514 $ 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
1515 $ 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
1516 $ hg phase 'qparent::'
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
1517 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
1518 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
1519 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
1520
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
1521 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
1522
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
1523 $ 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
1524 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
1525 $ 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
1526 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
1527 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
1528 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
1529
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
1530 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
1531
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
1532 $ 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
1533 $ 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
1534 $ 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
1535 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
1536 $ 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
1537 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
1538 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
1539 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
1540
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
1541 (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
1542
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
1543 $ 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
1544 $ 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
1545 $ 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
1546
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
1547 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
1548
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
1549 $ 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
1550 $ 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
1551 $ 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
1552 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
1553 $ 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
1554 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
1555 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
1556 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
1557
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1558 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
1559
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1560 $ 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
1561 > 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
1562 > 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
1563 > 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
1564 > 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
1565 > cgitb.enable()
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1566 > app = hgweb('.', 'test')
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1567 > 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
1568 > HGWEB
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
1569 $ . "$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
1570 #if msys
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
1571 $ 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
1572 #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
1573 $ 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
1574 #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
1575 $ QUERY_STRING='style=raw'
18733
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
1576 $ 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
1577 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
1578
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
1579 $ cd ..