summaryrefslogtreecommitdiffstats
path: root/subcmds/download.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/download.py')
-rw-r--r--subcmds/download.py49
1 files changed, 25 insertions, 24 deletions
diff --git a/subcmds/download.py b/subcmds/download.py
index e33698e1..4396c9e7 100644
--- a/subcmds/download.py
+++ b/subcmds/download.py
@@ -19,9 +19,11 @@ from command import Command
19from error import GitError 19from error import GitError
20from error import NoSuchProjectError 20from error import NoSuchProjectError
21from error import RepoExitError 21from error import RepoExitError
22from repo_logging import RepoLogger
22 23
23 24
24CHANGE_RE = re.compile(r"^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$") 25CHANGE_RE = re.compile(r"^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$")
26logger = RepoLogger(__file__)
25 27
26 28
27class DownloadCommandError(RepoExitError): 29class DownloadCommandError(RepoExitError):
@@ -109,21 +111,16 @@ If no project is specified try to use current directory as a project.
109 except NoSuchProjectError: 111 except NoSuchProjectError:
110 project = None 112 project = None
111 if project not in projects: 113 if project not in projects:
112 print( 114 logger.error(
113 "error: %s matches too many projects; please " 115 "error: %s matches too many projects; please "
114 "re-run inside the project checkout." % (a,), 116 "re-run inside the project checkout.",
115 file=sys.stderr, 117 a,
116 ) 118 )
117 for project in projects: 119 for project in projects:
118 print( 120 logger.error(
119 " %s/ @ %s" 121 " %s/ @ %s",
120 % ( 122 project.RelPath(local=opt.this_manifest_only),
121 project.RelPath( 123 project.revisionExpr,
122 local=opt.this_manifest_only
123 ),
124 project.revisionExpr,
125 ),
126 file=sys.stderr,
127 ) 124 )
128 raise NoSuchProjectError() 125 raise NoSuchProjectError()
129 else: 126 else:
@@ -156,18 +153,21 @@ If no project is specified try to use current directory as a project.
156 dl = project.DownloadPatchSet(change_id, ps_id) 153 dl = project.DownloadPatchSet(change_id, ps_id)
157 154
158 if not opt.revert and not dl.commits: 155 if not opt.revert and not dl.commits:
159 print( 156 logger.error(
160 "[%s] change %d/%d has already been merged" 157 "[%s] change %d/%d has already been merged",
161 % (project.name, change_id, ps_id), 158 project.name,
162 file=sys.stderr, 159 change_id,
160 ps_id,
163 ) 161 )
164 continue 162 continue
165 163
166 if len(dl.commits) > 1: 164 if len(dl.commits) > 1:
167 print( 165 logger.error(
168 "[%s] %d/%d depends on %d unmerged changes:" 166 "[%s] %d/%d depends on %d unmerged changes:",
169 % (project.name, change_id, ps_id, len(dl.commits)), 167 project.name,
170 file=sys.stderr, 168 change_id,
169 ps_id,
170 len(dl.commits),
171 ) 171 )
172 for c in dl.commits: 172 for c in dl.commits:
173 print(" %s" % (c), file=sys.stderr) 173 print(" %s" % (c), file=sys.stderr)
@@ -204,9 +204,10 @@ If no project is specified try to use current directory as a project.
204 project._Checkout(dl.commit) 204 project._Checkout(dl.commit)
205 205
206 except GitError: 206 except GitError:
207 print( 207 logger.error(
208 "[%s] Could not complete the %s of %s" 208 "[%s] Could not complete the %s of %s",
209 % (project.name, mode, dl.commit), 209 project.name,
210 file=sys.stderr, 210 mode,
211 dl.commit,
211 ) 212 )
212 raise 213 raise