##// END OF EJS Templates
narrow: update narrow spec within a dirstate.parentchange context...
marmoute -
r48404:090fc6a9 default
parent child Browse files
Show More
@@ -321,8 +321,9 b' def _narrow('
321 repo.store.markremoved(f)
321 repo.store.markremoved(f)
322
322
323 ui.status(_(b'deleting unwanted files from working copy\n'))
323 ui.status(_(b'deleting unwanted files from working copy\n'))
324 narrowspec.updateworkingcopy(repo, assumeclean=True)
324 with repo.dirstate.parentchange():
325 narrowspec.copytoworkingcopy(repo)
325 narrowspec.updateworkingcopy(repo, assumeclean=True)
326 narrowspec.copytoworkingcopy(repo)
326
327
327 repo.destroyed()
328 repo.destroyed()
328
329
@@ -422,7 +423,7 b' def _widen('
422 with ds.parentchange():
423 with ds.parentchange():
423 ds.setparents(p1, p2)
424 ds.setparents(p1, p2)
424
425
425 with repo.transaction(b'widening'):
426 with repo.transaction(b'widening'), repo.dirstate.parentchange():
426 repo.setnewnarrowpats()
427 repo.setnewnarrowpats()
427 narrowspec.updateworkingcopy(repo)
428 narrowspec.updateworkingcopy(repo)
428 narrowspec.copytoworkingcopy(repo)
429 narrowspec.copytoworkingcopy(repo)
@@ -589,7 +590,9 b' def trackedcmd(ui, repo, remotepath=None'
589 return 0
590 return 0
590
591
591 if update_working_copy:
592 if update_working_copy:
592 with repo.wlock(), repo.lock(), repo.transaction(b'narrow-wc'):
593 with repo.wlock(), repo.lock(), repo.transaction(
594 b'narrow-wc'
595 ), repo.dirstate.parentchange():
593 narrowspec.updateworkingcopy(repo)
596 narrowspec.updateworkingcopy(repo)
594 narrowspec.copytoworkingcopy(repo)
597 narrowspec.copytoworkingcopy(repo)
595 return 0
598 return 0
General Comments 0
You need to be logged in to leave comments. Login now