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