Show More
@@ -1,174 +1,177 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | # @ (34) head |
|
4 | 4 | # | |
|
5 | 5 | # | o (33) head |
|
6 | 6 | # | | |
|
7 | 7 | # o | (32) expand |
|
8 | 8 | # |\ \ |
|
9 | 9 | # | o \ (31) expand |
|
10 | 10 | # | |\ \ |
|
11 | 11 | # | | o \ (30) expand |
|
12 | 12 | # | | |\ \ |
|
13 | 13 | # | | | o | (29) regular commit |
|
14 | 14 | # | | | | | |
|
15 | 15 | # | | o | | (28) merge zero known |
|
16 | 16 | # | | |\ \ \ |
|
17 | 17 | # o | | | | | (27) collapse |
|
18 | 18 | # |/ / / / / |
|
19 | 19 | # | | o---+ (26) merge one known; far right |
|
20 | 20 | # | | | | | |
|
21 | 21 | # +---o | | (25) merge one known; far left |
|
22 | 22 | # | | | | | |
|
23 | 23 | # | | o | | (24) merge one known; immediate right |
|
24 | 24 | # | | |\| | |
|
25 | 25 | # | | o | | (23) merge one known; immediate left |
|
26 | 26 | # | |/| | | |
|
27 | 27 | # +---o---+ (22) merge two known; one far left, one far right |
|
28 | 28 | # | | / / |
|
29 | 29 | # o | | | (21) expand |
|
30 | 30 | # |\ \ \ \ |
|
31 | 31 | # | o---+-+ (20) merge two known; two far right |
|
32 | 32 | # | / / / |
|
33 | 33 | # o | | | (19) expand |
|
34 | 34 | # |\ \ \ \ |
|
35 | 35 | # +---+---o (18) merge two known; two far left |
|
36 | 36 | # | | | | |
|
37 | 37 | # | o | | (17) expand |
|
38 | 38 | # | |\ \ \ |
|
39 | 39 | # | | o---+ (16) merge two known; one immediate right, one near right |
|
40 | 40 | # | | |/ / |
|
41 | 41 | # o | | | (15) expand |
|
42 | 42 | # |\ \ \ \ |
|
43 | 43 | # | o-----+ (14) merge two known; one immediate right, one far right |
|
44 | 44 | # | |/ / / |
|
45 | 45 | # o | | | (13) expand |
|
46 | 46 | # |\ \ \ \ |
|
47 | 47 | # +---o | | (12) merge two known; one immediate right, one far left |
|
48 | 48 | # | | |/ / |
|
49 | 49 | # | o | | (11) expand |
|
50 | 50 | # | |\ \ \ |
|
51 | 51 | # | | o---+ (10) merge two known; one immediate left, one near right |
|
52 | 52 | # | |/ / / |
|
53 | 53 | # o | | | (9) expand |
|
54 | 54 | # |\ \ \ \ |
|
55 | 55 | # | o-----+ (8) merge two known; one immediate left, one far right |
|
56 | 56 | # |/ / / / |
|
57 | 57 | # o | | | (7) expand |
|
58 | 58 | # |\ \ \ \ |
|
59 | 59 | # +---o | | (6) merge two known; one immediate left, one far left |
|
60 | 60 | # | |/ / / |
|
61 | 61 | # | o | | (5) expand |
|
62 | 62 | # | |\ \ \ |
|
63 | 63 | # | | o | | (4) merge two known; one immediate left, one immediate right |
|
64 | 64 | # | |/|/ / |
|
65 | 65 | # | o / / (3) collapse |
|
66 | 66 | # |/ / / |
|
67 | 67 | # o / / (2) collapse |
|
68 | 68 | # |/ / |
|
69 | 69 | # o / (1) collapse |
|
70 | 70 | # |/ |
|
71 | 71 | # o (0) root |
|
72 | 72 | |
|
73 | 73 | "$TESTDIR/hghave" no-outer-repo || exit 80 |
|
74 | 74 | |
|
75 | 75 | set -e |
|
76 | 76 | |
|
77 | 77 | commit() |
|
78 | 78 | { |
|
79 | 79 | rev=$1 |
|
80 | 80 | msg=$2 |
|
81 | 81 | shift 2 |
|
82 | 82 | if [ "$#" -gt 0 ]; then |
|
83 | 83 | hg debugsetparents "$@" |
|
84 | 84 | fi |
|
85 | 85 | echo $rev > a |
|
86 | 86 | hg commit -Aqd "$rev 0" -m "($rev) $msg" |
|
87 | 87 | } |
|
88 | 88 | |
|
89 | 89 | echo "[extensions]" >> $HGRCPATH |
|
90 | 90 | echo "graphlog=" >> $HGRCPATH |
|
91 | 91 | |
|
92 | 92 | echo % init |
|
93 | 93 | hg init repo |
|
94 | 94 | |
|
95 | 95 | cd repo |
|
96 | 96 | |
|
97 | 97 | echo % empty repo |
|
98 | 98 | hg glog |
|
99 | 99 | |
|
100 | 100 | echo % building tree |
|
101 | 101 | commit 0 "root" |
|
102 | 102 | commit 1 "collapse" 0 |
|
103 | 103 | commit 2 "collapse" 1 |
|
104 | 104 | commit 3 "collapse" 2 |
|
105 | 105 | commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
106 | 106 | commit 5 "expand" 3 4 |
|
107 | 107 | commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
108 | 108 | commit 7 "expand" 2 5 |
|
109 | 109 | commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
110 | 110 | commit 9 "expand" 7 8 |
|
111 | 111 | commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
112 | 112 | commit 11 "expand" 6 10 |
|
113 | 113 | commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
114 | 114 | commit 13 "expand" 9 11 |
|
115 | 115 | commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
116 | 116 | commit 15 "expand" 13 14 |
|
117 | 117 | commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
118 | 118 | commit 17 "expand" 12 16 |
|
119 | 119 | commit 18 "merge two known; two far left" 1 15 |
|
120 | 120 | commit 19 "expand" 15 17 |
|
121 | 121 | commit 20 "merge two known; two far right" 0 18 |
|
122 | 122 | commit 21 "expand" 19 20 |
|
123 | 123 | commit 22 "merge two known; one far left, one far right" 18 21 |
|
124 | 124 | commit 23 "merge one known; immediate left" 1 22 |
|
125 | 125 | commit 24 "merge one known; immediate right" 0 23 |
|
126 | 126 | commit 25 "merge one known; far left" 21 24 |
|
127 | 127 | commit 26 "merge one known; far right" 18 25 |
|
128 | 128 | commit 27 "collapse" 21 |
|
129 | 129 | commit 28 "merge zero known" 1 26 |
|
130 | 130 | commit 29 "regular commit" 0 |
|
131 | 131 | commit 30 "expand" 28 29 |
|
132 | 132 | commit 31 "expand" 21 30 |
|
133 | 133 | commit 32 "expand" 27 31 |
|
134 | 134 | commit 33 "head" 18 |
|
135 | 135 | commit 34 "head" 32 |
|
136 | 136 | |
|
137 | 137 | echo % glog -q |
|
138 | 138 | hg glog -q |
|
139 | 139 | |
|
140 | 140 | echo % glog |
|
141 | 141 | hg glog |
|
142 | 142 | |
|
143 | 143 | echo % file glog |
|
144 | 144 | hg glog a |
|
145 | 145 | |
|
146 | 146 | echo % unused arguments |
|
147 | 147 | hg glog -q foo bar || echo failed |
|
148 | 148 | |
|
149 | 149 | echo % from outer space |
|
150 | 150 | cd .. |
|
151 | 151 | hg glog -l1 repo |
|
152 | 152 | hg glog -l1 repo/a |
|
153 | 153 | hg glog -l1 repo/missing |
|
154 | 154 | |
|
155 | 155 | echo % file log with revs != cset revs |
|
156 | 156 | hg init flog |
|
157 | 157 | cd flog |
|
158 | 158 | echo one >one |
|
159 | 159 | hg add one |
|
160 | 160 | hg commit -mone |
|
161 | 161 | echo two >two |
|
162 | 162 | hg add two |
|
163 | 163 | hg commit -mtwo |
|
164 | 164 | echo more >two |
|
165 | 165 | hg commit -mmore |
|
166 | 166 | hg glog two |
|
167 | 167 | |
|
168 | echo "% file log with explicit style (issue 1896)" | |
|
169 | hg glog --style=default one | |
|
170 | ||
|
168 | 171 | echo % incoming and outgoing |
|
169 | 172 | cd .. |
|
170 | 173 | hg clone -U -r31 repo repo2 |
|
171 | 174 | cd repo2 |
|
172 | 175 | hg incoming --graph ../repo |
|
173 | 176 | cd .. |
|
174 | 177 | hg -R repo outgoing --graph repo2 |
@@ -1,639 +1,645 b'' | |||
|
1 | 1 | % init |
|
2 | 2 | % empty repo |
|
3 | 3 | % building tree |
|
4 | 4 | % glog -q |
|
5 | 5 | @ 34:fea3ac5810e0 |
|
6 | 6 | | |
|
7 | 7 | | o 33:68608f5145f9 |
|
8 | 8 | | | |
|
9 | 9 | o | 32:d06dffa21a31 |
|
10 | 10 | |\ \ |
|
11 | 11 | | o \ 31:621d83e11f67 |
|
12 | 12 | | |\ \ |
|
13 | 13 | | | o \ 30:6e11cd4b648f |
|
14 | 14 | | | |\ \ |
|
15 | 15 | | | | o | 29:cd9bb2be7593 |
|
16 | 16 | | | | | | |
|
17 | 17 | | | o | | 28:44ecd0b9ae99 |
|
18 | 18 | | | |\ \ \ |
|
19 | 19 | o | | | | | 27:886ed638191b |
|
20 | 20 | |/ / / / / |
|
21 | 21 | | | o---+ 26:7f25b6c2f0b9 |
|
22 | 22 | | | | | | |
|
23 | 23 | +---o | | 25:91da8ed57247 |
|
24 | 24 | | | | | | |
|
25 | 25 | | | o | | 24:a9c19a3d96b7 |
|
26 | 26 | | | |\| | |
|
27 | 27 | | | o | | 23:a01cddf0766d |
|
28 | 28 | | |/| | | |
|
29 | 29 | +---o---+ 22:e0d9cccacb5d |
|
30 | 30 | | | / / |
|
31 | 31 | o | | | 21:d42a756af44d |
|
32 | 32 | |\ \ \ \ |
|
33 | 33 | | o---+-+ 20:d30ed6450e32 |
|
34 | 34 | | / / / |
|
35 | 35 | o | | | 19:31ddc2c1573b |
|
36 | 36 | |\ \ \ \ |
|
37 | 37 | +---+---o 18:1aa84d96232a |
|
38 | 38 | | | | | |
|
39 | 39 | | o | | 17:44765d7c06e0 |
|
40 | 40 | | |\ \ \ |
|
41 | 41 | | | o---+ 16:3677d192927d |
|
42 | 42 | | | |/ / |
|
43 | 43 | o | | | 15:1dda3f72782d |
|
44 | 44 | |\ \ \ \ |
|
45 | 45 | | o-----+ 14:8eac370358ef |
|
46 | 46 | | |/ / / |
|
47 | 47 | o | | | 13:22d8966a97e3 |
|
48 | 48 | |\ \ \ \ |
|
49 | 49 | +---o | | 12:86b91144a6e9 |
|
50 | 50 | | | |/ / |
|
51 | 51 | | o | | 11:832d76e6bdf2 |
|
52 | 52 | | |\ \ \ |
|
53 | 53 | | | o---+ 10:74c64d036d72 |
|
54 | 54 | | |/ / / |
|
55 | 55 | o | | | 9:7010c0af0a35 |
|
56 | 56 | |\ \ \ \ |
|
57 | 57 | | o-----+ 8:7a0b11f71937 |
|
58 | 58 | |/ / / / |
|
59 | 59 | o | | | 7:b632bb1b1224 |
|
60 | 60 | |\ \ \ \ |
|
61 | 61 | +---o | | 6:b105a072e251 |
|
62 | 62 | | |/ / / |
|
63 | 63 | | o | | 5:4409d547b708 |
|
64 | 64 | | |\ \ \ |
|
65 | 65 | | | o | | 4:26a8bac39d9f |
|
66 | 66 | | |/|/ / |
|
67 | 67 | | o / / 3:27eef8ed80b4 |
|
68 | 68 | |/ / / |
|
69 | 69 | o / / 2:3d9a33b8d1e1 |
|
70 | 70 | |/ / |
|
71 | 71 | o / 1:6db2ef61d156 |
|
72 | 72 | |/ |
|
73 | 73 | o 0:e6eb3150255d |
|
74 | 74 | |
|
75 | 75 | % glog |
|
76 | 76 | @ changeset: 34:fea3ac5810e0 |
|
77 | 77 | | tag: tip |
|
78 | 78 | | parent: 32:d06dffa21a31 |
|
79 | 79 | | user: test |
|
80 | 80 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
81 | 81 | | summary: (34) head |
|
82 | 82 | | |
|
83 | 83 | | o changeset: 33:68608f5145f9 |
|
84 | 84 | | | parent: 18:1aa84d96232a |
|
85 | 85 | | | user: test |
|
86 | 86 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
87 | 87 | | | summary: (33) head |
|
88 | 88 | | | |
|
89 | 89 | o | changeset: 32:d06dffa21a31 |
|
90 | 90 | |\ \ parent: 27:886ed638191b |
|
91 | 91 | | | | parent: 31:621d83e11f67 |
|
92 | 92 | | | | user: test |
|
93 | 93 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
94 | 94 | | | | summary: (32) expand |
|
95 | 95 | | | | |
|
96 | 96 | | o | changeset: 31:621d83e11f67 |
|
97 | 97 | | |\ \ parent: 21:d42a756af44d |
|
98 | 98 | | | | | parent: 30:6e11cd4b648f |
|
99 | 99 | | | | | user: test |
|
100 | 100 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
101 | 101 | | | | | summary: (31) expand |
|
102 | 102 | | | | | |
|
103 | 103 | | | o | changeset: 30:6e11cd4b648f |
|
104 | 104 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
105 | 105 | | | | | | parent: 29:cd9bb2be7593 |
|
106 | 106 | | | | | | user: test |
|
107 | 107 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
108 | 108 | | | | | | summary: (30) expand |
|
109 | 109 | | | | | | |
|
110 | 110 | | | | o | changeset: 29:cd9bb2be7593 |
|
111 | 111 | | | | | | parent: 0:e6eb3150255d |
|
112 | 112 | | | | | | user: test |
|
113 | 113 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
114 | 114 | | | | | | summary: (29) regular commit |
|
115 | 115 | | | | | | |
|
116 | 116 | | | o | | changeset: 28:44ecd0b9ae99 |
|
117 | 117 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
118 | 118 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
119 | 119 | | | | | | | user: test |
|
120 | 120 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
121 | 121 | | | | | | | summary: (28) merge zero known |
|
122 | 122 | | | | | | | |
|
123 | 123 | o | | | | | changeset: 27:886ed638191b |
|
124 | 124 | |/ / / / / parent: 21:d42a756af44d |
|
125 | 125 | | | | | | user: test |
|
126 | 126 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
127 | 127 | | | | | | summary: (27) collapse |
|
128 | 128 | | | | | | |
|
129 | 129 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
130 | 130 | | | | | | parent: 18:1aa84d96232a |
|
131 | 131 | | | | | | parent: 25:91da8ed57247 |
|
132 | 132 | | | | | | user: test |
|
133 | 133 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
134 | 134 | | | | | | summary: (26) merge one known; far right |
|
135 | 135 | | | | | | |
|
136 | 136 | +---o | | changeset: 25:91da8ed57247 |
|
137 | 137 | | | | | | parent: 21:d42a756af44d |
|
138 | 138 | | | | | | parent: 24:a9c19a3d96b7 |
|
139 | 139 | | | | | | user: test |
|
140 | 140 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
141 | 141 | | | | | | summary: (25) merge one known; far left |
|
142 | 142 | | | | | | |
|
143 | 143 | | | o | | changeset: 24:a9c19a3d96b7 |
|
144 | 144 | | | |\| | parent: 0:e6eb3150255d |
|
145 | 145 | | | | | | parent: 23:a01cddf0766d |
|
146 | 146 | | | | | | user: test |
|
147 | 147 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
148 | 148 | | | | | | summary: (24) merge one known; immediate right |
|
149 | 149 | | | | | | |
|
150 | 150 | | | o | | changeset: 23:a01cddf0766d |
|
151 | 151 | | |/| | | parent: 1:6db2ef61d156 |
|
152 | 152 | | | | | | parent: 22:e0d9cccacb5d |
|
153 | 153 | | | | | | user: test |
|
154 | 154 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
155 | 155 | | | | | | summary: (23) merge one known; immediate left |
|
156 | 156 | | | | | | |
|
157 | 157 | +---o---+ changeset: 22:e0d9cccacb5d |
|
158 | 158 | | | | | parent: 18:1aa84d96232a |
|
159 | 159 | | | / / parent: 21:d42a756af44d |
|
160 | 160 | | | | | user: test |
|
161 | 161 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
162 | 162 | | | | | summary: (22) merge two known; one far left, one far right |
|
163 | 163 | | | | | |
|
164 | 164 | o | | | changeset: 21:d42a756af44d |
|
165 | 165 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
166 | 166 | | | | | | parent: 20:d30ed6450e32 |
|
167 | 167 | | | | | | user: test |
|
168 | 168 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
169 | 169 | | | | | | summary: (21) expand |
|
170 | 170 | | | | | | |
|
171 | 171 | | o---+-+ changeset: 20:d30ed6450e32 |
|
172 | 172 | | | | | parent: 0:e6eb3150255d |
|
173 | 173 | | / / / parent: 18:1aa84d96232a |
|
174 | 174 | | | | | user: test |
|
175 | 175 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
176 | 176 | | | | | summary: (20) merge two known; two far right |
|
177 | 177 | | | | | |
|
178 | 178 | o | | | changeset: 19:31ddc2c1573b |
|
179 | 179 | |\ \ \ \ parent: 15:1dda3f72782d |
|
180 | 180 | | | | | | parent: 17:44765d7c06e0 |
|
181 | 181 | | | | | | user: test |
|
182 | 182 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
183 | 183 | | | | | | summary: (19) expand |
|
184 | 184 | | | | | | |
|
185 | 185 | +---+---o changeset: 18:1aa84d96232a |
|
186 | 186 | | | | | parent: 1:6db2ef61d156 |
|
187 | 187 | | | | | parent: 15:1dda3f72782d |
|
188 | 188 | | | | | user: test |
|
189 | 189 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
190 | 190 | | | | | summary: (18) merge two known; two far left |
|
191 | 191 | | | | | |
|
192 | 192 | | o | | changeset: 17:44765d7c06e0 |
|
193 | 193 | | |\ \ \ parent: 12:86b91144a6e9 |
|
194 | 194 | | | | | | parent: 16:3677d192927d |
|
195 | 195 | | | | | | user: test |
|
196 | 196 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
197 | 197 | | | | | | summary: (17) expand |
|
198 | 198 | | | | | | |
|
199 | 199 | | | o---+ changeset: 16:3677d192927d |
|
200 | 200 | | | | | | parent: 0:e6eb3150255d |
|
201 | 201 | | | |/ / parent: 1:6db2ef61d156 |
|
202 | 202 | | | | | user: test |
|
203 | 203 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
204 | 204 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
205 | 205 | | | | | |
|
206 | 206 | o | | | changeset: 15:1dda3f72782d |
|
207 | 207 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
208 | 208 | | | | | | parent: 14:8eac370358ef |
|
209 | 209 | | | | | | user: test |
|
210 | 210 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
211 | 211 | | | | | | summary: (15) expand |
|
212 | 212 | | | | | | |
|
213 | 213 | | o-----+ changeset: 14:8eac370358ef |
|
214 | 214 | | | | | | parent: 0:e6eb3150255d |
|
215 | 215 | | |/ / / parent: 12:86b91144a6e9 |
|
216 | 216 | | | | | user: test |
|
217 | 217 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
218 | 218 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
219 | 219 | | | | | |
|
220 | 220 | o | | | changeset: 13:22d8966a97e3 |
|
221 | 221 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
222 | 222 | | | | | | parent: 11:832d76e6bdf2 |
|
223 | 223 | | | | | | user: test |
|
224 | 224 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
225 | 225 | | | | | | summary: (13) expand |
|
226 | 226 | | | | | | |
|
227 | 227 | +---o | | changeset: 12:86b91144a6e9 |
|
228 | 228 | | | |/ / parent: 1:6db2ef61d156 |
|
229 | 229 | | | | | parent: 9:7010c0af0a35 |
|
230 | 230 | | | | | user: test |
|
231 | 231 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
232 | 232 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
233 | 233 | | | | | |
|
234 | 234 | | o | | changeset: 11:832d76e6bdf2 |
|
235 | 235 | | |\ \ \ parent: 6:b105a072e251 |
|
236 | 236 | | | | | | parent: 10:74c64d036d72 |
|
237 | 237 | | | | | | user: test |
|
238 | 238 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
239 | 239 | | | | | | summary: (11) expand |
|
240 | 240 | | | | | | |
|
241 | 241 | | | o---+ changeset: 10:74c64d036d72 |
|
242 | 242 | | | | | | parent: 0:e6eb3150255d |
|
243 | 243 | | |/ / / parent: 6:b105a072e251 |
|
244 | 244 | | | | | user: test |
|
245 | 245 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
246 | 246 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
247 | 247 | | | | | |
|
248 | 248 | o | | | changeset: 9:7010c0af0a35 |
|
249 | 249 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
250 | 250 | | | | | | parent: 8:7a0b11f71937 |
|
251 | 251 | | | | | | user: test |
|
252 | 252 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
253 | 253 | | | | | | summary: (9) expand |
|
254 | 254 | | | | | | |
|
255 | 255 | | o-----+ changeset: 8:7a0b11f71937 |
|
256 | 256 | | | | | | parent: 0:e6eb3150255d |
|
257 | 257 | |/ / / / parent: 7:b632bb1b1224 |
|
258 | 258 | | | | | user: test |
|
259 | 259 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
260 | 260 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
261 | 261 | | | | | |
|
262 | 262 | o | | | changeset: 7:b632bb1b1224 |
|
263 | 263 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
264 | 264 | | | | | | parent: 5:4409d547b708 |
|
265 | 265 | | | | | | user: test |
|
266 | 266 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
267 | 267 | | | | | | summary: (7) expand |
|
268 | 268 | | | | | | |
|
269 | 269 | +---o | | changeset: 6:b105a072e251 |
|
270 | 270 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
271 | 271 | | | | | parent: 5:4409d547b708 |
|
272 | 272 | | | | | user: test |
|
273 | 273 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
274 | 274 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
275 | 275 | | | | | |
|
276 | 276 | | o | | changeset: 5:4409d547b708 |
|
277 | 277 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
278 | 278 | | | | | | parent: 4:26a8bac39d9f |
|
279 | 279 | | | | | | user: test |
|
280 | 280 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
281 | 281 | | | | | | summary: (5) expand |
|
282 | 282 | | | | | | |
|
283 | 283 | | | o | | changeset: 4:26a8bac39d9f |
|
284 | 284 | | |/|/ / parent: 1:6db2ef61d156 |
|
285 | 285 | | | | | parent: 3:27eef8ed80b4 |
|
286 | 286 | | | | | user: test |
|
287 | 287 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
288 | 288 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
289 | 289 | | | | | |
|
290 | 290 | | o | | changeset: 3:27eef8ed80b4 |
|
291 | 291 | |/ / / user: test |
|
292 | 292 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
293 | 293 | | | | summary: (3) collapse |
|
294 | 294 | | | | |
|
295 | 295 | o | | changeset: 2:3d9a33b8d1e1 |
|
296 | 296 | |/ / user: test |
|
297 | 297 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
298 | 298 | | | summary: (2) collapse |
|
299 | 299 | | | |
|
300 | 300 | o | changeset: 1:6db2ef61d156 |
|
301 | 301 | |/ user: test |
|
302 | 302 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
303 | 303 | | summary: (1) collapse |
|
304 | 304 | | |
|
305 | 305 | o changeset: 0:e6eb3150255d |
|
306 | 306 | user: test |
|
307 | 307 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
308 | 308 | summary: (0) root |
|
309 | 309 | |
|
310 | 310 | % file glog |
|
311 | 311 | @ changeset: 34:fea3ac5810e0 |
|
312 | 312 | | tag: tip |
|
313 | 313 | | parent: 32:d06dffa21a31 |
|
314 | 314 | | user: test |
|
315 | 315 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
316 | 316 | | summary: (34) head |
|
317 | 317 | | |
|
318 | 318 | | o changeset: 33:68608f5145f9 |
|
319 | 319 | | | parent: 18:1aa84d96232a |
|
320 | 320 | | | user: test |
|
321 | 321 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
322 | 322 | | | summary: (33) head |
|
323 | 323 | | | |
|
324 | 324 | o | changeset: 32:d06dffa21a31 |
|
325 | 325 | |\ \ parent: 27:886ed638191b |
|
326 | 326 | | | | parent: 31:621d83e11f67 |
|
327 | 327 | | | | user: test |
|
328 | 328 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
329 | 329 | | | | summary: (32) expand |
|
330 | 330 | | | | |
|
331 | 331 | | o | changeset: 31:621d83e11f67 |
|
332 | 332 | | | | parent: 21:d42a756af44d |
|
333 | 333 | | | | parent: 30:6e11cd4b648f |
|
334 | 334 | | | | user: test |
|
335 | 335 | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
336 | 336 | | | | summary: (31) expand |
|
337 | 337 | | | | |
|
338 | 338 | | o | changeset: 30:6e11cd4b648f |
|
339 | 339 | | |\ \ parent: 28:44ecd0b9ae99 |
|
340 | 340 | | | | | parent: 29:cd9bb2be7593 |
|
341 | 341 | | | | | user: test |
|
342 | 342 | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
343 | 343 | | | | | summary: (30) expand |
|
344 | 344 | | | | | |
|
345 | 345 | | | o | changeset: 29:cd9bb2be7593 |
|
346 | 346 | | | | | parent: 0:e6eb3150255d |
|
347 | 347 | | | | | user: test |
|
348 | 348 | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
349 | 349 | | | | | summary: (29) regular commit |
|
350 | 350 | | | | | |
|
351 | 351 | | o | | changeset: 28:44ecd0b9ae99 |
|
352 | 352 | | | | | parent: 1:6db2ef61d156 |
|
353 | 353 | | | | | parent: 26:7f25b6c2f0b9 |
|
354 | 354 | | | | | user: test |
|
355 | 355 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
356 | 356 | | | | | summary: (28) merge zero known |
|
357 | 357 | | | | | |
|
358 | 358 | o | | | changeset: 27:886ed638191b |
|
359 | 359 | | | | | parent: 21:d42a756af44d |
|
360 | 360 | | | | | user: test |
|
361 | 361 | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
362 | 362 | | | | | summary: (27) collapse |
|
363 | 363 | | | | | |
|
364 | 364 | | o | | changeset: 26:7f25b6c2f0b9 |
|
365 | 365 | | | | | parent: 18:1aa84d96232a |
|
366 | 366 | | | | | parent: 25:91da8ed57247 |
|
367 | 367 | | | | | user: test |
|
368 | 368 | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
369 | 369 | | | | | summary: (26) merge one known; far right |
|
370 | 370 | | | | | |
|
371 | 371 | | o | | changeset: 25:91da8ed57247 |
|
372 | 372 | | | | | parent: 21:d42a756af44d |
|
373 | 373 | | | | | parent: 24:a9c19a3d96b7 |
|
374 | 374 | | | | | user: test |
|
375 | 375 | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
376 | 376 | | | | | summary: (25) merge one known; far left |
|
377 | 377 | | | | | |
|
378 | 378 | | o | | changeset: 24:a9c19a3d96b7 |
|
379 | 379 | | | | | parent: 0:e6eb3150255d |
|
380 | 380 | | | | | parent: 23:a01cddf0766d |
|
381 | 381 | | | | | user: test |
|
382 | 382 | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
383 | 383 | | | | | summary: (24) merge one known; immediate right |
|
384 | 384 | | | | | |
|
385 | 385 | | o | | changeset: 23:a01cddf0766d |
|
386 | 386 | | | | | parent: 1:6db2ef61d156 |
|
387 | 387 | | | | | parent: 22:e0d9cccacb5d |
|
388 | 388 | | | | | user: test |
|
389 | 389 | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
390 | 390 | | | | | summary: (23) merge one known; immediate left |
|
391 | 391 | | | | | |
|
392 | 392 | | o | | changeset: 22:e0d9cccacb5d |
|
393 | 393 | |/ / / parent: 18:1aa84d96232a |
|
394 | 394 | | | | parent: 21:d42a756af44d |
|
395 | 395 | | | | user: test |
|
396 | 396 | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
397 | 397 | | | | summary: (22) merge two known; one far left, one far right |
|
398 | 398 | | | | |
|
399 | 399 | o | | changeset: 21:d42a756af44d |
|
400 | 400 | |\ \ \ parent: 19:31ddc2c1573b |
|
401 | 401 | | | | | parent: 20:d30ed6450e32 |
|
402 | 402 | | | | | user: test |
|
403 | 403 | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
404 | 404 | | | | | summary: (21) expand |
|
405 | 405 | | | | | |
|
406 | 406 | | o---+ changeset: 20:d30ed6450e32 |
|
407 | 407 | | | | parent: 0:e6eb3150255d |
|
408 | 408 | | / / parent: 18:1aa84d96232a |
|
409 | 409 | | | | user: test |
|
410 | 410 | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
411 | 411 | | | | summary: (20) merge two known; two far right |
|
412 | 412 | | | | |
|
413 | 413 | o | | changeset: 19:31ddc2c1573b |
|
414 | 414 | |\ \ \ parent: 15:1dda3f72782d |
|
415 | 415 | | | | | parent: 17:44765d7c06e0 |
|
416 | 416 | | | | | user: test |
|
417 | 417 | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
418 | 418 | | | | | summary: (19) expand |
|
419 | 419 | | | | | |
|
420 | 420 | +-----o changeset: 18:1aa84d96232a |
|
421 | 421 | | | | parent: 1:6db2ef61d156 |
|
422 | 422 | | | | parent: 15:1dda3f72782d |
|
423 | 423 | | | | user: test |
|
424 | 424 | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
425 | 425 | | | | summary: (18) merge two known; two far left |
|
426 | 426 | | | | |
|
427 | 427 | | o | changeset: 17:44765d7c06e0 |
|
428 | 428 | | |\ \ parent: 12:86b91144a6e9 |
|
429 | 429 | | | | | parent: 16:3677d192927d |
|
430 | 430 | | | | | user: test |
|
431 | 431 | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
432 | 432 | | | | | summary: (17) expand |
|
433 | 433 | | | | | |
|
434 | 434 | | | o | changeset: 16:3677d192927d |
|
435 | 435 | | | | | parent: 0:e6eb3150255d |
|
436 | 436 | | | | | parent: 1:6db2ef61d156 |
|
437 | 437 | | | | | user: test |
|
438 | 438 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
439 | 439 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
440 | 440 | | | | | |
|
441 | 441 | o | | | changeset: 15:1dda3f72782d |
|
442 | 442 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
443 | 443 | | | | | | parent: 14:8eac370358ef |
|
444 | 444 | | | | | | user: test |
|
445 | 445 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
446 | 446 | | | | | | summary: (15) expand |
|
447 | 447 | | | | | | |
|
448 | 448 | | o | | | changeset: 14:8eac370358ef |
|
449 | 449 | | |/ / / parent: 0:e6eb3150255d |
|
450 | 450 | | | | | parent: 12:86b91144a6e9 |
|
451 | 451 | | | | | user: test |
|
452 | 452 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
453 | 453 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
454 | 454 | | | | | |
|
455 | 455 | o | | | changeset: 13:22d8966a97e3 |
|
456 | 456 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
457 | 457 | | | | | | parent: 11:832d76e6bdf2 |
|
458 | 458 | | | | | | user: test |
|
459 | 459 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
460 | 460 | | | | | | summary: (13) expand |
|
461 | 461 | | | | | | |
|
462 | 462 | +---o | | changeset: 12:86b91144a6e9 |
|
463 | 463 | | | / / parent: 1:6db2ef61d156 |
|
464 | 464 | | | | | parent: 9:7010c0af0a35 |
|
465 | 465 | | | | | user: test |
|
466 | 466 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
467 | 467 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
468 | 468 | | | | | |
|
469 | 469 | | o | | changeset: 11:832d76e6bdf2 |
|
470 | 470 | | | | | parent: 6:b105a072e251 |
|
471 | 471 | | | | | parent: 10:74c64d036d72 |
|
472 | 472 | | | | | user: test |
|
473 | 473 | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
474 | 474 | | | | | summary: (11) expand |
|
475 | 475 | | | | | |
|
476 | 476 | | o | | changeset: 10:74c64d036d72 |
|
477 | 477 | | | | | parent: 0:e6eb3150255d |
|
478 | 478 | | | | | parent: 6:b105a072e251 |
|
479 | 479 | | | | | user: test |
|
480 | 480 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
481 | 481 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
482 | 482 | | | | | |
|
483 | 483 | o | | | changeset: 9:7010c0af0a35 |
|
484 | 484 | | | | | parent: 7:b632bb1b1224 |
|
485 | 485 | | | | | parent: 8:7a0b11f71937 |
|
486 | 486 | | | | | user: test |
|
487 | 487 | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
488 | 488 | | | | | summary: (9) expand |
|
489 | 489 | | | | | |
|
490 | 490 | o | | | changeset: 8:7a0b11f71937 |
|
491 | 491 | | | | | parent: 0:e6eb3150255d |
|
492 | 492 | | | | | parent: 7:b632bb1b1224 |
|
493 | 493 | | | | | user: test |
|
494 | 494 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
495 | 495 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
496 | 496 | | | | | |
|
497 | 497 | o | | | changeset: 7:b632bb1b1224 |
|
498 | 498 | | | | | parent: 2:3d9a33b8d1e1 |
|
499 | 499 | | | | | parent: 5:4409d547b708 |
|
500 | 500 | | | | | user: test |
|
501 | 501 | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
502 | 502 | | | | | summary: (7) expand |
|
503 | 503 | | | | | |
|
504 | 504 | | o | | changeset: 6:b105a072e251 |
|
505 | 505 | |/ / / parent: 2:3d9a33b8d1e1 |
|
506 | 506 | | | | parent: 5:4409d547b708 |
|
507 | 507 | | | | user: test |
|
508 | 508 | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
509 | 509 | | | | summary: (6) merge two known; one immediate left, one far left |
|
510 | 510 | | | | |
|
511 | 511 | o | | changeset: 5:4409d547b708 |
|
512 | 512 | | | | parent: 3:27eef8ed80b4 |
|
513 | 513 | | | | parent: 4:26a8bac39d9f |
|
514 | 514 | | | | user: test |
|
515 | 515 | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
516 | 516 | | | | summary: (5) expand |
|
517 | 517 | | | | |
|
518 | 518 | o | | changeset: 4:26a8bac39d9f |
|
519 | 519 | | | | parent: 1:6db2ef61d156 |
|
520 | 520 | | | | parent: 3:27eef8ed80b4 |
|
521 | 521 | | | | user: test |
|
522 | 522 | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
523 | 523 | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
524 | 524 | | | | |
|
525 | 525 | o | | changeset: 3:27eef8ed80b4 |
|
526 | 526 | | | | user: test |
|
527 | 527 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
528 | 528 | | | | summary: (3) collapse |
|
529 | 529 | | | | |
|
530 | 530 | o | | changeset: 2:3d9a33b8d1e1 |
|
531 | 531 | |/ / user: test |
|
532 | 532 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
533 | 533 | | | summary: (2) collapse |
|
534 | 534 | | | |
|
535 | 535 | o | changeset: 1:6db2ef61d156 |
|
536 | 536 | |/ user: test |
|
537 | 537 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
538 | 538 | | summary: (1) collapse |
|
539 | 539 | | |
|
540 | 540 | o changeset: 0:e6eb3150255d |
|
541 | 541 | user: test |
|
542 | 542 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
543 | 543 | summary: (0) root |
|
544 | 544 | |
|
545 | 545 | % unused arguments |
|
546 | 546 | hg glog: invalid arguments |
|
547 | 547 | hg glog [OPTION]... [FILE] |
|
548 | 548 | |
|
549 | 549 | show revision history alongside an ASCII revision graph |
|
550 | 550 | failed |
|
551 | 551 | % from outer space |
|
552 | 552 | @ changeset: 34:fea3ac5810e0 |
|
553 | 553 | | tag: tip |
|
554 | 554 | | parent: 32:d06dffa21a31 |
|
555 | 555 | | user: test |
|
556 | 556 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
557 | 557 | | summary: (34) head |
|
558 | 558 | | |
|
559 | 559 | @ changeset: 34:fea3ac5810e0 |
|
560 | 560 | | tag: tip |
|
561 | 561 | | parent: 32:d06dffa21a31 |
|
562 | 562 | | user: test |
|
563 | 563 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
564 | 564 | | summary: (34) head |
|
565 | 565 | | |
|
566 | 566 | % file log with revs != cset revs |
|
567 | 567 | @ changeset: 2:12c28321755b |
|
568 | 568 | | tag: tip |
|
569 | 569 | | user: test |
|
570 | 570 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
571 | 571 | | summary: more |
|
572 | 572 | | |
|
573 | 573 | o changeset: 1:5ac72c0599bf |
|
574 | 574 | user: test |
|
575 | 575 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
576 | 576 | summary: two |
|
577 | 577 | |
|
578 | % file log with explicit style (issue 1896) | |
|
579 | o changeset: 0:3d578b4a1f53 | |
|
580 | user: test | |
|
581 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
582 | summary: one | |
|
583 | ||
|
578 | 584 | % incoming and outgoing |
|
579 | 585 | requesting all changes |
|
580 | 586 | adding changesets |
|
581 | 587 | adding manifests |
|
582 | 588 | adding file changes |
|
583 | 589 | added 31 changesets with 31 changes to 1 files |
|
584 | 590 | comparing with ../repo |
|
585 | 591 | searching for changes |
|
586 | 592 | o changeset: 34:fea3ac5810e0 |
|
587 | 593 | | tag: tip |
|
588 | 594 | | parent: 32:d06dffa21a31 |
|
589 | 595 | | user: test |
|
590 | 596 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
591 | 597 | | summary: (34) head |
|
592 | 598 | | |
|
593 | 599 | | o changeset: 33:68608f5145f9 |
|
594 | 600 | | parent: 18:1aa84d96232a |
|
595 | 601 | | user: test |
|
596 | 602 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
597 | 603 | | summary: (33) head |
|
598 | 604 | | |
|
599 | 605 | o changeset: 32:d06dffa21a31 |
|
600 | 606 | | parent: 27:886ed638191b |
|
601 | 607 | | parent: 31:621d83e11f67 |
|
602 | 608 | | user: test |
|
603 | 609 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
604 | 610 | | summary: (32) expand |
|
605 | 611 | | |
|
606 | 612 | o changeset: 27:886ed638191b |
|
607 | 613 | parent: 21:d42a756af44d |
|
608 | 614 | user: test |
|
609 | 615 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
610 | 616 | summary: (27) collapse |
|
611 | 617 | |
|
612 | 618 | comparing with repo2 |
|
613 | 619 | searching for changes |
|
614 | 620 | @ changeset: 34:fea3ac5810e0 |
|
615 | 621 | | tag: tip |
|
616 | 622 | | parent: 32:d06dffa21a31 |
|
617 | 623 | | user: test |
|
618 | 624 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
619 | 625 | | summary: (34) head |
|
620 | 626 | | |
|
621 | 627 | | o changeset: 33:68608f5145f9 |
|
622 | 628 | | parent: 18:1aa84d96232a |
|
623 | 629 | | user: test |
|
624 | 630 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
625 | 631 | | summary: (33) head |
|
626 | 632 | | |
|
627 | 633 | o changeset: 32:d06dffa21a31 |
|
628 | 634 | | parent: 27:886ed638191b |
|
629 | 635 | | parent: 31:621d83e11f67 |
|
630 | 636 | | user: test |
|
631 | 637 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
632 | 638 | | summary: (32) expand |
|
633 | 639 | | |
|
634 | 640 | o changeset: 27:886ed638191b |
|
635 | 641 | parent: 21:d42a756af44d |
|
636 | 642 | user: test |
|
637 | 643 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
638 | 644 | summary: (27) collapse |
|
639 | 645 |
General Comments 0
You need to be logged in to leave comments.
Login now