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