Mercurial > hg
annotate tests/test-mq.t @ 12515:b6a784e39ad4
tests: unify test-convert-bzr-ghosts
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Sep 2010 14:36:49 -0500 |
parents | 4fee1fd3de9a |
children | 6cc4b14fb76b |
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 | 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 | 13 |
14 | |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
15 help |
2729 | 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 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
51 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
|
52 other, independent patch queues with the "hg qqueue" command. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
53 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
54 list of commands: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
55 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
56 qapplied print the patches already applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
57 qclone clone main and patch repository at same time |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
58 qdelete remove patches from queue |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
59 qdiff diff of the current patch and subsequent modifications |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
60 qfinish move applied patches into repository history |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
61 qfold fold the named patches into the current patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
62 qgoto push or pop patches until named patch is at top of stack |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
63 qguard set or print guards for a patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
64 qheader print the header of the topmost or specified patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
65 qimport import a patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
66 qnew create a new patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
67 qnext print the name of the next patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
68 qpop pop the current patch off the stack |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
69 qprev print the name of the previous patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
70 qpush push the next patch onto the stack |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
71 qqueue manage multiple patch queues |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
72 qrefresh update the current patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
73 qrename rename a patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
74 qselect set or print guarded patches to push |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
75 qseries print the entire series file |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
76 qtop print the name of the current patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
77 qunapplied print the patches not yet applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
78 strip strip changesets and all their descendants from the repository |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
79 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
80 use "hg -v help mq" to show aliases and global options |
2729 | 81 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
82 $ hg init a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
83 $ cd a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
84 $ echo a > a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
85 $ hg ci -Ama |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
86 adding a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
87 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
88 $ hg clone . ../k |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
89 updating to branch default |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
90 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
|
91 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
92 $ mkdir b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
93 $ echo z > b/z |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
94 $ hg ci -Ama |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
95 adding b/z |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
96 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
97 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
98 qinit |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
99 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
100 $ hg qinit |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
101 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
102 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
103 $ hg init b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
104 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
105 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
106 -R qinit |
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 $ 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
|
109 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
110 $ hg init c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
111 |
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 qinit -c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
114 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
115 $ hg --cwd c qinit -c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
116 $ hg -R c/.hg/patches st |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
117 A .hgignore |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
118 A series |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
119 |
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 qinit; qinit -c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
122 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
123 $ hg init d |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
124 $ cd d |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
125 $ hg qinit |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
126 $ hg qinit -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 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
|
129 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
130 $ cat .hg/patches/.hgignore |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
131 ^\.hg |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
132 ^\.mq |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
133 syntax: glob |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
134 status |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
135 guards |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
136 $ cat .hg/patches/series |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
137 $ hg qinit -c |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
138 abort: repository * already exists! (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
139 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
140 $ cd .. |
11555
d8d0fc3988ca
color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents:
11327
diff
changeset
|
141 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
142 $ echo '% qinit; <stuff>; qinit -c' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
143 % qinit; <stuff>; qinit -c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
144 $ hg init e |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
145 $ cd e |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
146 $ hg qnew A |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
147 $ checkundo qnew |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
148 $ echo foo > foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
149 $ hg add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
150 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
151 $ hg qnew B |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
152 $ echo >> foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
153 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
154 $ echo status >> .hg/patches/.hgignore |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
155 $ echo bleh >> .hg/patches/.hgignore |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
156 $ hg qinit -c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
157 adding .hg/patches/A |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
158 adding .hg/patches/B |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
159 $ hg -R .hg/patches status |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
160 A .hgignore |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
161 A A |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
162 A B |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
163 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
|
164 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
165 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
|
166 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
167 $ cat .hg/patches/.hgignore |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
168 status |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
169 bleh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
170 $ cat .hg/patches/series |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
171 A |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
172 B |
10710
47fbbc4845ff
mq: test for init --mq with a destination argument
Cédric Duval <cedricduval@free.fr>
parents:
10691
diff
changeset
|
173 |
12036
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
174 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
|
175 |
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
176 $ 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
|
177 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
178 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
|
179 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
180 $ hg status --mq --config extensions.color= --color=always |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
181 [0;32;1mA .hgignore[0m |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
182 [0;32;1mA A[0m |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
183 [0;32;1mA B[0m |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
184 [0;32;1mA series[0m |
12036
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
185 [0;35;1;4m? flaf[0m |
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
186 |
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
187 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
|
188 |
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
189 $ hg purge --mq --verbose --config extensions.purge= |
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
190 Removing file flaf |
31f02288bbc4
mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11907
diff
changeset
|
191 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
192 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
193 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
194 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
|
195 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
196 $ mkdir f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
197 $ cd f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
198 $ hg init --mq |
12070 | 199 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
|
200 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
201 $ cd .. |
2729 | 202 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
203 init --mq with repo path |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
204 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
205 $ hg init g |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
206 $ hg init --mq g |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
207 $ test -d g/.hg/patches/.hg |
2729 | 208 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
209 init --mq with nonexistent directory |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
210 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
211 $ hg init --mq nonexistentdir |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
212 abort: repository nonexistentdir not found! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
213 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
214 |
11715
4f9dfb54c8b5
qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents:
11555
diff
changeset
|
215 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
216 init --mq with bundle (non "local") |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
217 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
218 $ hg -R a bundle --all a.bundle >/dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
219 $ hg init --mq a.bundle |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
220 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
|
221 [255] |
2729 | 222 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
223 $ cd a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
224 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
225 $ hg qnew -m 'foo bar' test.patch |
2729 | 226 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
227 $ echo '# comment' > .hg/patches/series.tmp |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
228 $ echo >> .hg/patches/series.tmp # empty line |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
229 $ cat .hg/patches/series >> .hg/patches/series.tmp |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
230 $ mv .hg/patches/series.tmp .hg/patches/series |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
231 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
232 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
233 qrefresh |
4173
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
234 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
235 $ echo a >> a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
236 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
237 $ cat .hg/patches/test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
238 foo bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
239 |
12375
02990e22150b
tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents:
12365
diff
changeset
|
240 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
|
241 --- 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
|
242 \+\+\+ b/a\t(?P<date2>.*) (re) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
243 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
244 a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
245 +a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
246 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
247 empty qrefresh |
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 qrefresh -X a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
250 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
251 revision: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
252 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
253 $ 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
|
254 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
255 patch: |
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 $ cat .hg/patches/test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
258 foo bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
259 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
260 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
261 working dir diff: |
2729 | 262 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
263 $ hg diff --nodates -q |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
264 --- a/a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
265 +++ b/a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
266 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
267 a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
268 +a |
2729 | 269 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
270 restore things |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
271 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
272 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
273 $ checkundo qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
274 |
2729 | 275 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
276 qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
277 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
278 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
279 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
280 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
281 $ checkundo qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
282 |
9151
f528d1a93491
tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
8167
diff
changeset
|
283 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
284 qpush with dump of tag cache |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
285 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
|
286 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
287 $ rm -f .hg/tags.cache |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
288 $ hg tags > /dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
289 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
290 .hg/tags.cache (pre qpush): |
2729 | 291 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
292 $ cat .hg/tags.cache |
12375
02990e22150b
tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents:
12365
diff
changeset
|
293 1 [\da-f]{40} (re) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
294 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
295 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
296 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
297 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
298 $ hg tags > /dev/null |
2729 | 299 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
300 .hg/tags.cache (post qpush): |
2729 | 301 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
302 $ cat .hg/tags.cache |
12375
02990e22150b
tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents:
12365
diff
changeset
|
303 2 [\da-f]{40} (re) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
304 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
305 $ checkundo qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
306 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
307 |
2729 | 308 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
309 pop/push outside repo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
310 $ hg -R a qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
311 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
312 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
313 $ hg -R a qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
314 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
315 now at: test.patch |
2729 | 316 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
317 $ cd a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
318 $ hg qnew test2.patch |
2729 | 319 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
320 qrefresh in subdir |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
321 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
322 $ cd b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
323 $ echo a > a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
324 $ hg add a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
325 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
326 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
327 pop/push -a in subdir |
2729 | 328 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
329 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
330 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
331 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
332 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
333 $ hg --traceback qpush -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
334 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
335 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
336 now at: test2.patch |
2729 | 337 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
338 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
339 setting columns & formatted tests truncating (issue1912) |
2729 | 340 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
341 $ COLUMNS=4 hg qseries --config ui.formatted=true |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
342 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
343 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
344 $ COLUMNS=20 hg qseries --config ui.formatted=true -vs |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
345 0 A test.patch: f... |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
346 1 A test2.patch: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
347 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
348 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
349 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
350 $ hg qseries -vs |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
351 0 A test.patch: foo bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
352 1 U test2.patch: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
353 $ hg sum | grep mq |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
354 mq: 1 applied, 1 unapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
355 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
356 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
357 now at: test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
358 $ hg sum | grep mq |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
359 mq: 2 applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
360 $ hg qapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
361 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
362 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
363 $ hg qtop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
364 test2.patch |
2729 | 365 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
366 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
367 prev |
2729 | 368 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
369 $ hg qapp -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
370 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
371 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
372 next |
9439
f2acc0c00bec
Backed out premature qprev/qnext removal
Matt Mackall <mpm@selenic.com>
parents:
9365
diff
changeset
|
373 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
374 $ hg qunapp -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
375 all patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
376 [1] |
2729 | 377 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
378 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
379 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
380 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
381 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
382 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
|
383 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
384 $ hg commit |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
385 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
|
386 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
387 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
388 push should fail |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
389 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
390 $ hg push ../../k |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
391 pushing to ../../k |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
392 abort: source has mq patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
393 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
394 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
395 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
396 import should fail |
2846
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2843
diff
changeset
|
397 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
398 $ hg st . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
399 $ echo foo >> ../a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
400 $ hg diff > ../../import.diff |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
401 $ hg revert --no-backup ../a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
402 $ hg import ../../import.diff |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
403 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
|
404 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
405 $ hg st |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
406 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
407 import --no-commit should succeed |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
408 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
409 $ hg import --no-commit ../../import.diff |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
410 applying ../../import.diff |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
411 $ hg st |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
412 M a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
413 $ hg revert --no-backup ../a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
414 |
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 qunapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
417 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
418 $ hg qunapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
419 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
|
420 |
11894
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 qpush/qpop with index |
7142
88f1b8081f1c
Prevent import over an applied patch (closes issue795)
Brendan Cully <brendan@kublai.com>
parents:
7048
diff
changeset
|
423 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
424 $ hg qnew test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
425 $ echo 1b > 1b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
426 $ hg add 1b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
427 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
428 $ hg qpush 2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
429 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
430 now at: test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
431 $ hg qpop 0 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
432 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
433 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
434 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
435 $ hg qpush test.patch+1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
436 applying test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
437 now at: test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
438 $ hg qpush test.patch+2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
439 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
440 now at: test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
441 $ hg qpop test2.patch-1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
442 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
443 now at: test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
444 $ hg qpop test2.patch-2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
445 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
446 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
447 $ hg qpush test1b.patch+1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
448 applying test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
449 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
450 now at: test2.patch |
2729 | 451 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
452 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
453 qpush --move |
3081
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
454 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
455 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
456 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
457 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
458 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
459 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
460 $ hg qguard test1b.patch -- -negguard |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
461 $ hg qguard test2.patch -- +posguard |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
462 $ hg qpush --move test2.patch # can't move guarded patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
463 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
|
464 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
465 $ hg qselect posguard |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
466 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
|
467 $ hg qpush --move test2.patch # move to front |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
468 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
469 now at: test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
470 $ hg qpush --move test1b.patch # negative guard unselected |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
471 applying test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
472 now at: test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
473 $ hg qpush --move test.patch # noop move |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
474 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
475 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
476 $ hg qseries -v |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
477 0 A test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
478 1 A test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
479 2 A test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
480 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
481 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
482 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
483 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
484 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
485 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
486 cleaning up |
11064
590b1d6ef50b
mq: qpush --move, reorder patch series and apply only the patch
Mads Kiilerich <mads@kiilerich.com>
parents:
10710
diff
changeset
|
487 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
488 $ hg qselect --none |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
489 guards deactivated |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
490 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
|
491 $ hg qguard --none test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
492 $ hg qguard --none test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
493 $ hg qpush --move test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
494 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
495 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
496 $ hg qpush --move test1b.patch |
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 bogus # nonexistent patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
500 abort: patch bogus not in series |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
501 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
502 $ hg qpush --move # no patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
503 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
|
504 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
505 $ hg qpush --move test.patch # already applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
506 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
|
507 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
508 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
509 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
510 now at: test2.patch |
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 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
513 series after move |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
514 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
515 $ cat `hg root`/.hg/patches/series |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
516 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
517 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
518 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
519 # comment |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
520 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
521 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
522 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
523 pop, qapplied, qunapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
524 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
525 $ hg qseries -v |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
526 0 A test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
527 1 A test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
528 2 A test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
529 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
530 qapplied -1 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
531 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
532 $ hg qapplied -1 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
533 only one patch applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
534 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
535 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
536 qapplied -1 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
537 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
538 $ hg qapplied -1 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
539 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
540 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
541 qapplied -1 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
542 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
543 $ hg qapplied -1 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
544 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
545 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
546 qapplied -1 |
11715
4f9dfb54c8b5
qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents:
11555
diff
changeset
|
547 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
548 $ hg qapplied -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
549 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
550 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
551 qapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
552 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
553 $ hg qapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
554 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
555 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
556 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
557 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
558 qapplied test1b.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 $ hg qapplied test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
561 test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
562 test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
563 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
564 qunapplied -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
565 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
566 $ hg qunapplied -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
567 all patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
568 [1] |
11894
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 qunapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
571 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
572 $ hg qunapplied |
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 popping |
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 qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
577 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
578 now at: test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
579 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
580 qunapplied -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
581 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
582 $ hg qunapplied -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
583 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
584 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
585 qunapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
586 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
587 $ hg qunapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
588 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
589 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
590 qunapplied test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
591 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
592 $ 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
|
593 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
594 qunapplied -1 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 $ hg qunapplied -1 test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
597 all patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
598 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
599 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
600 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
|
601 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
602 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
603 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
604 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
605 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
606 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
607 qapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
608 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
609 $ hg qapplied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
610 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
611 qapplied -1 |
4101
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
612 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
613 $ hg qapplied -1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
614 no patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
615 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
616 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
617 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
618 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
619 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
620 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
621 push should succeed |
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 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
624 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
625 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
626 $ hg push ../../k |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
627 pushing to ../../k |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
628 searching for changes |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
629 adding changesets |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
630 adding manifests |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
631 adding file changes |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
632 added 1 changesets with 1 changes to 1 files |
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 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
635 we want to start with some patches applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
636 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
637 $ hg qpush -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
638 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
639 applying test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
640 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
641 now at: test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
642 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
643 % pops all patches and succeeds |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
644 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
645 $ hg qpop -a |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
646 popping test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
647 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
648 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
649 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
650 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
651 % does nothing and succeeds |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2848
diff
changeset
|
652 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
653 $ hg qpop -a |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
654 no patches applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
655 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
656 % fails - nothing else to pop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
657 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
658 $ hg qpop |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
659 no patches applied |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
660 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
661 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
662 % pushes a patch and succeeds |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
663 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
664 $ hg qpush |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
665 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
666 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
667 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
668 % pops a patch and succeeds |
6472
8c4cd80afd3e
mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6280
diff
changeset
|
669 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
670 $ hg qpop |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
671 popping test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
672 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
673 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
674 % pushes up to test1b.patch and succeeds |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
675 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
676 $ hg qpush test1b.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
677 applying test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
678 applying test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
679 now at: test1b.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 % does nothing 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 qpush test1b.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
684 qpush: test1b.patch is already at the top |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
685 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
686 % does nothing and succeeds |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
687 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
688 $ hg qpop test1b.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
689 qpop: test1b.patch is already at the top |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
690 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
691 % fails - can't push to this patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
692 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
693 $ hg qpush test.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
694 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
|
695 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
696 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
697 % fails - can't pop to this patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
698 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
699 $ hg qpop test2.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
700 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
|
701 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
702 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
703 % pops up to test.patch and succeeds |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
704 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
705 $ hg qpop test.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
706 popping test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
707 now at: test.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
708 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
709 % 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
|
710 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
711 $ hg qpush -a |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
712 applying test1b.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
713 applying test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
714 now at: test2.patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
715 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
716 % does nothing and succeeds |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
717 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
718 $ hg qpush -a |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
719 all patches are currently applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
720 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
721 % fails - nothing else to push |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
722 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
723 $ hg qpush |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
724 patch series already fully applied |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
725 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
726 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
727 % does nothing and succeeds |
3334
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
728 |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
729 $ hg qpush test2.patch |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
730 qpush: test2.patch is already at the top |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
731 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
732 strip |
4219
6cb5be6bd70f
mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents:
4182
diff
changeset
|
733 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
734 $ cd ../../b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
735 $ echo x>x |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
736 $ hg ci -Ama |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
737 adding x |
11907
863567a1364f
tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11894
diff
changeset
|
738 $ hg strip tip |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
739 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
740 saved backup bundle to * (glob) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
741 $ hg unbundle .hg/strip-backup/* |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
742 adding changesets |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
743 adding manifests |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
744 adding file changes |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
745 added 1 changesets with 1 changes to 1 files |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
746 (run 'hg update' to get a working copy) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
747 |
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
|
748 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
749 strip with local changes, should complain |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
750 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
751 $ hg up |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
752 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
|
753 $ echo y>y |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
754 $ hg add y |
11907
863567a1364f
tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11894
diff
changeset
|
755 $ hg strip tip |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
756 abort: local changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
757 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
758 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
759 --force strip with local changes |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
760 |
11907
863567a1364f
tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11894
diff
changeset
|
761 $ hg strip -f tip |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
762 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
763 saved backup bundle to * (glob) |
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 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
766 cd b; hg qrefresh |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2848
diff
changeset
|
767 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
768 $ hg init refresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
769 $ cd refresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
770 $ echo a > a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
771 $ hg ci -Ama |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
772 adding a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
773 $ hg qnew -mfoo foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
774 $ echo a >> a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
775 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
776 $ mkdir b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
777 $ cd b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
778 $ echo f > f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
779 $ hg add f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
780 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
781 $ cat ../.hg/patches/foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
782 foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
783 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
784 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
|
785 --- 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
|
786 \+\+\+ b/a\t(?P<date>.*) (re) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
787 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
788 a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
789 +a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
790 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
|
791 --- /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
|
792 \+\+\+ b/b/f\t(?P<date>.*) (re) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
793 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
794 +f |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2848
diff
changeset
|
795 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
796 hg qrefresh . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
797 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
798 $ hg qrefresh . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
799 $ cat ../.hg/patches/foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
800 foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
801 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
802 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
|
803 --- /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
|
804 \+\+\+ b/b/f\t(?P<date>.*) (re) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
805 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
806 +f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
807 $ hg status |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
808 M a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
809 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
810 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
811 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
|
812 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
813 $ cd .. |
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 $ hg qnew -mbar bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
816 $ echo foo > foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
817 $ echo bar > bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
818 $ hg add foo bar |
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 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
821 popping bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
822 popping foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
823 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
824 $ echo bar > foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
825 $ hg qpush -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
826 applying foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
827 applying bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
828 file foo already exists |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
829 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
|
830 patch failed, unable to continue (try -v) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
831 patch failed, rejects left in working dir |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
832 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
|
833 [2] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
834 $ hg st |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
835 ? foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
836 ? foo.rej |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
837 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
838 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
839 mq tags |
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 $ hg log --template '{rev} {tags}\n' -r qparent:qtip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
842 0 qparent |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
843 1 foo qbase |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
844 2 bar qtip tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
845 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
846 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
847 bad node in status |
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 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
850 popping bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
851 now at: foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
852 $ hg strip -qn tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
853 $ hg tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
854 changeset: 0:cb9a9f314b8b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
855 tag: tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
856 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
857 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
858 summary: a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
859 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
860 $ hg branches |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
861 default 0:cb9a9f314b8b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
862 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
863 no patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
864 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
865 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
866 $ cat >>$HGRCPATH <<EOF |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
867 > [diff] |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
868 > git = True |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
869 > EOF |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
870 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
871 $ hg init git |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
872 $ cd git |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
873 $ 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
|
874 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
875 $ hg qnew -m'new file' new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
876 $ echo foo > new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
877 $ chmod +x new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
878 $ hg add new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
879 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
880 $ cat .hg/patches/new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
881 new file |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
882 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
883 diff --git a/new b/new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
884 new file mode 100755 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
885 --- /dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
886 +++ b/new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
887 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
888 +foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
889 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
890 $ hg qnew -m'copy file' copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
891 $ hg cp new copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
892 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
893 $ cat .hg/patches/copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
894 copy file |
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 diff --git a/new b/copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
897 copy from new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
898 copy to copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
899 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
900 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
901 popping copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
902 now at: new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
903 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
904 applying copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
905 now at: copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
906 $ hg qdiff |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
907 diff --git a/new b/copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
908 copy from new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
909 copy to copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
910 $ cat >>$HGRCPATH <<EOF |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
911 > [diff] |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
912 > git = False |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
913 > EOF |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
914 $ hg qdiff --git |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
915 diff --git a/new b/copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
916 copy from new |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
917 copy to copy |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
918 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
919 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
920 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
921 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
|
922 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
923 $ hg init slow |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
924 $ cd slow |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
925 $ hg qinit |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
926 $ echo foo > foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
927 $ hg add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
928 $ hg ci -m 'add foo' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
929 $ hg qnew bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
930 $ echo bar > bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
931 $ hg add bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
932 $ hg mv foo baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
933 $ hg qrefresh --git |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
934 $ hg up -C 0 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
935 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
|
936 $ echo >> foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
937 $ hg ci -m 'change foo' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
938 created new head |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
939 $ hg up -C 1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
940 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
|
941 $ hg qrefresh --git |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
942 $ cat .hg/patches/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
943 diff --git a/bar b/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
944 new file mode 100644 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
945 --- /dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
946 +++ b/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
947 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
948 +bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
949 diff --git a/foo b/baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
950 rename from foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
951 rename to baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
952 $ hg log -v --template '{rev} {file_copies}\n' -r . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
953 2 baz (foo) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
954 $ hg qrefresh --git |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
955 $ cat .hg/patches/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
956 diff --git a/bar b/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
957 new file mode 100644 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
958 --- /dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
959 +++ b/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
960 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
961 +bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
962 diff --git a/foo b/baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
963 rename from foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
964 rename to baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
965 $ hg log -v --template '{rev} {file_copies}\n' -r . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
966 2 baz (foo) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
967 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
968 $ grep 'diff --git' .hg/patches/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
969 diff --git a/bar b/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
970 diff --git a/foo b/baz |
5026 | 971 |
972 | |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
973 test file move chains in the slow path |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
974 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
975 $ hg up -C 1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
976 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
|
977 $ echo >> foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
978 $ hg ci -m 'change foo again' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
979 $ hg up -C 2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
980 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
|
981 $ hg mv bar quux |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
982 $ 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
|
983 $ hg qrefresh --git |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
984 $ cat .hg/patches/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
985 diff --git a/foo b/bleh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
986 rename from foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
987 rename to bleh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
988 diff --git a/quux b/quux |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
989 new file mode 100644 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
990 --- /dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
991 +++ b/quux |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
992 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
993 +bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
994 $ hg log -v --template '{rev} {file_copies}\n' -r . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
995 3 bleh (foo) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
996 $ hg mv quux fred |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
997 $ hg mv bleh barney |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
998 $ hg qrefresh --git |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
999 $ cat .hg/patches/bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1000 diff --git a/foo b/barney |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1001 rename from foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1002 rename to barney |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1003 diff --git a/fred b/fred |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1004 new file mode 100644 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1005 --- /dev/null |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1006 +++ b/fred |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1007 @@ -0,0 +1,1 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1008 +bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1009 $ hg log -v --template '{rev} {file_copies}\n' -r . |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1010 3 barney (foo) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1011 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1012 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1013 refresh omitting an added file |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1014 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1015 $ hg qnew baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1016 $ echo newfile > newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1017 $ hg add newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1018 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1019 $ hg st -A newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1020 C newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1021 $ hg qrefresh -X newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1022 $ hg st -A newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1023 A newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1024 $ hg revert newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1025 $ rm newfile |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1026 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1027 popping baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1028 now at: bar |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1029 $ hg qdel baz |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1030 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1031 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1032 create a git patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1033 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1034 $ echo a > alexander |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1035 $ hg add alexander |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1036 $ hg qnew -f --git addalexander |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1037 $ grep diff .hg/patches/addalexander |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1038 diff --git a/alexander b/alexander |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1039 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1040 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1041 create a git binary patch |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1042 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1043 $ cat > writebin.py <<EOF |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1044 > import sys |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1045 > path = sys.argv[1] |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1046 > open(path, 'wb').write('BIN\x00ARY') |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1047 > EOF |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1048 $ python writebin.py bucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1049 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1050 $ python "$TESTDIR/md5sum.py" bucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1051 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1052 $ hg add bucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1053 $ hg qnew -f --git addbucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1054 $ grep diff .hg/patches/addbucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1055 diff --git a/bucephalus b/bucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1056 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1057 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1058 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
|
1059 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1060 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1061 popping addbucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1062 now at: addalexander |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1063 $ 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
|
1064 [1] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1065 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1066 applying addbucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1067 now at: addbucephalus |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
1068 $ test -f bucephalus |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1069 $ python "$TESTDIR/md5sum.py" bucephalus |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1070 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
|
1071 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1072 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1073 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1074 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
|
1075 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1076 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1077 $ hg init strip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1078 $ cd strip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1079 $ touch foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1080 $ hg add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1081 $ hg ci -m 'add foo' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1082 $ echo >> foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1083 $ hg ci -m 'change foo 1' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1084 $ hg up -C 0 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1085 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
|
1086 $ echo 1 >> foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1087 $ hg ci -m 'change foo 2' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1088 created new head |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1089 $ HGMERGE=true hg merge |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1090 merging foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1091 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
|
1092 (branch merge, don't forget to commit) |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1093 $ hg ci -m merge |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1094 $ hg log |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1095 changeset: 3:99615015637b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1096 tag: tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1097 parent: 2:20cbbe65cff7 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1098 parent: 1:d2871fc282d4 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1099 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1100 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1101 summary: merge |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1102 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1103 changeset: 2:20cbbe65cff7 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1104 parent: 0:53245c60e682 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1105 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1106 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1107 summary: change foo 2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1108 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1109 changeset: 1:d2871fc282d4 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1110 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1111 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1112 summary: change foo 1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1113 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1114 changeset: 0:53245c60e682 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1115 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1116 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1117 summary: add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1118 |
11907
863567a1364f
tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11894
diff
changeset
|
1119 $ hg strip 1 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
1121 saved backup bundle to * (glob) |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1122 $ checkundo strip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1123 $ hg log |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1124 changeset: 1:20cbbe65cff7 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1125 tag: tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1126 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1127 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1128 summary: change foo 2 |
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 changeset: 0:53245c60e682 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1131 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1132 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1133 summary: add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1134 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1135 $ cd .. |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
1136 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1137 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1138 qclone |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
1139 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1140 $ qlog() |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1141 > { |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1142 > echo 'main repo:' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1143 > hg log --template ' rev {rev}: {desc}\n' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1144 > echo 'patch repo:' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1145 > 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
|
1146 > } |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1147 $ hg init qclonesource |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1148 $ cd qclonesource |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1149 $ echo foo > foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1150 $ hg add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1151 $ hg ci -m 'add foo' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1152 $ hg qinit |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1153 $ hg qnew patch1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1154 $ echo bar >> foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1155 $ hg qrefresh -m 'change foo' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1156 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1157 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1158 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1159 repo with unversioned patch dir |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1160 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1161 $ hg qclone qclonesource failure |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1162 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
|
1163 [255] |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
1164 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1165 $ cd qclonesource |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1166 $ hg qinit -c |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1167 adding .hg/patches/patch1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1168 $ hg qci -m checkpoint |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1169 $ qlog |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1170 main repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1171 rev 1: change foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1172 rev 0: add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1173 patch repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1174 rev 0: checkpoint |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1175 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1176 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1177 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1178 repo with patches applied |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1179 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1180 $ hg qclone qclonesource qclonedest |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1181 updating to branch default |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1182 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
|
1183 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
|
1184 $ cd qclonedest |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1185 $ qlog |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1186 main repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1187 rev 0: add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1188 patch repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1189 rev 0: checkpoint |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1190 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1191 |
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 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
|
1194 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1195 $ cd qclonesource |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1196 $ hg qpop -a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1197 popping patch1 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1198 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1199 $ qlog |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1200 main repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1201 rev 0: add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1202 patch repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1203 rev 0: checkpoint |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1204 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1205 $ hg qclone qclonesource qclonedest2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1206 updating to branch default |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1207 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
|
1208 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
|
1209 $ cd qclonedest2 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1210 $ qlog |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1211 main repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1212 rev 0: add foo |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1213 patch repo: |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1214 rev 0: checkpoint |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1215 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1216 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1217 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
1218 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
|
1219 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1220 $ hg init empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1221 $ cd empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1222 $ touch a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1223 $ hg ci -Am addempty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1224 adding a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1225 $ echo a > a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1226 $ hg qnew -f -e changea |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1227 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1228 popping changea |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1229 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1230 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1231 applying changea |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1232 now at: changea |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1233 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1234 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1235 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1236 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
|
1237 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1238 $ hg init forcepush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1239 $ cd forcepush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1240 $ echo hello > hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1241 $ echo bye > bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1242 $ hg ci -Ama |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1243 adding bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1244 adding hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1245 $ hg qnew -d '0 0' empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1246 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1247 popping empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1248 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1249 $ echo world >> hello.txt |
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 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1252 qpush should fail, local changes |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1253 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1254 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1255 abort: local changes found, refresh first |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
1256 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1257 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1258 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1259 apply force, should not discard changes with empty patch |
6554
3182602fa1fb
mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6280
diff
changeset
|
1260 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1261 $ hg qpush -f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1262 applying empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1263 patch empty is empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1264 now at: empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1265 $ hg diff --config diff.nodates=True |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1266 diff -r bf5fc3f07a0a hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1267 --- a/hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1268 +++ b/hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1269 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1270 hello |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1271 +world |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1272 $ hg qdiff --config diff.nodates=True |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1273 diff -r 9ecee4f634e3 hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1274 --- a/hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1275 +++ b/hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1276 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1277 hello |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1278 +world |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1279 $ hg log -l1 -p |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1280 changeset: 1:bf5fc3f07a0a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1281 tag: empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1282 tag: qbase |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1283 tag: qtip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1284 tag: tip |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1285 user: test |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1286 date: Thu Jan 01 00:00:00 1970 +0000 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1287 summary: imported patch empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1288 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1289 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1290 $ hg qref -d '0 0' |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1291 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1292 popping empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1293 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1294 $ echo universe >> hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1295 $ 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
|
1296 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1297 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1298 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
|
1299 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1300 $ hg qpush |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1301 abort: local changes found, refresh first |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12101
diff
changeset
|
1302 [255] |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1303 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1304 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1305 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
|
1306 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1307 $ hg qpush -f |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1308 applying empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1309 now at: empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1310 $ hg st |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1311 M bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1312 $ hg diff --config diff.nodates=True |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1313 diff -r ba252371dbc1 bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1314 --- a/bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1315 +++ b/bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1316 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1317 bye |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1318 +universe |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1319 $ hg qdiff --config diff.nodates=True |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1320 diff -r 9ecee4f634e3 bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1321 --- a/bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1322 +++ b/bye.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1323 @@ -1,1 +1,2 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1324 bye |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1325 +universe |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1326 diff -r 9ecee4f634e3 hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1327 --- a/hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1328 +++ b/hello.txt |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1329 @@ -1,1 +1,3 @@ |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1330 hello |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1331 +world |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1332 +universe |
10048
46de82e50790
mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9874
diff
changeset
|
1333 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1334 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1335 test 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
|
1336 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1337 $ hg qseries -v |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1338 0 A empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1339 $ hg up qparent |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1340 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
|
1341 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1342 popping empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1343 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1344 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1345 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1346 $ hg init deletion-order |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1347 $ cd deletion-order |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1348 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1349 $ touch a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1350 $ 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
|
1351 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1352 $ hg qnew rename-dir |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1353 $ hg rm a |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1354 $ hg qrefresh |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1355 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1356 $ mkdir a b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1357 $ touch a/a b/b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1358 $ hg add -q a b |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1359 $ hg qrefresh |
10048
46de82e50790
mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9874
diff
changeset
|
1360 |
11894
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1361 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1362 test popping must remove files added in subdirectories first |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1363 |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1364 $ hg qpop |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1365 popping rename-dir |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1366 patch queue now empty |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1367 $ cd .. |
a15936ac7ec5
tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11715
diff
changeset
|
1368 |