Mercurial > hg
comparison mercurial/cmdutil.py @ 33737:02a745c20121
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 10 Aug 2017 18:55:33 -0400 |
parents | 86aca74a063b 377e8ddaebef |
children | 96f43981c1c4 |
comparison
equal
deleted
inserted
replaced
33736:86aca74a063b | 33737:02a745c20121 |
---|---|
3537 repo.wvfs.unlinkpath(f) | 3537 repo.wvfs.unlinkpath(f) |
3538 except OSError: | 3538 except OSError: |
3539 pass | 3539 pass |
3540 repo.dirstate.remove(f) | 3540 repo.dirstate.remove(f) |
3541 | 3541 |
3542 audit_path = pathutil.pathauditor(repo.root) | 3542 audit_path = pathutil.pathauditor(repo.root, cached=True) |
3543 for f in actions['forget'][0]: | 3543 for f in actions['forget'][0]: |
3544 if interactive: | 3544 if interactive: |
3545 choice = repo.ui.promptchoice( | 3545 choice = repo.ui.promptchoice( |
3546 _("forget added file %s (Yn)?$$ &Yes $$ &No") % f) | 3546 _("forget added file %s (Yn)?$$ &Yes $$ &No") % f) |
3547 if choice == 0: | 3547 if choice == 0: |