Mercurial > hg
annotate tests/test-mq-qclone-http.t @ 25997:d4e1e947444b stable
convert: fix git copy file content conversions
There was a bug in the git convert code where if you copied a file and modified
the copy source in the same commit, and if the copy dest was alphabetically
earlier than the copy source, the converted version would use the copy dest
contents for both the source and the target.
The root of the bug is that the git diff-tree output is formatted like so:
:<mode> <mode> <oldhash> <newhash> <state> <src> <dest>
:100644 100644 c1ab79a15... 3dfc779ab... C069 oldname newname
:100644 100644 c1ab79a15... 03e2188a6... M oldname
The old code would always take the 'oldname' field as the name of the file being
processed, then it would try to do an extra convert for the newname. This works
for renames because it does a delete for the oldname and a create for the
newname.
For copies though, it ends up associating the copied content (3dfc779ab above)
with the oldname. It only happened when the dest was alphabetically before
because that meant the copy got processed before the modification.
The fix is the treat copy lines as affecting only the newname, and not marking
the oldname as processed.
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 06 Aug 2015 17:21:46 -0700 |
parents | 8c14f87bd0ae |
children | eb586ed5d8ce |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
17565
diff
changeset
|
1 #require killdaemons |
6205
b193a6e59131
mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
2 |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16017
diff
changeset
|
3 hide outer repo |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16017
diff
changeset
|
4 $ hg init |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16017
diff
changeset
|
5 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
6 $ echo "[extensions]" >> $HGRCPATH |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
7 $ echo "mq=" >> $HGRCPATH |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
8 $ mkdir webdir |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
9 $ cd webdir |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
10 $ hg init a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
11 $ hg --cwd a qinit -c |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
12 $ echo a > a/a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
13 $ hg --cwd a ci -A -m a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
14 adding a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
15 $ echo b > a/b |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
16 $ hg --cwd a addremove |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
17 adding b |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
18 $ hg --cwd a qnew -f b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
19 $ hg --cwd a qcommit -m b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
20 $ hg --cwd a log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
21 [mq]: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
22 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
23 $ 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
|
24 b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
25 $ root=`pwd` |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
26 $ cd .. |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
27 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
28 test with recursive collection |
6205
b193a6e59131
mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
29 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
30 $ cat > collections.conf <<EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
31 > [paths] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
32 > /=$root/** |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
33 > EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
34 $ 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
|
35 > -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
|
36 $ cat hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
37 $ get-with-headers.py localhost:$HGPORT '?style=raw' |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
38 200 Script output follows |
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 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
41 /a/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
42 /a/.hg/patches/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
43 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
44 $ hg qclone http://localhost:$HGPORT/a b |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
45 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
46 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
47 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
48 adding file changes |
16017 | 49 added 2 changesets with 2 changes to 2 files |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
50 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
51 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
52 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
53 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
54 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
|
55 updating to branch default |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
56 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
|
57 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
|
58 $ hg --cwd b log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
59 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
60 $ hg --cwd b qpush -a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
61 applying b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
62 now at: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
63 $ hg --cwd b log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
64 imported patch b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
65 a |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
66 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
67 test with normal collection |
6205
b193a6e59131
mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
68 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
69 $ cat > collections1.conf <<EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
70 > [paths] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
71 > /=$root/* |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
72 > EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
73 $ 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
|
74 > -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
|
75 $ cat hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
76 $ get-with-headers.py localhost:$HGPORT1 '?style=raw' |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
77 200 Script output follows |
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 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
80 /a/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
81 /a/.hg/patches/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
82 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
83 $ hg qclone http://localhost:$HGPORT1/a c |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
84 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
85 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
86 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
87 adding file changes |
16017 | 88 added 2 changesets with 2 changes to 2 files |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
89 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
90 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
91 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
92 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
93 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
|
94 updating to branch default |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
95 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
|
96 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
|
97 $ hg --cwd c log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
98 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
99 $ hg --cwd c qpush -a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
100 applying b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
101 now at: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
102 $ hg --cwd c log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
103 imported patch b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
104 a |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
105 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
106 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
|
107 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
108 $ cat > collections2.conf <<EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
109 > [collections] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
110 > $root=$root |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
111 > EOF |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
112 $ 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
|
113 > -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
|
114 $ cat hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
115 $ get-with-headers.py localhost:$HGPORT2 '?style=raw' |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
116 200 Script output follows |
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 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
119 /a/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
120 /a/.hg/patches/ |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
121 |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
122 $ hg qclone http://localhost:$HGPORT2/a d |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
123 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
124 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
125 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
126 adding file changes |
16017 | 127 added 2 changesets with 2 changes to 2 files |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
128 requesting all changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
129 adding changesets |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
130 adding manifests |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
131 adding file changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
132 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
|
133 updating to branch default |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
134 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
|
135 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
|
136 $ hg --cwd d log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
137 a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
138 $ hg --cwd d qpush -a |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
139 applying b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
140 now at: b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
141 $ hg --cwd d log --template "{desc}\n" |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
142 imported patch b.patch |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
143 a |
7525
6a49fa7674c1
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7524
diff
changeset
|
144 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
145 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
|
146 |
12463
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
147 $ hg --cwd d outgoing --mq |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12463
diff
changeset
|
148 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
|
149 searching for changes |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
150 no changes found |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
151 [1] |
9f551ca3bb44
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com>
parents:
10442
diff
changeset
|
152 $ 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
|
153 0 b.patch |
17565
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17017
diff
changeset
|
154 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
155 $ killdaemons.py |
17565
f62ed3d90377
tests: enable even more Windows server tests
Patrick Mezard <patrick@mezard.eu>
parents:
17017
diff
changeset
|
156 |