##// END OF EJS Templates
narrow: update the narrowspecs to new ones after pulling when widening...
Pulkit Goyal -
r39393:2b8adb7c default
parent child Browse files
Show More
@@ -307,6 +307,7 b' def _widen(ui, repo, remote, commoninc, '
307 with ds.parentchange():
307 with ds.parentchange():
308 ds.setparents(p1, p2)
308 ds.setparents(p1, p2)
309
309
310 repo.setnewnarrowpats()
310 actions = {k: [] for k in 'a am f g cd dc r dm dg m e k p pr'.split()}
311 actions = {k: [] for k in 'a am f g cd dc r dm dg m e k p pr'.split()}
311 addgaction = actions['g'].append
312 addgaction = actions['g'].append
312
313
@@ -96,6 +96,7 b' added upstream revisions.'
96 3 local changesets published
96 3 local changesets published
97 $ hg tracked
97 $ hg tracked
98 I path:inside
98 I path:inside
99 I path:wider/f
99
100
100 Pull down the newly added upstream revision.
101 Pull down the newly added upstream revision.
101
102
@@ -105,20 +106,18 b' Pull down the newly added upstream revis'
105 adding changesets
106 adding changesets
106 adding manifests
107 adding manifests
107 adding file changes
108 adding file changes
108 added 5 changesets with 1 changes to 1 files
109 added 5 changesets with 2 changes to 2 files
109 new changesets *:* (glob)
110 new changesets *:* (glob)
110 (run 'hg update' to get a working copy)
111 (run 'hg update' to get a working copy)
111 $ hg update -r 'desc("add wider")'
112 $ hg update -r 'desc("add wider")'
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
113 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
113 $ cat wider/f
114 $ cat wider/f
114 cat: wider/f: $ENOENT$
115 wider
115 [1]
116
116
117 $ hg update -r 'desc("update inside")'
117 $ hg update -r 'desc("update inside")'
118 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
118 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
119 $ cat wider/f
119 $ cat wider/f
120 cat: wider/f: $ENOENT$
120 wider
121 [1]
122 $ cat inside/f
121 $ cat inside/f
123 inside v2
122 inside v2
124
123
@@ -148,35 +147,30 b' widen the narrow spec to include the wid'
148 adding changesets
147 adding changesets
149 adding manifests
148 adding manifests
150 adding file changes
149 adding file changes
151 added 0 changesets with 4 changes to 2 files
150 added 0 changesets with 4 changes to 3 files
152 5 local changesets published
151 5 local changesets published
153 abort: path ends in directory separator: widest/
154 [255]
155 $ hg tracked
152 $ hg tracked
156 I path:inside
153 I path:inside
154 I path:wider/f
155 I path:widest
157 $ hg update 'desc("add widest")'
156 $ hg update 'desc("add widest")'
157 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
158 $ cat widest/f
159 widest
160 $ hg update 'desc("add wider, update widest")'
161 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
162 $ cat wider/f
163 wider
164 $ cat widest/f
165 widest v2
166 $ hg update 'desc("update widest v3")'
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
159 $ cat widest/f
168 $ cat widest/f
160 cat: widest/f: $ENOENT$
169 widest v3
161 [1]
170 $ hg update 'desc("update widest v4")'
162 $ hg update 'desc("add wider, update widest")'
171 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
163 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
164 $ cat wider/f
165 cat: wider/f: $ENOENT$
166 [1]
167 $ cat widest/f
172 $ cat widest/f
168 cat: widest/f: $ENOENT$
173 widest v4
169 [1]
170 $ hg update 'desc("update widest v3")'
171 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
172 $ cat widest/f
173 cat: widest/f: $ENOENT$
174 [1]
175 $ hg update 'desc("update widest v4")'
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
177 $ cat widest/f
178 cat: widest/f: $ENOENT$
179 [1]
180
174
181 $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
175 $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
182 *: update widest v4 (glob)
176 *: update widest v4 (glob)
@@ -260,10 +254,9 b' make narrow clone with every third node.'
260 adding file changes
254 adding file changes
261 added 0 changesets with 1 changes to 5 files
255 added 0 changesets with 1 changes to 5 files
262 11 local changesets published
256 11 local changesets published
263 abort: path ends in directory separator: d1/
264 [255]
265 $ hg tracked
257 $ hg tracked
266 I path:d0
258 I path:d0
259 I path:d1
267 I path:d3
260 I path:d3
268 I path:d6
261 I path:d6
269 I path:d9
262 I path:d9
@@ -286,12 +279,9 b" Verify shouldn't claim the repo is corru"
286 checking changesets
279 checking changesets
287 checking manifests
280 checking manifests
288 checking directory manifests
281 checking directory manifests
289 warning: orphan data file 'meta/d1/00manifest.i'
290 crosschecking files in changesets and manifests
282 crosschecking files in changesets and manifests
291 checking files
283 checking files
292 warning: orphan data file 'data/d1/f.i'
284 5 files, 11 changesets, 5 total revisions
293 4 files, 11 changesets, 4 total revisions
294 2 warnings encountered!
295
285
296 Widening preserves parent of local commit
286 Widening preserves parent of local commit
297
287
@@ -309,8 +299,6 b' Widening preserves parent of local commi'
309 $ hg ci -m local
299 $ hg ci -m local
310 created new head
300 created new head
311 $ hg tracked -q --addinclude d0 --addinclude d9
301 $ hg tracked -q --addinclude d0 --addinclude d9
312 abort: path ends in directory separator: d0/
313 [255]
314
302
315 Widening preserves bookmarks
303 Widening preserves bookmarks
316
304
@@ -323,8 +311,6 b' Widening preserves bookmarks'
323 $ hg bookmarks
311 $ hg bookmarks
324 * bookmark 11:42aed9c63197
312 * bookmark 11:42aed9c63197
325 $ hg -q tracked --addinclude d2
313 $ hg -q tracked --addinclude d2
326 abort: path ends in directory separator: d2/
327 [255]
328 $ hg bookmarks
314 $ hg bookmarks
329 * bookmark 11:42aed9c63197
315 * bookmark 11:42aed9c63197
330 $ hg log -r bookmark -T '{desc}\n'
316 $ hg log -r bookmark -T '{desc}\n'
@@ -360,8 +346,6 b' Widening that fails can be recovered fro'
360 adding file changes
346 adding file changes
361 added 0 changesets with 1 changes to 2 files
347 added 0 changesets with 1 changes to 2 files
362 11 local changesets published
348 11 local changesets published
363 abort: path ends in directory separator: d1/
364 [255]
365 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
349 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
366 11: local
350 11: local
367 10: add d10/f
351 10: add d10/f
General Comments 0
You need to be logged in to leave comments. Login now