##// END OF EJS Templates
narrow: move `only_show` handling sooner in `tracked`...
marmoute -
r51078:c74d4ce6 default
parent child Browse files
Show More
@@ -563,20 +563,9 b' def trackedcmd(ui, repo, remotepath=None'
563 or update_working_copy
563 or update_working_copy
564 )
564 )
565
565
566 oldincludes, oldexcludes = repo.narrowpats
567
568 # filter the user passed additions and deletions into actual additions and
569 # deletions of excludes and includes
570 addedincludes -= oldincludes
571 removedincludes &= oldincludes
572 addedexcludes -= oldexcludes
573 removedexcludes &= oldexcludes
574
575 widening = addedincludes or removedexcludes
576 narrowing = removedincludes or addedexcludes
577
578 # Only print the current narrowspec.
566 # Only print the current narrowspec.
579 if only_show:
567 if only_show:
568 oldincludes, oldexcludes = repo.narrowpats
580 ui.pager(b'tracked')
569 ui.pager(b'tracked')
581 fm = ui.formatter(b'narrow', opts)
570 fm = ui.formatter(b'narrow', opts)
582 for i in sorted(oldincludes):
571 for i in sorted(oldincludes):
@@ -590,6 +579,18 b' def trackedcmd(ui, repo, remotepath=None'
590 fm.end()
579 fm.end()
591 return 0
580 return 0
592
581
582 oldincludes, oldexcludes = repo.narrowpats
583
584 # filter the user passed additions and deletions into actual additions and
585 # deletions of excludes and includes
586 addedincludes -= oldincludes
587 removedincludes &= oldincludes
588 addedexcludes -= oldexcludes
589 removedexcludes &= oldexcludes
590
591 widening = addedincludes or removedexcludes
592 narrowing = removedincludes or addedexcludes
593
593 if update_working_copy:
594 if update_working_copy:
594 with repo.wlock(), repo.lock(), repo.transaction(
595 with repo.wlock(), repo.lock(), repo.transaction(
595 b'narrow-wc'
596 b'narrow-wc'
General Comments 0
You need to be logged in to leave comments. Login now