Show More
@@ -1,81 +1,81 b'' | |||
|
1 | 1 | #! /bin/sh |
|
2 | 2 | |
|
3 | 3 | echo "[extensions]" >> $HGRCPATH |
|
4 | 4 | echo "mq=" >> $HGRCPATH |
|
5 | 5 | |
|
6 | 6 | mkdir webdir |
|
7 | 7 | cd webdir |
|
8 | 8 | |
|
9 | 9 | hg init a |
|
10 | 10 | hg --cwd a qinit -c |
|
11 | 11 | echo a > a/a |
|
12 | 12 | hg --cwd a ci -A -m a |
|
13 | 13 | echo b > a/b |
|
14 | 14 | hg --cwd a addremove |
|
15 | 15 | hg --cwd a qnew -f b.patch |
|
16 | 16 | hg --cwd a qcommit -m b.patch |
|
17 | 17 | |
|
18 | 18 | hg --cwd a log --template "{desc}\n" |
|
19 | 19 | hg --cwd a/.hg/patches log --template "{desc}\n" |
|
20 | 20 | |
|
21 | 21 | root=`pwd` |
|
22 | 22 | |
|
23 | 23 | cd .. |
|
24 | 24 | |
|
25 | 25 | echo % test with recursive collection |
|
26 | 26 | |
|
27 | 27 | cat > collections.conf <<EOF |
|
28 | 28 | [paths] |
|
29 | 29 | /=$root/** |
|
30 | 30 | EOF |
|
31 | 31 | |
|
32 | 32 | hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ |
|
33 | 33 | -A access-paths.log -E error-paths-1.log |
|
34 | 34 | cat hg.pid >> $DAEMON_PIDS |
|
35 | 35 | |
|
36 | 36 | "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' |
|
37 | 37 | |
|
38 | 38 | hg qclone http://localhost:$HGPORT/a b |
|
39 | 39 | hg --cwd b log --template "{desc}\n" |
|
40 | 40 | hg --cwd b qpush -a |
|
41 | 41 | hg --cwd b log --template "{desc}\n" |
|
42 | 42 | |
|
43 | 43 | echo % test with normal collection |
|
44 | 44 | |
|
45 | 45 | cat > collections1.conf <<EOF |
|
46 | 46 | [paths] |
|
47 | 47 | /=$root/* |
|
48 | 48 | EOF |
|
49 | 49 | |
|
50 | 50 | hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \ |
|
51 | 51 | -A access-paths.log -E error-paths-1.log |
|
52 | 52 | cat hg.pid >> $DAEMON_PIDS |
|
53 | 53 | |
|
54 | 54 | "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' |
|
55 | 55 | |
|
56 | 56 | hg qclone http://localhost:$HGPORT1/a c |
|
57 | 57 | hg --cwd c log --template "{desc}\n" |
|
58 | 58 | hg --cwd c qpush -a |
|
59 | 59 | hg --cwd c log --template "{desc}\n" |
|
60 | 60 | |
|
61 | 61 | echo % test with old-style collection |
|
62 | 62 | |
|
63 | 63 | cat > collections2.conf <<EOF |
|
64 | 64 | [collections] |
|
65 | 65 | $root=$root |
|
66 | 66 | EOF |
|
67 | 67 | |
|
68 | 68 | hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \ |
|
69 | 69 | -A access-paths.log -E error-paths-1.log |
|
70 | 70 | cat hg.pid >> $DAEMON_PIDS |
|
71 | 71 | |
|
72 | 72 | "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw' |
|
73 | 73 | |
|
74 | 74 | hg qclone http://localhost:$HGPORT2/a d |
|
75 | 75 | hg --cwd d log --template "{desc}\n" |
|
76 | 76 | hg --cwd d qpush -a |
|
77 | 77 | hg --cwd d log --template "{desc}\n" |
|
78 | 78 | |
|
79 | 79 | echo '% test --mq works and uses correct repository config' |
|
80 | hg --cwd d outgoing --mq | |
|
80 | hg --cwd d outgoing --mq | sed "s|$HGPORT2|\$HGPORT2|" | |
|
81 | 81 | hg --cwd d log --mq --template '{rev} {desc|firstline}\n' |
@@ -1,85 +1,85 b'' | |||
|
1 | 1 | adding a |
|
2 | 2 | adding b |
|
3 | 3 | [mq]: b.patch |
|
4 | 4 | a |
|
5 | 5 | b.patch |
|
6 | 6 | % test with recursive collection |
|
7 | 7 | 200 Script output follows |
|
8 | 8 | |
|
9 | 9 | |
|
10 | 10 | /a/ |
|
11 | 11 | /a/.hg/patches/ |
|
12 | 12 | |
|
13 | 13 | requesting all changes |
|
14 | 14 | adding changesets |
|
15 | 15 | adding manifests |
|
16 | 16 | adding file changes |
|
17 | 17 | added 2 changesets with 2 changes to 2 files |
|
18 | 18 | requesting all changes |
|
19 | 19 | adding changesets |
|
20 | 20 | adding manifests |
|
21 | 21 | adding file changes |
|
22 | 22 | added 1 changesets with 3 changes to 3 files |
|
23 | 23 | updating to branch default |
|
24 | 24 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
26 | 26 | a |
|
27 | 27 | applying b.patch |
|
28 | 28 | now at: b.patch |
|
29 | 29 | imported patch b.patch |
|
30 | 30 | a |
|
31 | 31 | % test with normal collection |
|
32 | 32 | 200 Script output follows |
|
33 | 33 | |
|
34 | 34 | |
|
35 | 35 | /a/ |
|
36 | 36 | /a/.hg/patches/ |
|
37 | 37 | |
|
38 | 38 | requesting all changes |
|
39 | 39 | adding changesets |
|
40 | 40 | adding manifests |
|
41 | 41 | adding file changes |
|
42 | 42 | added 2 changesets with 2 changes to 2 files |
|
43 | 43 | requesting all changes |
|
44 | 44 | adding changesets |
|
45 | 45 | adding manifests |
|
46 | 46 | adding file changes |
|
47 | 47 | added 1 changesets with 3 changes to 3 files |
|
48 | 48 | updating to branch default |
|
49 | 49 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
51 | 51 | a |
|
52 | 52 | applying b.patch |
|
53 | 53 | now at: b.patch |
|
54 | 54 | imported patch b.patch |
|
55 | 55 | a |
|
56 | 56 | % test with old-style collection |
|
57 | 57 | 200 Script output follows |
|
58 | 58 | |
|
59 | 59 | |
|
60 | 60 | /a/ |
|
61 | 61 | /a/.hg/patches/ |
|
62 | 62 | |
|
63 | 63 | requesting all changes |
|
64 | 64 | adding changesets |
|
65 | 65 | adding manifests |
|
66 | 66 | adding file changes |
|
67 | 67 | added 2 changesets with 2 changes to 2 files |
|
68 | 68 | requesting all changes |
|
69 | 69 | adding changesets |
|
70 | 70 | adding manifests |
|
71 | 71 | adding file changes |
|
72 | 72 | added 1 changesets with 3 changes to 3 files |
|
73 | 73 | updating to branch default |
|
74 | 74 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
75 | 75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 | 76 | a |
|
77 | 77 | applying b.patch |
|
78 | 78 | now at: b.patch |
|
79 | 79 | imported patch b.patch |
|
80 | 80 | a |
|
81 | 81 | % test --mq works and uses correct repository config |
|
82 |
comparing with http://localhost:2 |
|
|
82 | comparing with http://localhost:$HGPORT2/a/.hg/patches | |
|
83 | 83 | searching for changes |
|
84 | 84 | no changes found |
|
85 | 85 | 0 b.patch |
General Comments 0
You need to be logged in to leave comments.
Login now