##// END OF EJS Templates
narrow: widden the lock context in `tracking`...
marmoute -
r51079:a6ca61fd default
parent child Browse files
Show More
@@ -579,6 +579,7 b' def trackedcmd(ui, repo, remotepath=None'
579 579 fm.end()
580 580 return 0
581 581
582 with repo.wlock(), repo.lock():
582 583 oldincludes, oldexcludes = repo.narrowpats
583 584
584 585 # filter the user passed additions and deletions into actual additions and
@@ -592,9 +593,9 b' def trackedcmd(ui, repo, remotepath=None'
592 593 narrowing = removedincludes or addedexcludes
593 594
594 595 if update_working_copy:
595 with repo.wlock(), repo.lock(), repo.transaction(
596 b'narrow-wc'
597 ), repo.dirstate.changing_parents(repo):
596 with repo.transaction(b'narrow-wc'), repo.dirstate.changing_parents(
597 repo
598 ):
598 599 narrowspec.updateworkingcopy(repo)
599 600 narrowspec.copytoworkingcopy(repo)
600 601 return 0
@@ -603,7 +604,6 b' def trackedcmd(ui, repo, remotepath=None'
603 604 ui.status(_(b"nothing to widen or narrow\n"))
604 605 return 0
605 606
606 with repo.wlock(), repo.lock():
607 607 cmdutil.bailifchanged(repo)
608 608
609 609 # Find the revisions we have in common with the remote. These will
General Comments 0
You need to be logged in to leave comments. Login now