Mercurial > hg
annotate tests/test-mq-qimport.t @ 19425:81fbd4e66ff5
gendoc: dispatch print document content by commandline arguments
Before this patch, gendoc.py only prints hg.1.gendoc.txt content.
This adds any content print function.
author | Takumi IINO <trot.thunder@gmail.com> |
---|---|
date | Wed, 03 Jul 2013 21:49:41 +0900 |
parents | f62ed3d90377 |
children | fd7839d1107d |
rev | line source |
---|---|
17565
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17492
diff
changeset
|
1 $ "$TESTDIR/hghave" killdaemons || exit 80 |
6027
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
3 $ cat > writelines.py <<EOF |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
4 > import sys |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
5 > path = sys.argv[1] |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
6 > args = sys.argv[2:] |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
7 > assert (len(args) % 2) == 0 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
8 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
9 > f = file(path, 'wb') |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
10 > for i in xrange(len(args)/2): |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
11 > count, s = args[2*i:2*i+2] |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
12 > count = int(count) |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
13 > s = s.decode('string_escape') |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
14 > f.write(s*count) |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
15 > f.close() |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
16 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
17 > EOF |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
18 $ echo "[extensions]" >> $HGRCPATH |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
19 $ echo "mq=" >> $HGRCPATH |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
20 $ echo "[diff]" >> $HGRCPATH |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
21 $ echo "git=1" >> $HGRCPATH |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
22 $ hg init repo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
23 $ cd repo |
6027
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 |
16987
54295c87eefc
mq: abort if no files or revisions are specified for qimport
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
25 qimport without file or revision |
54295c87eefc
mq: abort if no files or revisions are specified for qimport
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
26 |
54295c87eefc
mq: abort if no files or revisions are specified for qimport
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
27 $ hg qimport |
54295c87eefc
mq: abort if no files or revisions are specified for qimport
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
28 abort: no files or revisions specified |
54295c87eefc
mq: abort if no files or revisions are specified for qimport
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
29 [255] |
54295c87eefc
mq: abort if no files or revisions are specified for qimport
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
30 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
31 qimport non-existing-file |
6027
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
32 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
33 $ hg qimport non-existing-file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
34 abort: unable to read file non-existing-file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
35 [255] |
6940
05ec27530d04
qimport: report filename in case of IOError
Martin Geisler <mg@daimi.au.dk>
parents:
6027
diff
changeset
|
36 |
16359
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
37 qimport null revision |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
38 |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
39 $ hg qimport -r null |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
40 abort: revision -1 is not mutable |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
41 (see "hg help phases" for details) |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
42 [255] |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
43 $ hg qseries |
a1b6a63f9f39
context: make changectx.mutable() benefit from .phase() logic
Patrick Mezard <patrick@mezard.eu>
parents:
16119
diff
changeset
|
44 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
45 import email |
6940
05ec27530d04
qimport: report filename in case of IOError
Martin Geisler <mg@daimi.au.dk>
parents:
6027
diff
changeset
|
46 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
47 $ hg qimport --push -n email - <<EOF |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
48 > From: Username in email <test@example.net> |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
49 > Subject: [PATCH] Message in email |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
50 > Date: Fri, 02 Jan 1970 00:00:00 +0000 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
51 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
52 > Text before patch. |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
53 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
54 > # HG changeset patch |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
55 > # User Username in patch <test@example.net> |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
56 > # Date 0 0 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
57 > # Node ID 1a706973a7d84cb549823634a821d9bdf21c6220 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
58 > # Parent 0000000000000000000000000000000000000000 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
59 > First line of commit message. |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
60 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
61 > More text in commit message. |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
62 > --- confuse the diff detection |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
63 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
64 > diff --git a/x b/x |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
65 > new file mode 100644 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
66 > --- /dev/null |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
67 > +++ b/x |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
68 > @@ -0,0 +1,1 @@ |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
69 > +new file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
70 > Text after patch. |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
71 > |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
72 > EOF |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
73 adding email to series file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
74 applying email |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
75 now at: email |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8362
diff
changeset
|
76 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
77 hg tip -v |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8362
diff
changeset
|
78 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
79 $ hg tip -v |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
80 changeset: 0:1a706973a7d8 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
81 tag: email |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
82 tag: qbase |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
83 tag: qtip |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
84 tag: tip |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
85 user: Username in patch <test@example.net> |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
86 date: Thu Jan 01 00:00:00 1970 +0000 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
87 files: x |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
88 description: |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
89 First line of commit message. |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
90 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
91 More text in commit message. |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
92 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
93 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
94 $ hg qpop |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
95 popping email |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
96 patch queue now empty |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
97 $ hg qdelete email |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8362
diff
changeset
|
98 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
99 import URL |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
100 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
101 $ echo foo >> foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
102 $ hg add foo |
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12464
diff
changeset
|
103 $ hg diff > url.diff |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
104 $ hg revert --no-backup foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
105 $ rm foo |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8362
diff
changeset
|
106 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
107 Under unix: file:///foobar/blah |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
108 Under windows: file:///c:/foobar/blah |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8362
diff
changeset
|
109 |
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12464
diff
changeset
|
110 $ patchurl=`pwd | tr '\\\\' /`/url.diff |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
111 $ expr "$patchurl" : "\/" > /dev/null || patchurl="/$patchurl" |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
112 $ hg qimport file://"$patchurl" |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
113 adding url.diff to series file |
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12464
diff
changeset
|
114 $ rm url.diff |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
115 $ hg qun |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
116 url.diff |
9287
53fdf18fd63b
mq: Parse commit message after we find start of changeset patch
David Soria Parra <dsp@php.net>
parents:
8362
diff
changeset
|
117 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
118 import patch that already exists |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
119 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
120 $ echo foo2 >> foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
121 $ hg add foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
122 $ hg diff > ../url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
123 $ hg revert --no-backup foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
124 $ rm foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
125 $ hg qimport ../url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
126 abort: patch "url.diff" already exists |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
127 [255] |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
128 $ hg qpush |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
129 applying url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
130 now at: url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
131 $ cat foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
132 foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
133 $ hg qpop |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
134 popping url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
135 patch queue now empty |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
136 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
137 qimport -f |
7158
d1d011accf94
mq: let qimport read patches from URLs
Brendan Cully <brendan@kublai.com>
parents:
6940
diff
changeset
|
138 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
139 $ hg qimport -f ../url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
140 adding url.diff to series file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
141 $ hg qpush |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
142 applying url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
143 now at: url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
144 $ cat foo |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
145 foo2 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
146 $ hg qpop |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
147 popping url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
148 patch queue now empty |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
149 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
150 build diff with CRLF |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
151 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
152 $ python ../writelines.py b 5 'a\n' 5 'a\r\n' |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
153 $ hg ci -Am addb |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
154 adding b |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
155 $ python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n' |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
156 $ hg diff > b.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
157 $ hg up -C |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
159 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
160 qimport CRLF diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
161 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
162 $ hg qimport b.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
163 adding b.diff to series file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
164 $ hg qpush |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
165 applying b.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
166 now at: b.diff |
7160
1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
Brendan Cully <brendan@kublai.com>
parents:
7158
diff
changeset
|
167 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
168 try to import --push |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
169 |
16119
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
170 $ cat > appendfoo.diff <<EOF |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
171 > append foo |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16987
diff
changeset
|
172 > |
16119
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
173 > diff -r 07f494440405 -r 261500830e46 baz |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
174 > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
175 > +++ b/baz Thu Jan 01 00:00:00 1970 +0000 |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
176 > @@ -0,0 +1,1 @@ |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
177 > +foo |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
178 > EOF |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
179 |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
180 $ cat > appendbar.diff <<EOF |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
181 > append bar |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16987
diff
changeset
|
182 > |
16119
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
183 > diff -r 07f494440405 -r 261500830e46 baz |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
184 > --- a/baz Thu Jan 01 00:00:00 1970 +0000 |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
185 > +++ b/baz Thu Jan 01 00:00:00 1970 +0000 |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
186 > @@ -1,1 +1,2 @@ |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
187 > foo |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
188 > +bar |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
189 > EOF |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
190 |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
191 $ hg qimport --push appendfoo.diff appendbar.diff |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
192 adding appendfoo.diff to series file |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
193 adding appendbar.diff to series file |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
194 applying appendfoo.diff |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
195 applying appendbar.diff |
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
196 now at: appendbar.diff |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
197 $ hg qfin -a |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
198 patch b.diff finalized without changeset message |
16119
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
199 $ hg qimport -r 'p1(.)::' -P |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
200 $ hg qpop -a |
16119
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
201 popping 3.diff |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
202 popping 2.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
203 patch queue now empty |
16119
5de83d9ca79c
mq: make qimport --push push all imported patches (issue3130)
Patrick Mezard <patrick@mezard.eu>
parents:
16027
diff
changeset
|
204 $ hg qdel 3.diff |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
205 $ hg qdel -k 2.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
206 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
207 qimport -e |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
208 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
209 $ hg qimport -e 2.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
210 adding 2.diff to series file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
211 $ hg qdel -k 2.diff |
6027
cee68264ed92
mq: qimport must read patches in binary mode
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
212 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
213 qimport -e --name newname oldexisitingpatch |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
214 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
215 $ hg qimport -e --name this-name-is-better 2.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
216 renaming 2.diff to this-name-is-better |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
217 adding this-name-is-better to series file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
218 $ hg qser |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
219 this-name-is-better |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
220 url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
221 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
222 qimport -e --name without --force |
11699
da0b9109186d
mq: support "qimport --existing --name renametothis thatexistingpatch"
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
223 |
12464
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
224 $ cp .hg/patches/this-name-is-better .hg/patches/3.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
225 $ hg qimport -e --name this-name-is-better 3.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
226 abort: patch "this-name-is-better" already exists |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
227 [255] |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
228 $ hg qser |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
229 this-name-is-better |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
230 url.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
231 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
232 qimport -e --name with --force |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
233 |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
234 $ hg qimport --force -e --name this-name-is-better 3.diff |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
235 renaming 3.diff to this-name-is-better |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
236 adding this-name-is-better to series file |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
237 $ hg qser |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
238 this-name-is-better |
3177e3a7b14f
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com>
parents:
11701
diff
changeset
|
239 url.diff |
14395
dc961471efde
mq: check patch name is valid before reading imported file
Idan Kamara <idankk86@gmail.com>
parents:
12642
diff
changeset
|
240 |
dc961471efde
mq: check patch name is valid before reading imported file
Idan Kamara <idankk86@gmail.com>
parents:
12642
diff
changeset
|
241 qimport with bad name, should abort before reading file |
dc961471efde
mq: check patch name is valid before reading imported file
Idan Kamara <idankk86@gmail.com>
parents:
12642
diff
changeset
|
242 |
17492 | 243 $ hg qimport non-existent-file --name .hg |
14395
dc961471efde
mq: check patch name is valid before reading imported file
Idan Kamara <idankk86@gmail.com>
parents:
12642
diff
changeset
|
244 abort: patch name cannot begin with ".hg" |
dc961471efde
mq: check patch name is valid before reading imported file
Idan Kamara <idankk86@gmail.com>
parents:
12642
diff
changeset
|
245 [255] |
14396
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
246 |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
247 qimport http:// patch with leading slashes in url |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
248 |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
249 set up hgweb |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
250 |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
251 $ cd .. |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
252 $ hg init served |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
253 $ cd served |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
254 $ echo a > a |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
255 $ hg ci -Am patch |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
256 adding a |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
257 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
258 $ cat hg.pid >> $DAEMON_PIDS |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
259 |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
260 $ cd ../repo |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
261 $ hg qimport http://localhost:$HGPORT/raw-rev/0/// |
170747a3e139
mq: strip all leading slashes from url when importing
Idan Kamara <idankk86@gmail.com>
parents:
14395
diff
changeset
|
262 adding 0 to series file |
16027
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
263 |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
264 check qimport phase: |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
265 |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
266 $ hg -q qpush |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
267 now at: 0 |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
268 $ hg phase qparent |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
269 1: draft |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
270 $ hg qimport -r qparent |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
271 $ hg phase qbase |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
272 1: draft |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
273 $ hg qfinish qbase |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
274 $ echo '[mq]' >> $HGRCPATH |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
275 $ echo 'secret=true' >> $HGRCPATH |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
276 $ hg qimport -r qparent |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
277 $ hg phase qbase |
29ea059be33c
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15934
diff
changeset
|
278 1: secret |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16359
diff
changeset
|
279 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16359
diff
changeset
|
280 $ cd .. |
17565
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17492
diff
changeset
|
281 |
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17492
diff
changeset
|
282 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |