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