Mercurial > hg
annotate tests/test-mq-qclone-http.t @ 14732:e9ed3506f066 stable
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 23:25:42 +0300 |
parents | d08bb64888bc |
children | c5c9ca3719f9 |
rev | line source |
---|---|
6205
b193a6e59131
mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
1 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
2 $ echo "[extensions]" >> $HGRCPATH |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
3 $ echo "mq=" >> $HGRCPATH |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
4 $ mkdir webdir |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
5 $ cd webdir |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
6 $ hg init a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
7 $ hg --cwd a qinit -c |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
8 $ echo a > a/a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
9 $ hg --cwd a ci -A -m a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
10 adding a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
11 $ echo b > a/b |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
12 $ hg --cwd a addremove |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
13 adding b |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
14 $ hg --cwd a qnew -f b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
15 $ hg --cwd a qcommit -m b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
16 $ hg --cwd a log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
17 [mq]: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
18 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
19 $ hg --cwd a/.hg/patches log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
20 b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
21 $ root=`pwd` |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
22 $ cd .. |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
23 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
24 test with recursive collection |
6205
b193a6e59131
mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
25 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
26 $ cat > collections.conf <<EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
27 > [paths] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
28 > /=$root/** |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
29 > EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
30 $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
31 > -A access-paths.log -E error-paths-1.log |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
32 $ cat hg.pid >> $DAEMON_PIDS |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
33 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
34 200 Script output follows |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
35 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
36 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
37 /a/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
38 /a/.hg/patches/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
39 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
40 $ hg qclone http://localhost:$HGPORT/a b |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
41 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
42 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
43 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
44 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
45 added 2 changesets with 2 changes to 2 files |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
46 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
47 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
48 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
49 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
50 added 1 changesets with 3 changes to 3 files |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
51 updating to branch default |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
52 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
54 $ hg --cwd b log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
55 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
56 $ hg --cwd b qpush -a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
57 applying b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
58 now at: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
59 $ hg --cwd b log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
60 imported patch b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
61 a |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
62 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
63 test with normal collection |
6205
b193a6e59131
mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
64 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
65 $ cat > collections1.conf <<EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
66 > [paths] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
67 > /=$root/* |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
68 > EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
69 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
70 > -A access-paths.log -E error-paths-1.log |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
71 $ cat hg.pid >> $DAEMON_PIDS |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
72 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
73 200 Script output follows |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
74 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
75 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
76 /a/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
77 /a/.hg/patches/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
78 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
79 $ hg qclone http://localhost:$HGPORT1/a c |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
80 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
81 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
82 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
83 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
84 added 2 changesets with 2 changes to 2 files |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
85 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
86 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
87 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
88 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
89 added 1 changesets with 3 changes to 3 files |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
90 updating to branch default |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
91 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
93 $ hg --cwd c log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
94 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
95 $ hg --cwd c qpush -a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
96 applying b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
97 now at: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
98 $ hg --cwd c log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
99 imported patch b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
100 a |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
101 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
102 test with old-style collection |
7524
7fc19b12cb6b
tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6205
diff
changeset
|
103 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
104 $ cat > collections2.conf <<EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
105 > [collections] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
106 > $root=$root |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
107 > EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
108 $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
109 > -A access-paths.log -E error-paths-1.log |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
110 $ cat hg.pid >> $DAEMON_PIDS |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
111 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw' |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
112 200 Script output follows |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
113 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
114 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
115 /a/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
116 /a/.hg/patches/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
117 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
118 $ hg qclone http://localhost:$HGPORT2/a d |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
119 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
120 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
121 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
122 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
123 added 2 changesets with 2 changes to 2 files |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
124 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
125 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
126 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
127 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
128 added 1 changesets with 3 changes to 3 files |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
129 updating to branch default |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
130 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
131 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
132 $ hg --cwd d log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
133 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
134 $ hg --cwd d qpush -a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
135 applying b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
136 now at: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
137 $ hg --cwd d log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
138 imported patch b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
139 a |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
140 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
141 test --mq works and uses correct repository config |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
142 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
143 $ hg --cwd d outgoing --mq |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12463
diff
changeset
|
144 comparing with http://localhost:$HGPORT2/a/.hg/patches |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
145 searching for changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
146 no changes found |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
147 [1] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
148 $ hg --cwd d log --mq --template '{rev} {desc|firstline}\n' |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
149 0 b.patch |