##// END OF EJS Templates
test-mq-pull-from-bundle: don't print the contents of $HGRCPATH
Alexis S. L. Carvalho -
r6159:bc784304 default
parent child Browse files
Show More
@@ -1,86 +1,83 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 cat <<EOF >> $HGRCPATH
3 cat <<EOF >> $HGRCPATH
4 [extensions]
4 [extensions]
5 mq=
5 mq=
6 [defaults]
6 [defaults]
7 log = --template "{rev}: {desc}\\n"
7 log = --template "{rev}: {desc}\\n"
8 heads = --template "{rev}: {desc}\\n"
8 heads = --template "{rev}: {desc}\\n"
9 incoming = --template "{rev}: {desc}\\n"
9 incoming = --template "{rev}: {desc}\\n"
10 EOF
10 EOF
11
11
12 echo "====== .hgrc"
13 cat $HGRCPATH
14
15 echo "====== Setup main"
12 echo "====== Setup main"
16 hg init base
13 hg init base
17 cd base
14 cd base
18 echo "One" > one
15 echo "One" > one
19 hg add
16 hg add
20 hg ci -m "main: one added."
17 hg ci -m "main: one added."
21 echo "++" >> one
18 echo "++" >> one
22 hg ci -m "main: one updated."
19 hg ci -m "main: one updated."
23
20
24 echo "====== Bundle main"
21 echo "====== Bundle main"
25 hg bundle --base=null ../main.hg
22 hg bundle --base=null ../main.hg
26 cd ..
23 cd ..
27
24
28 echo "====== Incoming to fresh repo"
25 echo "====== Incoming to fresh repo"
29 hg init fresh
26 hg init fresh
30 echo ">> hg -R fresh incoming main.hg"
27 echo ">> hg -R fresh incoming main.hg"
31 hg -R fresh incoming main.hg
28 hg -R fresh incoming main.hg
32 echo ">> hg -R fresh incoming bundle:fresh+main.hg"
29 echo ">> hg -R fresh incoming bundle:fresh+main.hg"
33 hg -R fresh incoming bundle:fresh+main.hg
30 hg -R fresh incoming bundle:fresh+main.hg
34
31
35
32
36 echo "====== Setup queue"
33 echo "====== Setup queue"
37 cd base
34 cd base
38 hg qinit -c
35 hg qinit -c
39 hg qnew -m "patch: two added." two.patch
36 hg qnew -m "patch: two added." two.patch
40 echo two > two
37 echo two > two
41 hg add
38 hg add
42 hg qrefresh
39 hg qrefresh
43 hg qcommit -m "queue: two.patch added."
40 hg qcommit -m "queue: two.patch added."
44 hg qpop -a
41 hg qpop -a
45
42
46 echo "====== Bundle queue"
43 echo "====== Bundle queue"
47 hg -R .hg/patches bundle --base=null ../queue.hgq
44 hg -R .hg/patches bundle --base=null ../queue.hgq
48 cd ..
45 cd ..
49
46
50
47
51 echo "====== Clone base"
48 echo "====== Clone base"
52 hg clone base copy
49 hg clone base copy
53 cd copy
50 cd copy
54 hg qinit -c
51 hg qinit -c
55
52
56 echo "====== Incoming queue bundle"
53 echo "====== Incoming queue bundle"
57 echo ">> hg -R .hg/patches incoming ../queue.hgq"
54 echo ">> hg -R .hg/patches incoming ../queue.hgq"
58 hg -R .hg/patches incoming ../queue.hgq
55 hg -R .hg/patches incoming ../queue.hgq
59
56
60 echo "====== Pull queue bundle"
57 echo "====== Pull queue bundle"
61 echo ">> hg -R .hg/patches pull --update ../queue.hgq"
58 echo ">> hg -R .hg/patches pull --update ../queue.hgq"
62 hg -R .hg/patches pull --update ../queue.hgq
59 hg -R .hg/patches pull --update ../queue.hgq
63 echo ">> hg -R .hg/patches heads"
60 echo ">> hg -R .hg/patches heads"
64 hg -R .hg/patches heads
61 hg -R .hg/patches heads
65 echo ">> hg -R .hg/patches log"
62 echo ">> hg -R .hg/patches log"
66 hg -R .hg/patches log
63 hg -R .hg/patches log
67 echo ">> hg qseries"
64 echo ">> hg qseries"
68 hg qseries
65 hg qseries
69 cd ..
66 cd ..
70
67
71
68
72 echo "====== Clone base again"
69 echo "====== Clone base again"
73 hg clone base copy2
70 hg clone base copy2
74 cd copy2
71 cd copy2
75 hg qinit -c
72 hg qinit -c
76
73
77 echo "====== Unbundle queue bundle"
74 echo "====== Unbundle queue bundle"
78 echo ">> hg -R .hg/patches unbundle --update ../queue.hgq"
75 echo ">> hg -R .hg/patches unbundle --update ../queue.hgq"
79 hg -R .hg/patches unbundle --update ../queue.hgq
76 hg -R .hg/patches unbundle --update ../queue.hgq
80 echo ">> hg -R .hg/patches heads"
77 echo ">> hg -R .hg/patches heads"
81 hg -R .hg/patches heads
78 hg -R .hg/patches heads
82 echo ">> hg -R .hg/patches log"
79 echo ">> hg -R .hg/patches log"
83 hg -R .hg/patches log
80 hg -R .hg/patches log
84 echo ">> hg qseries"
81 echo ">> hg qseries"
85 hg qseries
82 hg qseries
86 cd ..
83 cd ..
@@ -1,70 +1,56 b''
1 ====== .hgrc
2 [ui]
3 slash = True
4 [defaults]
5 backout = -d "0 0"
6 commit = -d "0 0"
7 debugrawcommit = -d "0 0"
8 tag = -d "0 0"
9 [extensions]
10 mq=
11 [defaults]
12 log = --template "{rev}: {desc}\n"
13 heads = --template "{rev}: {desc}\n"
14 incoming = --template "{rev}: {desc}\n"
15 ====== Setup main
1 ====== Setup main
16 adding one
2 adding one
17 ====== Bundle main
3 ====== Bundle main
18 2 changesets found
4 2 changesets found
19 ====== Incoming to fresh repo
5 ====== Incoming to fresh repo
20 >> hg -R fresh incoming main.hg
6 >> hg -R fresh incoming main.hg
21 comparing with main.hg
7 comparing with main.hg
22 0: main: one added.
8 0: main: one added.
23 1: main: one updated.
9 1: main: one updated.
24 >> hg -R fresh incoming bundle:fresh+main.hg
10 >> hg -R fresh incoming bundle:fresh+main.hg
25 comparing with bundle:fresh+main.hg
11 comparing with bundle:fresh+main.hg
26 0: main: one added.
12 0: main: one added.
27 1: main: one updated.
13 1: main: one updated.
28 ====== Setup queue
14 ====== Setup queue
29 adding two
15 adding two
30 Patch queue now empty
16 Patch queue now empty
31 ====== Bundle queue
17 ====== Bundle queue
32 1 changesets found
18 1 changesets found
33 ====== Clone base
19 ====== Clone base
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 ====== Incoming queue bundle
21 ====== Incoming queue bundle
36 >> hg -R .hg/patches incoming ../queue.hgq
22 >> hg -R .hg/patches incoming ../queue.hgq
37 comparing with ../queue.hgq
23 comparing with ../queue.hgq
38 0: queue: two.patch added.
24 0: queue: two.patch added.
39 ====== Pull queue bundle
25 ====== Pull queue bundle
40 >> hg -R .hg/patches pull --update ../queue.hgq
26 >> hg -R .hg/patches pull --update ../queue.hgq
41 pulling from ../queue.hgq
27 pulling from ../queue.hgq
42 requesting all changes
28 requesting all changes
43 adding changesets
29 adding changesets
44 adding manifests
30 adding manifests
45 adding file changes
31 adding file changes
46 added 1 changesets with 3 changes to 3 files
32 added 1 changesets with 3 changes to 3 files
47 merging series
33 merging series
48 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
34 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
49 >> hg -R .hg/patches heads
35 >> hg -R .hg/patches heads
50 0: queue: two.patch added.
36 0: queue: two.patch added.
51 >> hg -R .hg/patches log
37 >> hg -R .hg/patches log
52 0: queue: two.patch added.
38 0: queue: two.patch added.
53 >> hg qseries
39 >> hg qseries
54 two.patch
40 two.patch
55 ====== Clone base again
41 ====== Clone base again
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
57 ====== Unbundle queue bundle
43 ====== Unbundle queue bundle
58 >> hg -R .hg/patches unbundle --update ../queue.hgq
44 >> hg -R .hg/patches unbundle --update ../queue.hgq
59 adding changesets
45 adding changesets
60 adding manifests
46 adding manifests
61 adding file changes
47 adding file changes
62 added 1 changesets with 3 changes to 3 files
48 added 1 changesets with 3 changes to 3 files
63 merging series
49 merging series
64 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
50 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
65 >> hg -R .hg/patches heads
51 >> hg -R .hg/patches heads
66 0: queue: two.patch added.
52 0: queue: two.patch added.
67 >> hg -R .hg/patches log
53 >> hg -R .hg/patches log
68 0: queue: two.patch added.
54 0: queue: two.patch added.
69 >> hg qseries
55 >> hg qseries
70 two.patch
56 two.patch
General Comments 0
You need to be logged in to leave comments. Login now