Show More
@@ -1,175 +1,175 | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | # @ (34) head |
|
3 | # @ (34) head | |
4 | # | |
|
4 | # | | |
5 | # | o (33) head |
|
5 | # | o (33) head | |
6 | # | | |
|
6 | # | | | |
7 | # o | (32) expand |
|
7 | # o | (32) expand | |
8 | # |\ \ |
|
8 | # |\ \ | |
9 | # | o \ (31) expand |
|
9 | # | o \ (31) expand | |
10 | # | |\ \ |
|
10 | # | |\ \ | |
11 | # | | o \ (30) expand |
|
11 | # | | o \ (30) expand | |
12 | # | | |\ \ |
|
12 | # | | |\ \ | |
13 | # | | | o | (29) regular commit |
|
13 | # | | | o | (29) regular commit | |
14 | # | | | | | |
|
14 | # | | | | | | |
15 | # | | o | | (28) merge zero known |
|
15 | # | | o | | (28) merge zero known | |
16 | # | | |\ \ \ |
|
16 | # | | |\ \ \ | |
17 | # o | | | | | (27) collapse |
|
17 | # o | | | | | (27) collapse | |
18 | # |/ / / / / |
|
18 | # |/ / / / / | |
19 | # | | o---+ (26) merge one known; far right |
|
19 | # | | o---+ (26) merge one known; far right | |
20 | # | | | | | |
|
20 | # | | | | | | |
21 | # +---o | | (25) merge one known; far left |
|
21 | # +---o | | (25) merge one known; far left | |
22 | # | | | | | |
|
22 | # | | | | | | |
23 | # | | o | | (24) merge one known; immediate right |
|
23 | # | | o | | (24) merge one known; immediate right | |
24 | # | | |\| | |
|
24 | # | | |\| | | |
25 | # | | o | | (23) merge one known; immediate left |
|
25 | # | | o | | (23) merge one known; immediate left | |
26 | # | |/| | | |
|
26 | # | |/| | | | |
27 | # +---o---+ (22) merge two known; one far left, one far right |
|
27 | # +---o---+ (22) merge two known; one far left, one far right | |
28 | # | | / / |
|
28 | # | | / / | |
29 | # o | | | (21) expand |
|
29 | # o | | | (21) expand | |
30 | # |\ \ \ \ |
|
30 | # |\ \ \ \ | |
31 | # | o---+-+ (20) merge two known; two far right |
|
31 | # | o---+-+ (20) merge two known; two far right | |
32 | # | / / / |
|
32 | # | / / / | |
33 | # o | | | (19) expand |
|
33 | # o | | | (19) expand | |
34 | # |\ \ \ \ |
|
34 | # |\ \ \ \ | |
35 | # +---+---o (18) merge two known; two far left |
|
35 | # +---+---o (18) merge two known; two far left | |
36 | # | | | | |
|
36 | # | | | | | |
37 | # | o | | (17) expand |
|
37 | # | o | | (17) expand | |
38 | # | |\ \ \ |
|
38 | # | |\ \ \ | |
39 | # | | o---+ (16) merge two known; one immediate right, one near right |
|
39 | # | | o---+ (16) merge two known; one immediate right, one near right | |
40 | # | | |/ / |
|
40 | # | | |/ / | |
41 | # o | | | (15) expand |
|
41 | # o | | | (15) expand | |
42 | # |\ \ \ \ |
|
42 | # |\ \ \ \ | |
43 | # | o-----+ (14) merge two known; one immediate right, one far right |
|
43 | # | o-----+ (14) merge two known; one immediate right, one far right | |
44 | # | |/ / / |
|
44 | # | |/ / / | |
45 | # o | | | (13) expand |
|
45 | # o | | | (13) expand | |
46 | # |\ \ \ \ |
|
46 | # |\ \ \ \ | |
47 | # +---o | | (12) merge two known; one immediate right, one far left |
|
47 | # +---o | | (12) merge two known; one immediate right, one far left | |
48 | # | | |/ / |
|
48 | # | | |/ / | |
49 | # | o | | (11) expand |
|
49 | # | o | | (11) expand | |
50 | # | |\ \ \ |
|
50 | # | |\ \ \ | |
51 | # | | o---+ (10) merge two known; one immediate left, one near right |
|
51 | # | | o---+ (10) merge two known; one immediate left, one near right | |
52 | # | |/ / / |
|
52 | # | |/ / / | |
53 | # o | | | (9) expand |
|
53 | # o | | | (9) expand | |
54 | # |\ \ \ \ |
|
54 | # |\ \ \ \ | |
55 | # | o-----+ (8) merge two known; one immediate left, one far right |
|
55 | # | o-----+ (8) merge two known; one immediate left, one far right | |
56 | # |/ / / / |
|
56 | # |/ / / / | |
57 | # o | | | (7) expand |
|
57 | # o | | | (7) expand | |
58 | # |\ \ \ \ |
|
58 | # |\ \ \ \ | |
59 | # +---o | | (6) merge two known; one immediate left, one far left |
|
59 | # +---o | | (6) merge two known; one immediate left, one far left | |
60 | # | |/ / / |
|
60 | # | |/ / / | |
61 | # | o | | (5) expand |
|
61 | # | o | | (5) expand | |
62 | # | |\ \ \ |
|
62 | # | |\ \ \ | |
63 | # | | o | | (4) merge two known; one immediate left, one immediate right |
|
63 | # | | o | | (4) merge two known; one immediate left, one immediate right | |
64 | # | |/|/ / |
|
64 | # | |/|/ / | |
65 | # | o / / (3) collapse |
|
65 | # | o / / (3) collapse | |
66 | # |/ / / |
|
66 | # |/ / / | |
67 | # o / / (2) collapse |
|
67 | # o / / (2) collapse | |
68 | # |/ / |
|
68 | # |/ / | |
69 | # o / (1) collapse |
|
69 | # o / (1) collapse | |
70 | # |/ |
|
70 | # |/ | |
71 | # o (0) root |
|
71 | # o (0) root | |
72 |
|
72 | |||
73 | "$TESTDIR/hghave" no-outer-repo || exit 80 |
|
73 | "$TESTDIR/hghave" no-outer-repo || exit 80 | |
74 |
|
74 | |||
75 | set -e |
|
75 | set -e | |
76 |
|
76 | |||
77 | commit() |
|
77 | commit() | |
78 | { |
|
78 | { | |
79 | rev=$1 |
|
79 | rev=$1 | |
80 | msg=$2 |
|
80 | msg=$2 | |
81 | shift 2 |
|
81 | shift 2 | |
82 | if [ "$#" -gt 0 ]; then |
|
82 | if [ "$#" -gt 0 ]; then | |
83 | hg debugsetparents "$@" |
|
83 | hg debugsetparents "$@" | |
84 | fi |
|
84 | fi | |
85 | echo $rev > $rev |
|
85 | echo $rev > $rev | |
86 | hg add $rev |
|
86 | hg add $rev | |
87 | hg rawcommit -q -d "$rev 0" -m "($rev) $msg" $rev |
|
87 | hg rawcommit -q -d "$rev 0" -m "($rev) $msg" $rev | |
88 | } |
|
88 | } | |
89 |
|
89 | |||
90 | echo "[extensions]" >> $HGRCPATH |
|
90 | echo "[extensions]" >> $HGRCPATH | |
91 | echo "graphlog=" >> $HGRCPATH |
|
91 | echo "graphlog=" >> $HGRCPATH | |
92 |
|
92 | |||
93 | echo % init |
|
93 | echo % init | |
94 | hg init repo |
|
94 | hg init repo | |
95 |
|
95 | |||
96 | cd repo |
|
96 | cd repo | |
97 |
|
97 | |||
98 | echo % empty repo |
|
98 | echo % empty repo | |
99 | hg glog |
|
99 | hg glog | |
100 |
|
100 | |||
101 | echo % building tree |
|
101 | echo % building tree | |
102 | commit 0 "root" |
|
102 | commit 0 "root" | |
103 | commit 1 "collapse" 0 |
|
103 | commit 1 "collapse" 0 | |
104 | commit 2 "collapse" 1 |
|
104 | commit 2 "collapse" 1 | |
105 | commit 3 "collapse" 2 |
|
105 | commit 3 "collapse" 2 | |
106 | commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
106 | commit 4 "merge two known; one immediate left, one immediate right" 1 3 | |
107 | commit 5 "expand" 3 4 |
|
107 | commit 5 "expand" 3 4 | |
108 | commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
108 | commit 6 "merge two known; one immediate left, one far left" 2 5 | |
109 | commit 7 "expand" 2 5 |
|
109 | commit 7 "expand" 2 5 | |
110 | commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
110 | commit 8 "merge two known; one immediate left, one far right" 0 7 | |
111 | commit 9 "expand" 7 8 |
|
111 | commit 9 "expand" 7 8 | |
112 | commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
112 | commit 10 "merge two known; one immediate left, one near right" 0 6 | |
113 | commit 11 "expand" 6 10 |
|
113 | commit 11 "expand" 6 10 | |
114 | commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
114 | commit 12 "merge two known; one immediate right, one far left" 1 9 | |
115 | commit 13 "expand" 9 11 |
|
115 | commit 13 "expand" 9 11 | |
116 | commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
116 | commit 14 "merge two known; one immediate right, one far right" 0 12 | |
117 | commit 15 "expand" 13 14 |
|
117 | commit 15 "expand" 13 14 | |
118 | commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
118 | commit 16 "merge two known; one immediate right, one near right" 0 1 | |
119 | commit 17 "expand" 12 16 |
|
119 | commit 17 "expand" 12 16 | |
120 | commit 18 "merge two known; two far left" 1 15 |
|
120 | commit 18 "merge two known; two far left" 1 15 | |
121 | commit 19 "expand" 15 17 |
|
121 | commit 19 "expand" 15 17 | |
122 | commit 20 "merge two known; two far right" 0 18 |
|
122 | commit 20 "merge two known; two far right" 0 18 | |
123 | commit 21 "expand" 19 20 |
|
123 | commit 21 "expand" 19 20 | |
124 | commit 22 "merge two known; one far left, one far right" 18 21 |
|
124 | commit 22 "merge two known; one far left, one far right" 18 21 | |
125 | commit 23 "merge one known; immediate left" 1 22 |
|
125 | commit 23 "merge one known; immediate left" 1 22 | |
126 | commit 24 "merge one known; immediate right" 0 23 |
|
126 | commit 24 "merge one known; immediate right" 0 23 | |
127 | commit 25 "merge one known; far left" 21 24 |
|
127 | commit 25 "merge one known; far left" 21 24 | |
128 | commit 26 "merge one known; far right" 18 25 |
|
128 | commit 26 "merge one known; far right" 18 25 | |
129 | commit 27 "collapse" 21 |
|
129 | commit 27 "collapse" 21 | |
130 | commit 28 "merge zero known" 1 26 |
|
130 | commit 28 "merge zero known" 1 26 | |
131 | commit 29 "regular commit" 0 |
|
131 | commit 29 "regular commit" 0 | |
132 | commit 30 "expand" 28 29 |
|
132 | commit 30 "expand" 28 29 | |
133 | commit 31 "expand" 21 30 |
|
133 | commit 31 "expand" 21 30 | |
134 | commit 32 "expand" 27 31 |
|
134 | commit 32 "expand" 27 31 | |
135 | commit 33 "head" 18 |
|
135 | commit 33 "head" 18 | |
136 | commit 34 "head" 32 |
|
136 | commit 34 "head" 32 | |
137 |
|
137 | |||
138 | echo % glog -q |
|
138 | echo % glog -q | |
139 | hg glog -q |
|
139 | hg glog -q | |
140 |
|
140 | |||
141 | echo % glog |
|
141 | echo % glog | |
142 | hg glog |
|
142 | hg glog | |
143 |
|
143 | |||
144 | echo % file glog |
|
144 | echo % file glog | |
145 | hg glog 5 |
|
145 | hg glog 5 | |
146 |
|
146 | |||
147 | echo % unused arguments |
|
147 | echo % unused arguments | |
148 | hg glog -q foo bar || echo failed |
|
148 | hg glog -q foo bar || echo failed | |
149 |
|
149 | |||
150 | echo % from outer space |
|
150 | echo % from outer space | |
151 | cd .. |
|
151 | cd .. | |
152 | hg glog -l1 repo |
|
152 | hg glog -l1 repo | |
153 | hg glog -l1 repo/0 |
|
153 | hg glog -l1 repo/0 | |
154 | hg glog -l1 repo/missing |
|
154 | hg glog -l1 repo/missing | |
155 |
|
155 | |||
156 | echo % file log with revs != cset revs |
|
156 | echo % file log with revs != cset revs | |
157 | hg init flog |
|
157 | hg init flog | |
158 | cd flog |
|
158 | cd flog | |
159 | echo one >one |
|
159 | echo one >one | |
160 | hg add one |
|
160 | hg add one | |
161 | hg commit -mone |
|
161 | hg commit -mone | |
162 | echo two >two |
|
162 | echo two >two | |
163 | hg add two |
|
163 | hg add two | |
164 | hg commit -mtwo |
|
164 | hg commit -mtwo | |
165 | echo more >two |
|
165 | echo more >two | |
166 | hg commit -mmore |
|
166 | hg commit -mmore | |
167 | hg glog two |
|
167 | hg glog two | |
168 |
|
168 | |||
169 | echo % incoming and outgoing |
|
169 | echo % incoming and outgoing | |
170 | cd .. |
|
170 | cd .. | |
171 | hg clone -U -r31 repo repo2 |
|
171 | hg clone -U -r31 repo repo2 | |
172 | cd repo2 |
|
172 | cd repo2 | |
173 |
hg incoming -q --graph |
|
173 | hg incoming -q --graph | |
174 | cd .. |
|
174 | cd .. | |
175 | hg -R repo outgoing --graph repo2 |
|
175 | hg -R repo outgoing --graph repo2 |
General Comments 0
You need to be logged in to leave comments.
Login now