summaryrefslogtreecommitdiffstats
path: root/subcmds/abandon.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/abandon.py')
-rw-r--r--subcmds/abandon.py17
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 @@
15import collections 15import collections
16import functools 16import functools
17import itertools 17import itertools
18import sys
19 18
20from command import Command 19from command import Command
21from command import DEFAULT_LOCAL_JOBS 20from command import DEFAULT_LOCAL_JOBS
@@ -23,6 +22,10 @@ from error import RepoError
23from error import RepoExitError 22from error import RepoExitError
24from git_command import git 23from git_command import git
25from progress import Progress 24from progress import Progress
25from repo_logging import RepoLogger
26
27
28logger = RepoLogger(__file__)
26 29
27 30
28class AbandonError(RepoExitError): 31class 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.