diff options
Diffstat (limited to 'subcmds/abandon.py')
| -rw-r--r-- | subcmds/abandon.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/subcmds/abandon.py b/subcmds/abandon.py index 996c3d2c..f6c0c66c 100644 --- a/subcmds/abandon.py +++ b/subcmds/abandon.py | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | import collections | 15 | import collections |
| 16 | import functools | 16 | import functools |
| 17 | import itertools | 17 | import itertools |
| 18 | import sys | ||
| 19 | 18 | ||
| 20 | from command import Command | 19 | from command import Command |
| 21 | from command import DEFAULT_LOCAL_JOBS | 20 | from command import DEFAULT_LOCAL_JOBS |
| @@ -23,6 +22,10 @@ from error import RepoError | |||
| 23 | from error import RepoExitError | 22 | from error import RepoExitError |
| 24 | from git_command import git | 23 | from git_command import git |
| 25 | from progress import Progress | 24 | from progress import Progress |
| 25 | from repo_logging import RepoLogger | ||
| 26 | |||
| 27 | |||
| 28 | logger = RepoLogger(__file__) | ||
| 26 | 29 | ||
| 27 | 30 | ||
| 28 | class AbandonError(RepoExitError): | 31 | class AbandonError(RepoExitError): |
| @@ -126,18 +129,12 @@ It is equivalent to "git branch -D <branchname>". | |||
| 126 | if err: | 129 | if err: |
| 127 | for br in err.keys(): | 130 | for br in err.keys(): |
| 128 | err_msg = "error: cannot abandon %s" % br | 131 | err_msg = "error: cannot abandon %s" % br |
| 129 | print(err_msg, file=sys.stderr) | 132 | logger.error(err_msg) |
| 130 | for proj in err[br]: | 133 | for proj in err[br]: |
| 131 | print( | 134 | logger.error(" " * len(err_msg) + " | %s", _RelPath(proj)) |
| 132 | " " * len(err_msg) + " | %s" % _RelPath(proj), | ||
| 133 | file=sys.stderr, | ||
| 134 | ) | ||
| 135 | raise AbandonError(aggregate_errors=aggregate_errors) | 135 | raise AbandonError(aggregate_errors=aggregate_errors) |
| 136 | elif not success: | 136 | elif not success: |
| 137 | print( | 137 | logger.error("error: no project has local branch(es) : %s", nb) |
| 138 | "error: no project has local branch(es) : %s" % nb, | ||
| 139 | file=sys.stderr, | ||
| 140 | ) | ||
| 141 | raise AbandonError(aggregate_errors=aggregate_errors) | 138 | raise AbandonError(aggregate_errors=aggregate_errors) |
| 142 | else: | 139 | else: |
| 143 | # Everything below here is displaying status. | 140 | # Everything below here is displaying status. |
