Show More
@@ -599,7 +599,6 def updateconfig(repo, pats, opts, inclu | |||
|
599 | 599 | oldinclude, oldexclude, oldprofiles = parseconfig(repo.ui, raw) |
|
600 | 600 | oldprofiles = set(oldprofiles) |
|
601 | 601 | |
|
602 | try: | |
|
603 | 602 |
|
|
604 | 603 |
|
|
605 | 604 |
|
@@ -612,9 +611,8 def updateconfig(repo, pats, opts, inclu | |||
|
612 | 611 |
|
|
613 | 612 | |
|
614 | 613 |
|
|
615 |
|
|
|
616 | 'ignoring: %s\n') % | |
|
617 | ([pat for pat in pats if pat.startswith('/')])) | |
|
614 | repo.ui.warn(_('warning: paths cannot start with /, ignoring: %s\n') | |
|
615 | % ([pat for pat in pats if pat.startswith('/')])) | |
|
618 | 616 |
|
|
619 | 617 |
|
|
620 | 618 |
|
@@ -627,18 +625,22 def updateconfig(repo, pats, opts, inclu | |||
|
627 | 625 |
|
|
628 | 626 |
|
|
629 | 627 | |
|
630 | writeconfig(repo, newinclude, newexclude, newprofiles) | |
|
631 | ||
|
632 | fcounts = map( | |
|
633 | len, | |
|
634 | refreshwdir(repo, oldstatus, oldmatcher, force=force)) | |
|
635 | ||
|
636 | 628 |
|
|
637 | 629 |
|
|
638 | 630 |
|
|
639 | 631 |
|
|
640 | 632 |
|
|
641 | 633 |
|
|
634 | ||
|
635 | # TODO clean up this writeconfig() + try..except pattern once we can. | |
|
636 | # See comment in importfromfiles() explaining it. | |
|
637 | writeconfig(repo, newinclude, newexclude, newprofiles) | |
|
638 | ||
|
639 | try: | |
|
640 | fcounts = map( | |
|
641 | len, | |
|
642 | refreshwdir(repo, oldstatus, oldmatcher, force=force)) | |
|
643 | ||
|
642 | 644 | printchanges(repo.ui, opts, profilecount, includecount, |
|
643 | 645 | excludecount, *fcounts) |
|
644 | 646 | except Exception: |
General Comments 0
You need to be logged in to leave comments.
Login now