Show More
@@ -20,7 +20,6 b' from mercurial import (' | |||||
20 | exchange, |
|
20 | exchange, | |
21 | extensions, |
|
21 | extensions, | |
22 | hg, |
|
22 | hg, | |
23 | merge, |
|
|||
24 | narrowspec, |
|
23 | narrowspec, | |
25 | node, |
|
24 | node, | |
26 | pycompat, |
|
25 | pycompat, | |
@@ -259,8 +258,6 b' def _narrow(ui, repo, remote, commoninc,' | |||||
259 |
|
258 | |||
260 | def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes, |
|
259 | def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes, | |
261 | newincludes, newexcludes): |
|
260 | newincludes, newexcludes): | |
262 | newmatch = narrowspec.match(repo.root, newincludes, newexcludes) |
|
|||
263 |
|
||||
264 | # for now we assume that if a server has ellipses enabled, we will be |
|
261 | # for now we assume that if a server has ellipses enabled, we will be | |
265 | # exchanging ellipses nodes. In future we should add ellipses as a client |
|
262 | # exchanging ellipses nodes. In future we should add ellipses as a client | |
266 | # side requirement (maybe) to distinguish a client is shallow or not and |
|
263 | # side requirement (maybe) to distinguish a client is shallow or not and | |
@@ -316,20 +313,10 b' def _widen(ui, repo, remote, commoninc, ' | |||||
316 | bundle2.processbundle(repo, bundle, |
|
313 | bundle2.processbundle(repo, bundle, | |
317 | transactiongetter=tgetter) |
|
314 | transactiongetter=tgetter) | |
318 |
|
315 | |||
319 | repo.setnewnarrowpats() |
|
316 | with repo.transaction('widening'): | |
320 | narrowspec.copytoworkingcopy(repo) |
|
317 | repo.setnewnarrowpats() | |
321 | actions = merge.emptyactions() |
|
318 | narrowspec.updateworkingcopy(repo) | |
322 | addgaction = actions['g'].append |
|
319 | narrowspec.copytoworkingcopy(repo) | |
323 |
|
||||
324 | mf = repo['.'].manifest().matches(newmatch) |
|
|||
325 | for f, fn in mf.iteritems(): |
|
|||
326 | if f not in repo.dirstate: |
|
|||
327 | addgaction((f, (mf.flags(f), False), |
|
|||
328 | "add from widened narrow clone")) |
|
|||
329 |
|
||||
330 | merge.applyupdates(repo, actions, wctx=repo[None], |
|
|||
331 | mctx=repo['.'], overwrite=False) |
|
|||
332 | merge.recordupdates(repo, actions, branchmerge=False) |
|
|||
333 |
|
320 | |||
334 | # TODO(rdamazio): Make new matcher format and update description |
|
321 | # TODO(rdamazio): Make new matcher format and update description | |
335 | @command('tracked', |
|
322 | @command('tracked', |
@@ -128,7 +128,7 b' added upstream revisions.' | |||||
128 | added 0 changesets with 1 changes to 1 files |
|
128 | added 0 changesets with 1 changes to 1 files | |
129 | bundle2-input-part: total payload size * (glob) |
|
129 | bundle2-input-part: total payload size * (glob) | |
130 | bundle2-input-bundle: 0 parts total |
|
130 | bundle2-input-bundle: 0 parts total | |
131 |
widest/f: |
|
131 | widest/f: narrowspec updated -> g | |
132 | getting widest/f |
|
132 | getting widest/f | |
133 | $ hg tracked |
|
133 | $ hg tracked | |
134 | I path:inside |
|
134 | I path:inside |
General Comments 0
You need to be logged in to leave comments.
Login now