Show More
@@ -1,335 +1,343 b'' | |||
|
1 | 1 | Testing the functionality to pull remotenames |
|
2 | 2 | ============================================= |
|
3 | 3 | |
|
4 | 4 | $ cat >> $HGRCPATH << EOF |
|
5 | > [ui] | |
|
6 | > ssh = $PYTHON "$TESTDIR/dummyssh" | |
|
5 | 7 | > [alias] |
|
6 | 8 | > glog = log -G -T '{rev}:{node|short} {desc}' |
|
7 | 9 | > [experimental] |
|
8 | 10 | > remotenames = True |
|
9 | 11 | > [extensions] |
|
10 | 12 | > remotenames = |
|
11 | 13 | > show = |
|
12 | 14 | > EOF |
|
13 | 15 | |
|
14 | 16 | Making a server repo |
|
15 | 17 | -------------------- |
|
16 | 18 | |
|
17 | 19 | $ hg init server |
|
18 | 20 | $ cd server |
|
19 | 21 | $ for ch in a b c d e f g h; do |
|
20 | 22 | > echo "foo" >> $ch |
|
21 | 23 | > hg ci -Aqm "Added "$ch |
|
22 | 24 | > done |
|
23 | 25 | $ hg glog |
|
24 | 26 | @ 7:ec2426147f0e Added h |
|
25 | 27 | | |
|
26 | 28 | o 6:87d6d6676308 Added g |
|
27 | 29 | | |
|
28 | 30 | o 5:825660c69f0c Added f |
|
29 | 31 | | |
|
30 | 32 | o 4:aa98ab95a928 Added e |
|
31 | 33 | | |
|
32 | 34 | o 3:62615734edd5 Added d |
|
33 | 35 | | |
|
34 | 36 | o 2:28ad74487de9 Added c |
|
35 | 37 | | |
|
36 | 38 | o 1:29becc82797a Added b |
|
37 | 39 | | |
|
38 | 40 | o 0:18d04c59bb5d Added a |
|
39 | 41 | |
|
40 | 42 | $ hg bookmark -r 3 foo |
|
41 | 43 | $ hg bookmark -r 6 bar |
|
42 | 44 | $ hg up 4 |
|
43 | 45 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
44 | 46 | $ hg branch wat |
|
45 | 47 | marked working directory as branch wat |
|
46 | 48 | (branches are permanent and global, did you want a bookmark?) |
|
47 | 49 | $ echo foo >> bar |
|
48 | 50 | $ hg ci -Aqm "added bar" |
|
49 | 51 | |
|
50 | 52 | Making a client repo |
|
51 | 53 | -------------------- |
|
52 | 54 | |
|
53 | 55 | $ cd .. |
|
54 | 56 | |
|
55 |
$ hg clone |
|
|
57 | $ hg clone ssh://user@dummy/server client | |
|
58 | requesting all changes | |
|
59 | adding changesets | |
|
60 | adding manifests | |
|
61 | adding file changes | |
|
62 | added 9 changesets with 9 changes to 9 files (+1 heads) | |
|
63 | new changesets 18d04c59bb5d:3e1487808078 | |
|
56 | 64 | updating to branch default |
|
57 | 65 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 66 | |
|
59 | 67 | $ cd client |
|
60 | 68 | $ cat .hg/logexchange/bookmarks |
|
61 | 69 | 0 |
|
62 | 70 | |
|
63 | 71 | 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) |
|
64 | 72 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) |
|
65 | 73 | |
|
66 | 74 | $ cat .hg/logexchange/branches |
|
67 | 75 | 0 |
|
68 | 76 | |
|
69 | 77 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) |
|
70 | 78 | 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) |
|
71 | 79 | |
|
72 | 80 | $ hg show work |
|
73 | 81 | o 3e14 (wat) (default/wat) added bar |
|
74 | 82 | | |
|
75 | 83 | ~ |
|
76 | 84 | @ ec24 (default/default) Added h |
|
77 | 85 | | |
|
78 | 86 | ~ |
|
79 | 87 | |
|
80 | 88 | $ hg update "default/wat" |
|
81 | 89 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
82 | 90 | $ hg identify |
|
83 | 91 | 3e1487808078 (wat) tip |
|
84 | 92 | |
|
85 | 93 | Making a new server |
|
86 | 94 | ------------------- |
|
87 | 95 | |
|
88 | 96 | $ cd .. |
|
89 | 97 | $ hg init server2 |
|
90 | 98 | $ cd server2 |
|
91 | 99 | $ hg pull ../server/ |
|
92 | 100 | pulling from ../server/ |
|
93 | 101 | requesting all changes |
|
94 | 102 | adding changesets |
|
95 | 103 | adding manifests |
|
96 | 104 | adding file changes |
|
97 | 105 | added 9 changesets with 9 changes to 9 files (+1 heads) |
|
98 | 106 | adding remote bookmark bar |
|
99 | 107 | adding remote bookmark foo |
|
100 | 108 | new changesets 18d04c59bb5d:3e1487808078 |
|
101 | 109 | (run 'hg heads' to see heads) |
|
102 | 110 | |
|
103 | 111 | Pulling form the new server |
|
104 | 112 | --------------------------- |
|
105 | 113 | $ cd ../client/ |
|
106 | 114 | $ hg pull ../server2/ |
|
107 | 115 | pulling from ../server2/ |
|
108 | 116 | searching for changes |
|
109 | 117 | no changes found |
|
110 | 118 | $ cat .hg/logexchange/bookmarks |
|
111 | 119 | 0 |
|
112 | 120 | |
|
113 | 121 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc) |
|
114 | 122 | 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc) |
|
115 | 123 | 87d6d66763085b629e6d7ed56778c79827273022\x00$TESTTMP/server2\x00bar (esc) |
|
116 | 124 | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00$TESTTMP/server2\x00foo (esc) |
|
117 | 125 | |
|
118 | 126 | $ cat .hg/logexchange/branches |
|
119 | 127 | 0 |
|
120 | 128 | |
|
121 | 129 | 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc) |
|
122 | 130 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc) |
|
123 | 131 | ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc) |
|
124 | 132 | 3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc) |
|
125 | 133 | |
|
126 | 134 | $ hg log -G |
|
127 | 135 | @ changeset: 8:3e1487808078 |
|
128 | 136 | | branch: wat |
|
129 | 137 | | tag: tip |
|
130 | 138 | | remote branch: $TESTTMP/server2/wat |
|
131 | 139 | | remote branch: default/wat |
|
132 | 140 | | parent: 4:aa98ab95a928 |
|
133 | 141 | | user: test |
|
134 | 142 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
135 | 143 | | summary: added bar |
|
136 | 144 | | |
|
137 | 145 | | o changeset: 7:ec2426147f0e |
|
138 | 146 | | | remote branch: $TESTTMP/server2/default |
|
139 | 147 | | | remote branch: default/default |
|
140 | 148 | | | user: test |
|
141 | 149 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
142 | 150 | | | summary: Added h |
|
143 | 151 | | | |
|
144 | 152 | | o changeset: 6:87d6d6676308 |
|
145 | 153 | | | bookmark: bar |
|
146 | 154 | | | remote bookmark: $TESTTMP/server2/bar |
|
147 | 155 | | | remote bookmark: default/bar |
|
148 | 156 | | | hoisted name: bar |
|
149 | 157 | | | user: test |
|
150 | 158 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
151 | 159 | | | summary: Added g |
|
152 | 160 | | | |
|
153 | 161 | | o changeset: 5:825660c69f0c |
|
154 | 162 | |/ user: test |
|
155 | 163 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
156 | 164 | | summary: Added f |
|
157 | 165 | | |
|
158 | 166 | o changeset: 4:aa98ab95a928 |
|
159 | 167 | | user: test |
|
160 | 168 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
161 | 169 | | summary: Added e |
|
162 | 170 | | |
|
163 | 171 | o changeset: 3:62615734edd5 |
|
164 | 172 | | bookmark: foo |
|
165 | 173 | | remote bookmark: $TESTTMP/server2/foo |
|
166 | 174 | | remote bookmark: default/foo |
|
167 | 175 | | hoisted name: foo |
|
168 | 176 | | user: test |
|
169 | 177 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
170 | 178 | | summary: Added d |
|
171 | 179 | | |
|
172 | 180 | o changeset: 2:28ad74487de9 |
|
173 | 181 | | user: test |
|
174 | 182 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
175 | 183 | | summary: Added c |
|
176 | 184 | | |
|
177 | 185 | o changeset: 1:29becc82797a |
|
178 | 186 | | user: test |
|
179 | 187 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
180 | 188 | | summary: Added b |
|
181 | 189 | | |
|
182 | 190 | o changeset: 0:18d04c59bb5d |
|
183 | 191 | user: test |
|
184 | 192 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
185 | 193 | summary: Added a |
|
186 | 194 | |
|
187 | 195 | Testing the templates provided by remotenames extension |
|
188 | 196 | |
|
189 | 197 | `remotenames` keyword |
|
190 | 198 | |
|
191 | 199 | $ hg log -G -T "{rev}:{node|short} {remotenames}\n" |
|
192 | 200 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
193 | 201 | | |
|
194 | 202 | | o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
195 | 203 | | | |
|
196 | 204 | | o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
197 | 205 | | | |
|
198 | 206 | | o 5:825660c69f0c |
|
199 | 207 | |/ |
|
200 | 208 | o 4:aa98ab95a928 |
|
201 | 209 | | |
|
202 | 210 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
203 | 211 | | |
|
204 | 212 | o 2:28ad74487de9 |
|
205 | 213 | | |
|
206 | 214 | o 1:29becc82797a |
|
207 | 215 | | |
|
208 | 216 | o 0:18d04c59bb5d |
|
209 | 217 | |
|
210 | 218 | `remotebookmarks` and `remotebranches` keywords |
|
211 | 219 | |
|
212 | 220 | $ hg log -G -T "{rev}:{node|short} [{remotebookmarks}] ({remotebranches})" |
|
213 | 221 | @ 8:3e1487808078 [] ($TESTTMP/server2/wat default/wat) |
|
214 | 222 | | |
|
215 | 223 | | o 7:ec2426147f0e [] ($TESTTMP/server2/default default/default) |
|
216 | 224 | | | |
|
217 | 225 | | o 6:87d6d6676308 [$TESTTMP/server2/bar default/bar] () |
|
218 | 226 | | | |
|
219 | 227 | | o 5:825660c69f0c [] () |
|
220 | 228 | |/ |
|
221 | 229 | o 4:aa98ab95a928 [] () |
|
222 | 230 | | |
|
223 | 231 | o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] () |
|
224 | 232 | | |
|
225 | 233 | o 2:28ad74487de9 [] () |
|
226 | 234 | | |
|
227 | 235 | o 1:29becc82797a [] () |
|
228 | 236 | | |
|
229 | 237 | o 0:18d04c59bb5d [] () |
|
230 | 238 | |
|
231 | 239 | The `hoistednames` template keyword |
|
232 | 240 | |
|
233 | 241 | $ hg log -GT "{rev}:{node|short} ({hoistednames})" |
|
234 | 242 | @ 8:3e1487808078 () |
|
235 | 243 | | |
|
236 | 244 | | o 7:ec2426147f0e () |
|
237 | 245 | | | |
|
238 | 246 | | o 6:87d6d6676308 (bar) |
|
239 | 247 | | | |
|
240 | 248 | | o 5:825660c69f0c () |
|
241 | 249 | |/ |
|
242 | 250 | o 4:aa98ab95a928 () |
|
243 | 251 | | |
|
244 | 252 | o 3:62615734edd5 (foo) |
|
245 | 253 | | |
|
246 | 254 | o 2:28ad74487de9 () |
|
247 | 255 | | |
|
248 | 256 | o 1:29becc82797a () |
|
249 | 257 | | |
|
250 | 258 | o 0:18d04c59bb5d () |
|
251 | 259 | |
|
252 | 260 | |
|
253 | 261 | Testing the revsets provided by remotenames extension |
|
254 | 262 | |
|
255 | 263 | `remotenames` revset |
|
256 | 264 | |
|
257 | 265 | $ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n" |
|
258 | 266 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
259 | 267 | : |
|
260 | 268 | : o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
261 | 269 | : | |
|
262 | 270 | : o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
263 | 271 | :/ |
|
264 | 272 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
265 | 273 | | |
|
266 | 274 | ~ |
|
267 | 275 | |
|
268 | 276 | `remotebranches` revset |
|
269 | 277 | |
|
270 | 278 | $ hg log -r "remotebranches()" -GT "{rev}:{node|short} {remotenames}\n" |
|
271 | 279 | @ 8:3e1487808078 $TESTTMP/server2/wat default/wat |
|
272 | 280 | | |
|
273 | 281 | ~ |
|
274 | 282 | o 7:ec2426147f0e $TESTTMP/server2/default default/default |
|
275 | 283 | | |
|
276 | 284 | ~ |
|
277 | 285 | |
|
278 | 286 | `remotebookmarks` revset |
|
279 | 287 | |
|
280 | 288 | $ hg log -r "remotebookmarks()" -GT "{rev}:{node|short} {remotenames}\n" |
|
281 | 289 | o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
|
282 | 290 | : |
|
283 | 291 | o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
|
284 | 292 | | |
|
285 | 293 | ~ |
|
286 | 294 | |
|
287 | 295 | Updating to revision using hoisted name |
|
288 | 296 | |
|
289 | 297 | Deleting local bookmark to make sure we update to hoisted name only |
|
290 | 298 | |
|
291 | 299 | $ hg bookmark -d bar |
|
292 | 300 | |
|
293 | 301 | $ hg up bar |
|
294 | 302 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
295 | 303 | |
|
296 | 304 | $ hg log -r . |
|
297 | 305 | changeset: 6:87d6d6676308 |
|
298 | 306 | remote bookmark: $TESTTMP/server2/bar |
|
299 | 307 | remote bookmark: default/bar |
|
300 | 308 | hoisted name: bar |
|
301 | 309 | user: test |
|
302 | 310 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
303 | 311 | summary: Added g |
|
304 | 312 | |
|
305 | 313 | When both local bookmark and hoisted name exists but on different revs |
|
306 | 314 | |
|
307 | 315 | $ hg up 8 |
|
308 | 316 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
309 | 317 | |
|
310 | 318 | $ hg bookmark foo |
|
311 | 319 | moving bookmark 'foo' forward from 62615734edd5 |
|
312 | 320 | |
|
313 | 321 | Local bookmark should take precedence over hoisted name |
|
314 | 322 | |
|
315 | 323 | $ hg up foo |
|
316 | 324 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
317 | 325 | |
|
318 | 326 | $ hg log -r . |
|
319 | 327 | changeset: 8:3e1487808078 |
|
320 | 328 | branch: wat |
|
321 | 329 | bookmark: foo |
|
322 | 330 | tag: tip |
|
323 | 331 | remote branch: $TESTTMP/server2/wat |
|
324 | 332 | remote branch: default/wat |
|
325 | 333 | parent: 4:aa98ab95a928 |
|
326 | 334 | user: test |
|
327 | 335 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
328 | 336 | summary: added bar |
|
329 | 337 | |
|
330 | 338 | $ hg bookmarks |
|
331 | 339 | $TESTTMP/server2/bar 6:87d6d6676308 |
|
332 | 340 | $TESTTMP/server2/foo 3:62615734edd5 |
|
333 | 341 | default/bar 6:87d6d6676308 |
|
334 | 342 | default/foo 3:62615734edd5 |
|
335 | 343 | * foo 8:3e1487808078 |
General Comments 0
You need to be logged in to leave comments.
Login now