blob: 9e1124c65ea55ec417a941828398c50da7cddfc6 [file] [log] [blame]
maruel@chromium.org725f1c32011-04-01 20:24:54 +00001#!/usr/bin/env python
2# Copyright (c) 2011 The Chromium Authors. All rights reserved.
3# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
maruel@chromium.org725f1c32011-04-01 20:24:54 +00008"""A git-command for integrating reviews on Rietveld."""
9
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000010import errno
11import logging
12import optparse
13import os
14import re
15import subprocess
16import sys
dpranke@chromium.org20254fc2011-03-22 18:28:59 +000017import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000018import textwrap
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +000019import urlparse
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import urllib2
21
22try:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000023 import readline # pylint: disable=F0401,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024except ImportError:
25 pass
26
dpranke@chromium.org20254fc2011-03-22 18:28:59 +000027try:
maruel@chromium.org2a74d372011-03-29 19:05:50 +000028 import simplejson as json # pylint: disable=F0401
dpranke@chromium.org20254fc2011-03-22 18:28:59 +000029except ImportError:
maruel@chromium.org2a74d372011-03-29 19:05:50 +000030 try:
maruel@chromium.org725f1c32011-04-01 20:24:54 +000031 import json # pylint: disable=F0401
maruel@chromium.org2a74d372011-03-29 19:05:50 +000032 except ImportError:
33 # Fall back to the packaged version.
maruel@chromium.orgb35c00c2011-03-31 00:43:35 +000034 sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party'))
dpranke@chromium.orgfe79c312011-04-01 20:15:52 +000035 import simplejson as json # pylint: disable=F0401
maruel@chromium.org2a74d372011-03-29 19:05:50 +000036
37
38from third_party import upload
39import breakpad # pylint: disable=W0611
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000040import fix_encoding
maruel@chromium.org2a74d372011-03-29 19:05:50 +000041import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000042import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000043import scm
44import watchlists
45
46
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000047
48DEFAULT_SERVER = 'http://codereview.appspot.com'
maruel@chromium.org0ba7f962011-01-11 22:13:58 +000049POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000050DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
51
maruel@chromium.org90541732011-04-01 17:54:18 +000052
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000053def DieWithError(message):
dpranke@chromium.org970c5222011-03-12 00:32:24 +000054 print >> sys.stderr, message
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000055 sys.exit(1)
56
57
58def Popen(cmd, **kwargs):
59 """Wrapper for subprocess.Popen() that logs and watch for cygwin issues"""
maruel@chromium.org899e1c12011-04-07 17:03:18 +000060 logging.debug('Popen: ' + ' '.join(cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000061 try:
62 return subprocess.Popen(cmd, **kwargs)
63 except OSError, e:
64 if e.errno == errno.EAGAIN and sys.platform == 'cygwin':
65 DieWithError(
66 'Visit '
67 'http://code.google.com/p/chromium/wiki/CygwinDllRemappingFailure to '
68 'learn how to fix this error; you need to rebase your cygwin dlls')
69 raise
70
71
72def RunCommand(cmd, error_ok=False, error_message=None,
maruel@chromium.orgb92e4802011-03-03 20:22:00 +000073 redirect_stdout=True, swallow_stderr=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074 if redirect_stdout:
75 stdout = subprocess.PIPE
76 else:
77 stdout = None
78 if swallow_stderr:
79 stderr = subprocess.PIPE
80 else:
81 stderr = None
maruel@chromium.orgb92e4802011-03-03 20:22:00 +000082 proc = Popen(cmd, stdout=stdout, stderr=stderr, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000083 output = proc.communicate()[0]
84 if not error_ok and proc.returncode != 0:
85 DieWithError('Command "%s" failed.\n' % (' '.join(cmd)) +
86 (error_message or output or ''))
87 return output
88
89
90def RunGit(args, **kwargs):
91 cmd = ['git'] + args
92 return RunCommand(cmd, **kwargs)
93
94
95def RunGitWithCode(args):
96 proc = Popen(['git'] + args, stdout=subprocess.PIPE)
97 output = proc.communicate()[0]
98 return proc.returncode, output
99
100
101def usage(more):
102 def hook(fn):
103 fn.usage_more = more
104 return fn
105 return hook
106
107
maruel@chromium.org90541732011-04-01 17:54:18 +0000108def ask_for_data(prompt):
109 try:
110 return raw_input(prompt)
111 except KeyboardInterrupt:
112 # Hide the exception.
113 sys.exit(1)
114
115
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000116def FixUrl(server):
117 """Fix a server url to defaults protocol to http:// if none is specified."""
118 if not server:
119 return server
120 if not re.match(r'[a-z]+\://.*', server):
121 return 'http://' + server
122 return server
123
124
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000125def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
126 """Return the corresponding git ref if |base_url| together with |glob_spec|
127 matches the full |url|.
128
129 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
130 """
131 fetch_suburl, as_ref = glob_spec.split(':')
132 if allow_wildcards:
133 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
134 if glob_match:
135 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
136 # "branches/{472,597,648}/src:refs/remotes/svn/*".
137 branch_re = re.escape(base_url)
138 if glob_match.group(1):
139 branch_re += '/' + re.escape(glob_match.group(1))
140 wildcard = glob_match.group(2)
141 if wildcard == '*':
142 branch_re += '([^/]*)'
143 else:
144 # Escape and replace surrounding braces with parentheses and commas
145 # with pipe symbols.
146 wildcard = re.escape(wildcard)
147 wildcard = re.sub('^\\\\{', '(', wildcard)
148 wildcard = re.sub('\\\\,', '|', wildcard)
149 wildcard = re.sub('\\\\}$', ')', wildcard)
150 branch_re += wildcard
151 if glob_match.group(3):
152 branch_re += re.escape(glob_match.group(3))
153 match = re.match(branch_re, url)
154 if match:
155 return re.sub('\*$', match.group(1), as_ref)
156
157 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
158 if fetch_suburl:
159 full_url = base_url + '/' + fetch_suburl
160 else:
161 full_url = base_url
162 if full_url == url:
163 return as_ref
164 return None
165
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166class Settings(object):
167 def __init__(self):
168 self.default_server = None
169 self.cc = None
170 self.root = None
171 self.is_git_svn = None
172 self.svn_branch = None
173 self.tree_status_url = None
174 self.viewvc_url = None
175 self.updated = False
176
177 def LazyUpdateIfNeeded(self):
178 """Updates the settings from a codereview.settings file, if available."""
179 if not self.updated:
180 cr_settings_file = FindCodereviewSettingsFile()
181 if cr_settings_file:
182 LoadCodereviewSettingsFromFile(cr_settings_file)
183 self.updated = True
184
185 def GetDefaultServerUrl(self, error_ok=False):
186 if not self.default_server:
187 self.LazyUpdateIfNeeded()
188 self.default_server = FixUrl(self._GetConfig('rietveld.server',
189 error_ok=True))
190 if error_ok:
191 return self.default_server
192 if not self.default_server:
193 error_message = ('Could not find settings file. You must configure '
194 'your review setup by running "git cl config".')
195 self.default_server = FixUrl(self._GetConfig(
196 'rietveld.server', error_message=error_message))
197 return self.default_server
198
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000199 def GetRoot(self):
200 if not self.root:
201 self.root = os.path.abspath(RunGit(['rev-parse', '--show-cdup']).strip())
202 return self.root
203
204 def GetIsGitSvn(self):
205 """Return true if this repo looks like it's using git-svn."""
206 if self.is_git_svn is None:
207 # If you have any "svn-remote.*" config keys, we think you're using svn.
208 self.is_git_svn = RunGitWithCode(
209 ['config', '--get-regexp', r'^svn-remote\.'])[0] == 0
210 return self.is_git_svn
211
212 def GetSVNBranch(self):
213 if self.svn_branch is None:
214 if not self.GetIsGitSvn():
215 DieWithError('Repo doesn\'t appear to be a git-svn repo.')
216
217 # Try to figure out which remote branch we're based on.
218 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000219 # 1) iterate through our branch history and find the svn URL.
220 # 2) find the svn-remote that fetches from the URL.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000221
222 # regexp matching the git-svn line that contains the URL.
223 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
224
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000225 # We don't want to go through all of history, so read a line from the
226 # pipe at a time.
227 # The -100 is an arbitrary limit so we don't search forever.
228 cmd = ['git', 'log', '-100', '--pretty=medium']
229 proc = Popen(cmd, stdout=subprocess.PIPE)
230 for line in proc.stdout:
231 match = git_svn_re.match(line)
232 if match:
233 url = match.group(1)
234 proc.stdout.close() # Cut pipe.
235 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000236
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000237 if url:
238 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
239 remotes = RunGit(['config', '--get-regexp',
240 r'^svn-remote\..*\.url']).splitlines()
241 for remote in remotes:
242 match = svn_remote_re.match(remote)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000243 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000244 remote = match.group(1)
245 base_url = match.group(2)
246 fetch_spec = RunGit(
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000247 ['config', 'svn-remote.%s.fetch' % remote],
248 error_ok=True).strip()
249 if fetch_spec:
250 self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
251 if self.svn_branch:
252 break
253 branch_spec = RunGit(
254 ['config', 'svn-remote.%s.branches' % remote],
255 error_ok=True).strip()
256 if branch_spec:
257 self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
258 if self.svn_branch:
259 break
260 tag_spec = RunGit(
261 ['config', 'svn-remote.%s.tags' % remote],
262 error_ok=True).strip()
263 if tag_spec:
264 self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
265 if self.svn_branch:
266 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000267
268 if not self.svn_branch:
269 DieWithError('Can\'t guess svn branch -- try specifying it on the '
270 'command line')
271
272 return self.svn_branch
273
274 def GetTreeStatusUrl(self, error_ok=False):
275 if not self.tree_status_url:
276 error_message = ('You must configure your tree status URL by running '
277 '"git cl config".')
278 self.tree_status_url = self._GetConfig('rietveld.tree-status-url',
279 error_ok=error_ok,
280 error_message=error_message)
281 return self.tree_status_url
282
283 def GetViewVCUrl(self):
284 if not self.viewvc_url:
285 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
286 return self.viewvc_url
287
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000288 def GetDefaultCCList(self):
289 return self._GetConfig('rietveld.cc', error_ok=True)
290
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000291 def _GetConfig(self, param, **kwargs):
292 self.LazyUpdateIfNeeded()
293 return RunGit(['config', param], **kwargs).strip()
294
295
296settings = Settings()
297
298
299did_migrate_check = False
300def CheckForMigration():
301 """Migrate from the old issue format, if found.
302
303 We used to store the branch<->issue mapping in a file in .git, but it's
304 better to store it in the .git/config, since deleting a branch deletes that
305 branch's entry there.
306 """
307
308 # Don't run more than once.
309 global did_migrate_check
310 if did_migrate_check:
311 return
312
313 gitdir = RunGit(['rev-parse', '--git-dir']).strip()
314 storepath = os.path.join(gitdir, 'cl-mapping')
315 if os.path.exists(storepath):
316 print "old-style git-cl mapping file (%s) found; migrating." % storepath
317 store = open(storepath, 'r')
318 for line in store:
319 branch, issue = line.strip().split()
320 RunGit(['config', 'branch.%s.rietveldissue' % ShortBranchName(branch),
321 issue])
322 store.close()
323 os.remove(storepath)
324 did_migrate_check = True
325
326
327def ShortBranchName(branch):
328 """Convert a name like 'refs/heads/foo' to just 'foo'."""
329 return branch.replace('refs/heads/', '')
330
331
332class Changelist(object):
333 def __init__(self, branchref=None):
334 # Poke settings so we get the "configure your server" message if necessary.
335 settings.GetDefaultServerUrl()
336 self.branchref = branchref
337 if self.branchref:
338 self.branch = ShortBranchName(self.branchref)
339 else:
340 self.branch = None
341 self.rietveld_server = None
342 self.upstream_branch = None
343 self.has_issue = False
344 self.issue = None
345 self.has_description = False
346 self.description = None
347 self.has_patchset = False
348 self.patchset = None
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000349 self._rpc_server = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000350 self.cc = None
351 self.watchers = ()
352
353 def GetCCList(self):
354 """Return the users cc'd on this CL.
355
356 Return is a string suitable for passing to gcl with the --cc flag.
357 """
358 if self.cc is None:
359 base_cc = settings .GetDefaultCCList()
360 more_cc = ','.join(self.watchers)
361 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
362 return self.cc
363
364 def SetWatchers(self, watchers):
365 """Set the list of email addresses that should be cc'd based on the changed
366 files in this CL.
367 """
368 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000369
370 def GetBranch(self):
371 """Returns the short branch name, e.g. 'master'."""
372 if not self.branch:
373 self.branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
374 self.branch = ShortBranchName(self.branchref)
375 return self.branch
376
377 def GetBranchRef(self):
378 """Returns the full branch name, e.g. 'refs/heads/master'."""
379 self.GetBranch() # Poke the lazy loader.
380 return self.branchref
381
382 def FetchUpstreamTuple(self):
383 """Returns a tuple containg remote and remote ref,
384 e.g. 'origin', 'refs/heads/master'
385 """
386 remote = '.'
387 branch = self.GetBranch()
388 upstream_branch = RunGit(['config', 'branch.%s.merge' % branch],
389 error_ok=True).strip()
390 if upstream_branch:
391 remote = RunGit(['config', 'branch.%s.remote' % branch]).strip()
392 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000393 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
394 error_ok=True).strip()
395 if upstream_branch:
396 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000397 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000398 # Fall back on trying a git-svn upstream branch.
399 if settings.GetIsGitSvn():
400 upstream_branch = settings.GetSVNBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000401 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000402 # Else, try to guess the origin remote.
403 remote_branches = RunGit(['branch', '-r']).split()
404 if 'origin/master' in remote_branches:
405 # Fall back on origin/master if it exits.
406 remote = 'origin'
407 upstream_branch = 'refs/heads/master'
408 elif 'origin/trunk' in remote_branches:
409 # Fall back on origin/trunk if it exists. Generally a shared
410 # git-svn clone
411 remote = 'origin'
412 upstream_branch = 'refs/heads/trunk'
413 else:
414 DieWithError("""Unable to determine default branch to diff against.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000415Either pass complete "git diff"-style arguments, like
416 git cl upload origin/master
417or verify this branch is set up to track another (via the --track argument to
418"git checkout -b ...").""")
419
420 return remote, upstream_branch
421
422 def GetUpstreamBranch(self):
423 if self.upstream_branch is None:
424 remote, upstream_branch = self.FetchUpstreamTuple()
425 if remote is not '.':
426 upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
427 self.upstream_branch = upstream_branch
428 return self.upstream_branch
429
430 def GetRemoteUrl(self):
431 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
432
433 Returns None if there is no remote.
434 """
435 remote = self.FetchUpstreamTuple()[0]
436 if remote == '.':
437 return None
438 return RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
439
440 def GetIssue(self):
441 if not self.has_issue:
442 CheckForMigration()
443 issue = RunGit(['config', self._IssueSetting()], error_ok=True).strip()
444 if issue:
445 self.issue = issue
446 self.rietveld_server = FixUrl(RunGit(
447 ['config', self._RietveldServer()], error_ok=True).strip())
448 else:
449 self.issue = None
450 if not self.rietveld_server:
451 self.rietveld_server = settings.GetDefaultServerUrl()
452 self.has_issue = True
453 return self.issue
454
455 def GetRietveldServer(self):
456 self.GetIssue()
457 return self.rietveld_server
458
459 def GetIssueURL(self):
460 """Get the URL for a particular issue."""
461 return '%s/%s' % (self.GetRietveldServer(), self.GetIssue())
462
463 def GetDescription(self, pretty=False):
464 if not self.has_description:
465 if self.GetIssue():
466 path = '/' + self.GetIssue() + '/description'
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000467 rpc_server = self.RpcServer()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000468 self.description = rpc_server.Send(path).strip()
469 self.has_description = True
470 if pretty:
471 wrapper = textwrap.TextWrapper()
472 wrapper.initial_indent = wrapper.subsequent_indent = ' '
473 return wrapper.fill(self.description)
474 return self.description
475
476 def GetPatchset(self):
477 if not self.has_patchset:
478 patchset = RunGit(['config', self._PatchsetSetting()],
479 error_ok=True).strip()
480 if patchset:
481 self.patchset = patchset
482 else:
483 self.patchset = None
484 self.has_patchset = True
485 return self.patchset
486
487 def SetPatchset(self, patchset):
488 """Set this branch's patchset. If patchset=0, clears the patchset."""
489 if patchset:
490 RunGit(['config', self._PatchsetSetting(), str(patchset)])
491 else:
492 RunGit(['config', '--unset', self._PatchsetSetting()],
493 swallow_stderr=True, error_ok=True)
494 self.has_patchset = False
495
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000496 def GetPatchSetDiff(self, issue):
497 # Grab the last patchset of the issue first.
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000498 data = json.loads(self.RpcServer().Send('/api/%s' % issue))
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000499 patchset = data['patchsets'][-1]
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000500 return self.RpcServer().Send(
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000501 '/download/issue%s_%s.diff' % (issue, patchset))
502
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000503 def SetIssue(self, issue):
504 """Set this branch's issue. If issue=0, clears the issue."""
505 if issue:
506 RunGit(['config', self._IssueSetting(), str(issue)])
507 if self.rietveld_server:
508 RunGit(['config', self._RietveldServer(), self.rietveld_server])
509 else:
510 RunGit(['config', '--unset', self._IssueSetting()])
511 self.SetPatchset(0)
512 self.has_issue = False
513
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +0000514 def RunHook(self, committing, upstream_branch, tbr, may_prompt, verbose):
515 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +0000516 root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip() or '.'
517 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +0000518
519 # We use the sha1 of HEAD as a name of this change.
520 name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +0000521 # Need to pass a relative path for msysgit.
522 files = scm.GIT.CaptureStatus([root], upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +0000523
524 issue = ConvertToInteger(self.GetIssue())
525 patchset = ConvertToInteger(self.GetPatchset())
526 if issue:
527 description = self.GetDescription()
528 else:
529 # If the change was never uploaded, use the log messages of all commits
530 # up to the branch point, as git cl upload will prefill the description
531 # with these log messages.
532 description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
533 '%s...' % (upstream_branch)]).strip()
534 change = presubmit_support.GitChange(
535 name,
536 description,
537 absroot,
538 files,
539 issue,
540 patchset,
541 None)
542
543 # Apply watchlists on upload.
544 if not committing:
545 watchlist = watchlists.Watchlists(change.RepositoryRoot())
546 files = [f.LocalPath() for f in change.AffectedFiles()]
547 self.SetWatchers(watchlist.GetWatchersForPaths(files))
548
549 try:
550 output = presubmit_support.DoPresubmitChecks(change, committing,
551 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
552 default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
553 rietveld=self.RpcServer())
554 except presubmit_support.PresubmitFailure, e:
555 DieWithError(
556 ('%s\nMaybe your depot_tools is out of date?\n'
557 'If all fails, contact maruel@') % e)
558
559 # TODO(dpranke): We should propagate the error out instead of calling
560 # exit().
561 if not output.should_continue():
562 sys.exit(1)
563
564 return output
565
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000566 def CloseIssue(self):
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000567 rpc_server = self.RpcServer()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000568 # Newer versions of Rietveld require us to pass an XSRF token to POST, so
569 # we fetch it from the server. (The version used by Chromium has been
570 # modified so the token isn't required when closing an issue.)
571 xsrf_token = rpc_server.Send('/xsrf_token',
572 extra_headers={'X-Requesting-XSRF-Token': '1'})
573
574 # You cannot close an issue with a GET.
575 # We pass an empty string for the data so it is a POST rather than a GET.
576 data = [("description", self.description),
577 ("xsrf_token", xsrf_token)]
578 ctype, body = upload.EncodeMultipartFormData(data, [])
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000579 rpc_server.Send(
580 '/' + self.GetIssue() + '/close', payload=body, content_type=ctype)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000581
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000582 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000583 """Returns an upload.RpcServer() to access this review's rietveld instance.
584 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000585 if not self._rpc_server:
maruel@chromium.orgcab38e92011-04-09 00:30:51 +0000586 self.GetIssue()
587 self._rpc_server = rietveld.Rietveld(self.rietveld_server, None, None)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000588 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000589
590 def _IssueSetting(self):
591 """Return the git setting that stores this change's issue."""
592 return 'branch.%s.rietveldissue' % self.GetBranch()
593
594 def _PatchsetSetting(self):
595 """Return the git setting that stores this change's most recent patchset."""
596 return 'branch.%s.rietveldpatchset' % self.GetBranch()
597
598 def _RietveldServer(self):
599 """Returns the git setting that stores this change's rietveld server."""
600 return 'branch.%s.rietveldserver' % self.GetBranch()
601
602
603def GetCodereviewSettingsInteractively():
604 """Prompt the user for settings."""
605 server = settings.GetDefaultServerUrl(error_ok=True)
606 prompt = 'Rietveld server (host[:port])'
607 prompt += ' [%s]' % (server or DEFAULT_SERVER)
maruel@chromium.org90541732011-04-01 17:54:18 +0000608 newserver = ask_for_data(prompt + ':')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000609 if not server and not newserver:
610 newserver = DEFAULT_SERVER
611 if newserver and newserver != server:
612 RunGit(['config', 'rietveld.server', newserver])
613
614 def SetProperty(initial, caption, name):
615 prompt = caption
616 if initial:
617 prompt += ' ("x" to clear) [%s]' % initial
maruel@chromium.org90541732011-04-01 17:54:18 +0000618 new_val = ask_for_data(prompt + ':')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000619 if new_val == 'x':
620 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
621 elif new_val and new_val != initial:
622 RunGit(['config', 'rietveld.' + name, new_val])
623
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000624 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000625 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
626 'tree-status-url')
627 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url')
628
629 # TODO: configure a default branch to diff against, rather than this
630 # svn-based hackery.
631
632
dpranke@chromium.org20254fc2011-03-22 18:28:59 +0000633class ChangeDescription(object):
634 """Contains a parsed form of the change description."""
635 def __init__(self, subject, log_desc, reviewers):
636 self.subject = subject
637 self.log_desc = log_desc
638 self.reviewers = reviewers
639 self.description = self.log_desc
640
641 def Update(self):
642 initial_text = """# Enter a description of the change.
643# This will displayed on the codereview site.
644# The first line will also be used as the subject of the review.
645"""
646 initial_text += self.description
647 if 'R=' not in self.description and self.reviewers:
648 initial_text += '\nR=' + self.reviewers
649 if 'BUG=' not in self.description:
650 initial_text += '\nBUG='
651 if 'TEST=' not in self.description:
652 initial_text += '\nTEST='
653 self._ParseDescription(UserEditedLog(initial_text))
654
655 def _ParseDescription(self, description):
656 if not description:
657 self.description = description
658 return
659
660 parsed_lines = []
661 reviewers_regexp = re.compile('\s*R=(.+)')
662 reviewers = ''
663 subject = ''
664 for l in description.splitlines():
665 if not subject:
666 subject = l
667 matched_reviewers = reviewers_regexp.match(l)
668 if matched_reviewers:
669 reviewers = matched_reviewers.group(1)
670 parsed_lines.append(l)
671
672 self.description = '\n'.join(parsed_lines) + '\n'
673 self.subject = subject
674 self.reviewers = reviewers
675
676 def IsEmpty(self):
677 return not self.description
678
679
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000680def FindCodereviewSettingsFile(filename='codereview.settings'):
681 """Finds the given file starting in the cwd and going up.
682
683 Only looks up to the top of the repository unless an
684 'inherit-review-settings-ok' file exists in the root of the repository.
685 """
686 inherit_ok_file = 'inherit-review-settings-ok'
687 cwd = os.getcwd()
688 root = os.path.abspath(RunGit(['rev-parse', '--show-cdup']).strip())
689 if os.path.isfile(os.path.join(root, inherit_ok_file)):
690 root = '/'
691 while True:
692 if filename in os.listdir(cwd):
693 if os.path.isfile(os.path.join(cwd, filename)):
694 return open(os.path.join(cwd, filename))
695 if cwd == root:
696 break
697 cwd = os.path.dirname(cwd)
698
699
700def LoadCodereviewSettingsFromFile(fileobj):
701 """Parse a codereview.settings file and updates hooks."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000702 keyvals = {}
703 for line in fileobj.read().splitlines():
704 if not line or line.startswith("#"):
705 continue
706 k, v = line.split(": ", 1)
707 keyvals[k] = v
708
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000709 def SetProperty(name, setting, unset_error_ok=False):
710 fullname = 'rietveld.' + name
711 if setting in keyvals:
712 RunGit(['config', fullname, keyvals[setting]])
713 else:
714 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
715
716 SetProperty('server', 'CODE_REVIEW_SERVER')
717 # Only server setting is required. Other settings can be absent.
718 # In that case, we ignore errors raised during option deletion attempt.
719 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
720 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
721 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
722
723 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
724 #should be of the form
725 #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
726 #ORIGIN_URL_CONFIG: http://src.chromium.org/git
727 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
728 keyvals['ORIGIN_URL_CONFIG']])
729
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000730
731@usage('[repo root containing codereview.settings]')
732def CMDconfig(parser, args):
733 """edit configuration for this tree"""
734
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +0000735 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000736 if len(args) == 0:
737 GetCodereviewSettingsInteractively()
738 return 0
739
740 url = args[0]
741 if not url.endswith('codereview.settings'):
742 url = os.path.join(url, 'codereview.settings')
743
744 # Load code review settings and download hooks (if available).
745 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
746 return 0
747
748
749def CMDstatus(parser, args):
750 """show status of changelists"""
751 parser.add_option('--field',
752 help='print only specific field (desc|id|patch|url)')
753 (options, args) = parser.parse_args(args)
754
755 # TODO: maybe make show_branches a flag if necessary.
756 show_branches = not options.field
757
758 if show_branches:
759 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
760 if branches:
761 print 'Branches associated with reviews:'
762 for branch in sorted(branches.splitlines()):
763 cl = Changelist(branchref=branch)
764 print " %10s: %s" % (cl.GetBranch(), cl.GetIssue())
765
766 cl = Changelist()
767 if options.field:
768 if options.field.startswith('desc'):
769 print cl.GetDescription()
770 elif options.field == 'id':
771 issueid = cl.GetIssue()
772 if issueid:
773 print issueid
774 elif options.field == 'patch':
775 patchset = cl.GetPatchset()
776 if patchset:
777 print patchset
778 elif options.field == 'url':
779 url = cl.GetIssueURL()
780 if url:
781 print url
782 else:
783 print
784 print 'Current branch:',
785 if not cl.GetIssue():
786 print 'no issue assigned.'
787 return 0
788 print cl.GetBranch()
789 print 'Issue number:', cl.GetIssue(), '(%s)' % cl.GetIssueURL()
790 print 'Issue description:'
791 print cl.GetDescription(pretty=True)
792 return 0
793
794
795@usage('[issue_number]')
796def CMDissue(parser, args):
797 """Set or display the current code review issue number.
798
799 Pass issue number 0 to clear the current issue.
800"""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +0000801 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802
803 cl = Changelist()
804 if len(args) > 0:
805 try:
806 issue = int(args[0])
807 except ValueError:
808 DieWithError('Pass a number to set the issue or none to list it.\n'
809 'Maybe you want to run git cl status?')
810 cl.SetIssue(issue)
811 print 'Issue number:', cl.GetIssue(), '(%s)' % cl.GetIssueURL()
812 return 0
813
814
815def CreateDescriptionFromLog(args):
816 """Pulls out the commit log to use as a base for the CL description."""
817 log_args = []
818 if len(args) == 1 and not args[0].endswith('.'):
819 log_args = [args[0] + '..']
820 elif len(args) == 1 and args[0].endswith('...'):
821 log_args = [args[0][:-1]]
822 elif len(args) == 2:
823 log_args = [args[0] + '..' + args[1]]
824 else:
825 log_args = args[:] # Hope for the best!
826 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
827
828
dpranke@chromium.org20254fc2011-03-22 18:28:59 +0000829def UserEditedLog(starting_text):
830 """Given some starting text, let the user edit it and return the result."""
831 editor = os.getenv('EDITOR', 'vi')
832
833 (file_handle, filename) = tempfile.mkstemp()
834 fileobj = os.fdopen(file_handle, 'w')
835 fileobj.write(starting_text)
836 fileobj.close()
837
838 # Open up the default editor in the system to get the CL description.
839 try:
840 cmd = '%s %s' % (editor, filename)
841 if sys.platform == 'win32' and os.environ.get('TERM') == 'msys':
842 # Msysgit requires the usage of 'env' to be present.
843 cmd = 'env ' + cmd
844 # shell=True to allow the shell to handle all forms of quotes in $EDITOR.
845 subprocess.check_call(cmd, shell=True)
846 fileobj = open(filename)
847 text = fileobj.read()
848 fileobj.close()
849 finally:
850 os.remove(filename)
851
852 if not text:
853 return
854
855 stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
856 return stripcomment_re.sub('', text).strip()
857
858
dpranke@chromium.org23beb9e2011-03-11 23:20:54 +0000859def ConvertToInteger(inputval):
860 """Convert a string to integer, but returns either an int or None."""
861 try:
862 return int(inputval)
863 except (TypeError, ValueError):
864 return None
865
866
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000867def CMDpresubmit(parser, args):
868 """run presubmit tests on the current changelist"""
869 parser.add_option('--upload', action='store_true',
870 help='Run upload hook instead of the push/dcommit hook')
871 (options, args) = parser.parse_args(args)
872
873 # Make sure index is up-to-date before running diff-index.
874 RunGit(['update-index', '--refresh', '-q'], error_ok=True)
875 if RunGit(['diff-index', 'HEAD']):
876 # TODO(maruel): Is this really necessary?
877 print 'Cannot presubmit with a dirty tree. You must commit locally first.'
878 return 1
879
dpranke@chromium.org970c5222011-03-12 00:32:24 +0000880 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000881 if args:
882 base_branch = args[0]
883 else:
884 # Default to diffing against the "upstream" branch.
dpranke@chromium.org970c5222011-03-12 00:32:24 +0000885 base_branch = cl.GetUpstreamBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000886
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +0000887 cl.RunHook(committing=not options.upload, upstream_branch=base_branch,
888 tbr=False, may_prompt=False, verbose=options.verbose)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +0000889 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000890
891
892@usage('[args to "git diff"]')
893def CMDupload(parser, args):
894 """upload the current changelist to codereview"""
895 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
896 help='bypass upload presubmit hook')
dpranke@chromium.org970c5222011-03-12 00:32:24 +0000897 parser.add_option('-f', action='store_true', dest='force',
898 help="force yes to questions (don't prompt)")
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000899 parser.add_option('-m', dest='message', help='message for patch')
900 parser.add_option('-r', '--reviewers',
901 help='reviewer email addresses')
maruel@chromium.orgb2a7c332011-02-25 20:30:37 +0000902 parser.add_option('--cc',
903 help='cc email addresses')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000904 parser.add_option('--send-mail', action='store_true',
905 help='send email to reviewer immediately')
906 parser.add_option("--emulate_svn_auto_props", action="store_true",
907 dest="emulate_svn_auto_props",
908 help="Emulate Subversion's auto properties feature.")
909 parser.add_option("--desc_from_logs", action="store_true",
910 dest="from_logs",
911 help="""Squashes git commit logs into change description and
912 uses message as subject""")
913 (options, args) = parser.parse_args(args)
914
915 # Make sure index is up-to-date before running diff-index.
916 RunGit(['update-index', '--refresh', '-q'], error_ok=True)
917 if RunGit(['diff-index', 'HEAD']):
918 print 'Cannot upload with a dirty tree. You must commit locally first.'
919 return 1
920
921 cl = Changelist()
922 if args:
923 base_branch = args[0]
924 else:
925 # Default to diffing against the "upstream" branch.
926 base_branch = cl.GetUpstreamBranch()
927 args = [base_branch + "..."]
928
dpranke@chromium.org5ac21012011-03-16 02:58:25 +0000929 if not options.bypass_hooks and not options.force:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +0000930 hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
931 tbr=False, may_prompt=True,
932 verbose=options.verbose)
dpranke@chromium.org5ac21012011-03-16 02:58:25 +0000933 if not options.reviewers and hook_results.reviewers:
dpranke@chromium.org20254fc2011-03-22 18:28:59 +0000934 options.reviewers = hook_results.reviewers
dpranke@chromium.org970c5222011-03-12 00:32:24 +0000935
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000936
937 # --no-ext-diff is broken in some versions of Git, so try to work around
938 # this by overriding the environment (but there is still a problem if the
939 # git config key "diff.external" is used).
940 env = os.environ.copy()
941 if 'GIT_EXTERNAL_DIFF' in env:
942 del env['GIT_EXTERNAL_DIFF']
943 subprocess.call(['git', 'diff', '--no-ext-diff', '--stat', '-M'] + args,
944 env=env)
945
946 upload_args = ['--assume_yes'] # Don't ask about untracked files.
947 upload_args.extend(['--server', cl.GetRietveldServer()])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000948 if options.emulate_svn_auto_props:
949 upload_args.append('--emulate_svn_auto_props')
950 if options.send_mail:
951 if not options.reviewers:
952 DieWithError("Must specify reviewers to send email.")
953 upload_args.append('--send_mail')
954 if options.from_logs and not options.message:
955 print 'Must set message for subject line if using desc_from_logs'
956 return 1
957
958 change_desc = None
959
960 if cl.GetIssue():
961 if options.message:
962 upload_args.extend(['--message', options.message])
963 upload_args.extend(['--issue', cl.GetIssue()])
964 print ("This branch is associated with issue %s. "
965 "Adding patch to that issue." % cl.GetIssue())
966 else:
967 log_desc = CreateDescriptionFromLog(args)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +0000968 change_desc = ChangeDescription(options.message, log_desc,
969 options.reviewers)
970 if not options.from_logs:
971 change_desc.Update()
dpranke@chromium.org970c5222011-03-12 00:32:24 +0000972
973 if change_desc.IsEmpty():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000974 print "Description is empty; aborting."
975 return 1
dpranke@chromium.org970c5222011-03-12 00:32:24 +0000976
977 upload_args.extend(['--message', change_desc.subject])
978 upload_args.extend(['--description', change_desc.description])
979 if change_desc.reviewers:
980 upload_args.extend(['--reviewers', change_desc.reviewers])
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000981 cc = ','.join(filter(None, (cl.GetCCList(), options.cc)))
maruel@chromium.orgb2a7c332011-02-25 20:30:37 +0000982 if cc:
983 upload_args.extend(['--cc', cc])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000984
985 # Include the upstream repo's URL in the change -- this is useful for
986 # projects that have their source spread across multiple repos.
987 remote_url = None
988 if settings.GetIsGitSvn():
maruel@chromium.orgb92e4802011-03-03 20:22:00 +0000989 # URL is dependent on the current directory.
990 data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000991 if data:
992 keys = dict(line.split(': ', 1) for line in data.splitlines()
993 if ': ' in line)
994 remote_url = keys.get('URL', None)
995 else:
996 if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
997 remote_url = (cl.GetRemoteUrl() + '@'
998 + cl.GetUpstreamBranch().split('/')[-1])
999 if remote_url:
1000 upload_args.extend(['--base_url', remote_url])
1001
1002 try:
1003 issue, patchset = upload.RealMain(['upload'] + upload_args + args)
maruel@chromium.org9ce0dff2011-04-04 17:56:50 +00001004 except KeyboardInterrupt:
1005 sys.exit(1)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006 except:
1007 # If we got an exception after the user typed a description for their
1008 # change, back up the description before re-raising.
1009 if change_desc:
1010 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
1011 print '\nGot exception while uploading -- saving description to %s\n' \
1012 % backup_path
1013 backup_file = open(backup_path, 'w')
dpranke@chromium.org970c5222011-03-12 00:32:24 +00001014 backup_file.write(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015 backup_file.close()
1016 raise
1017
1018 if not cl.GetIssue():
1019 cl.SetIssue(issue)
1020 cl.SetPatchset(patchset)
1021 return 0
1022
1023
1024def SendUpstream(parser, args, cmd):
1025 """Common code for CmdPush and CmdDCommit
1026
1027 Squashed commit into a single.
1028 Updates changelog with metadata (e.g. pointer to review).
1029 Pushes/dcommits the code upstream.
1030 Updates review and closes.
1031 """
1032 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
1033 help='bypass upload presubmit hook')
1034 parser.add_option('-m', dest='message',
1035 help="override review description")
1036 parser.add_option('-f', action='store_true', dest='force',
1037 help="force yes to questions (don't prompt)")
1038 parser.add_option('-c', dest='contributor',
1039 help="external contributor for patch (appended to " +
1040 "description and used as author for git). Should be " +
1041 "formatted as 'First Last <email@example.com>'")
1042 parser.add_option('--tbr', action='store_true', dest='tbr',
1043 help="short for 'to be reviewed', commit branch " +
1044 "even without uploading for review")
1045 (options, args) = parser.parse_args(args)
1046 cl = Changelist()
1047
1048 if not args or cmd == 'push':
1049 # Default to merging against our best guess of the upstream branch.
1050 args = [cl.GetUpstreamBranch()]
1051
1052 base_branch = args[0]
1053
chase@chromium.orgc76e6752011-01-10 18:17:12 +00001054 # Make sure index is up-to-date before running diff-index.
1055 RunGit(['update-index', '--refresh', '-q'], error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001056 if RunGit(['diff-index', 'HEAD']):
1057 print 'Cannot %s with a dirty tree. You must commit locally first.' % cmd
1058 return 1
1059
1060 # This rev-list syntax means "show all commits not in my branch that
1061 # are in base_branch".
1062 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
1063 base_branch]).splitlines()
1064 if upstream_commits:
1065 print ('Base branch "%s" has %d commits '
1066 'not in this branch.' % (base_branch, len(upstream_commits)))
1067 print 'Run "git merge %s" before attempting to %s.' % (base_branch, cmd)
1068 return 1
1069
1070 if cmd == 'dcommit':
1071 # This is the revision `svn dcommit` will commit on top of.
1072 svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
1073 '--pretty=format:%H'])
1074 extra_commits = RunGit(['rev-list', '^' + svn_head, base_branch])
1075 if extra_commits:
1076 print ('This branch has %d additional commits not upstreamed yet.'
1077 % len(extra_commits.splitlines()))
1078 print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
1079 'before attempting to %s.' % (base_branch, cmd))
1080 return 1
1081
dpranke@chromium.org5ac21012011-03-16 02:58:25 +00001082 if not options.bypass_hooks and not options.force:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001083 cl.RunHook(committing=True, upstream_branch=base_branch,
1084 tbr=options.tbr, may_prompt=True, verbose=options.verbose)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085
1086 if cmd == 'dcommit':
1087 # Check the tree status if the tree status URL is set.
1088 status = GetTreeStatus()
1089 if 'closed' == status:
1090 print ('The tree is closed. Please wait for it to reopen. Use '
1091 '"git cl dcommit -f" to commit on a closed tree.')
1092 return 1
1093 elif 'unknown' == status:
1094 print ('Unable to determine tree status. Please verify manually and '
1095 'use "git cl dcommit -f" to commit on a closed tree.')
1096
1097 description = options.message
1098 if not options.tbr:
1099 # It is important to have these checks early. Not only for user
1100 # convenience, but also because the cl object then caches the correct values
1101 # of these fields even as we're juggling branches for setting up the commit.
1102 if not cl.GetIssue():
1103 print 'Current issue unknown -- has this branch been uploaded?'
1104 print 'Use --tbr to commit without review.'
1105 return 1
1106
1107 if not description:
1108 description = cl.GetDescription()
1109
1110 if not description:
1111 print 'No description set.'
1112 print 'Visit %s/edit to set it.' % (cl.GetIssueURL())
1113 return 1
1114
1115 description += "\n\nReview URL: %s" % cl.GetIssueURL()
1116 else:
1117 if not description:
1118 # Submitting TBR. See if there's already a description in Rietveld, else
1119 # create a template description. Eitherway, give the user a chance to edit
1120 # it to fill in the TBR= field.
1121 if cl.GetIssue():
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001122 description = cl.GetDescription()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001124 # TODO(dpranke): Update to use ChangeDescription object.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001125 if not description:
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001126 description = """# Enter a description of the change.
1127# This will be used as the change log for the commit.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001129"""
1130 description += CreateDescriptionFromLog(args)
1131
1132 description = UserEditedLog(description + '\nTBR=')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133
1134 if not description:
1135 print "Description empty; aborting."
1136 return 1
1137
1138 if options.contributor:
1139 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
1140 print "Please provide contibutor as 'First Last <email@example.com>'"
1141 return 1
1142 description += "\nPatch from %s." % options.contributor
1143 print 'Description:', repr(description)
1144
1145 branches = [base_branch, cl.GetBranchRef()]
1146 if not options.force:
1147 subprocess.call(['git', 'diff', '--stat'] + branches)
maruel@chromium.org90541732011-04-01 17:54:18 +00001148 ask_for_data('About to commit; enter to confirm.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149
1150 # We want to squash all this branch's commits into one commit with the
1151 # proper description.
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00001152 # We do this by doing a "reset --soft" to the base branch (which keeps
1153 # the working copy the same), then dcommitting that.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154 MERGE_BRANCH = 'git-cl-commit'
1155 # Delete the merge branch if it already exists.
1156 if RunGitWithCode(['show-ref', '--quiet', '--verify',
1157 'refs/heads/' + MERGE_BRANCH])[0] == 0:
1158 RunGit(['branch', '-D', MERGE_BRANCH])
1159
1160 # We might be in a directory that's present in this branch but not in the
1161 # trunk. Move up to the top of the tree so that git commands that expect a
1162 # valid CWD won't fail after we check out the merge branch.
1163 rel_base_path = RunGit(['rev-parse', '--show-cdup']).strip()
1164 if rel_base_path:
1165 os.chdir(rel_base_path)
1166
1167 # Stuff our change into the merge branch.
1168 # We wrap in a try...finally block so if anything goes wrong,
1169 # we clean up the branches.
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00001170 retcode = -1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001171 try:
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00001172 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
1173 RunGit(['reset', '--soft', base_branch])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001174 if options.contributor:
1175 RunGit(['commit', '--author', options.contributor, '-m', description])
1176 else:
1177 RunGit(['commit', '-m', description])
1178 if cmd == 'push':
1179 # push the merge branch.
1180 remote, branch = cl.FetchUpstreamTuple()
1181 retcode, output = RunGitWithCode(
1182 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
1183 logging.debug(output)
1184 else:
1185 # dcommit the merge branch.
bauerb@chromium.org2e64fa12011-05-05 11:13:44 +00001186 retcode, output = RunGitWithCode(['svn', 'dcommit',
1187 '--no-rebase', '--rmdir'])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001188 finally:
1189 # And then swap back to the original branch and clean up.
1190 RunGit(['checkout', '-q', cl.GetBranch()])
1191 RunGit(['branch', '-D', MERGE_BRANCH])
1192
1193 if cl.GetIssue():
1194 if cmd == 'dcommit' and 'Committed r' in output:
1195 revision = re.match('.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
1196 elif cmd == 'push' and retcode == 0:
maruel@chromium.orgdf947ea2011-01-12 20:44:54 +00001197 match = (re.match(r'.*?([a-f0-9]{7})\.\.([a-f0-9]{7})$', l)
1198 for l in output.splitlines(False))
1199 match = filter(None, match)
1200 if len(match) != 1:
1201 DieWithError("Couldn't parse ouput to extract the committed hash:\n%s" %
1202 output)
1203 revision = match[0].group(2)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001204 else:
1205 return 1
1206 viewvc_url = settings.GetViewVCUrl()
1207 if viewvc_url and revision:
1208 cl.description += ('\n\nCommitted: ' + viewvc_url + revision)
1209 print ('Closing issue '
1210 '(you may be prompted for your codereview password)...')
1211 cl.CloseIssue()
1212 cl.SetIssue(0)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00001213
1214 if retcode == 0:
1215 hook = POSTUPSTREAM_HOOK_PATTERN % cmd
1216 if os.path.isfile(hook):
dpranke@chromium.org970c5222011-03-12 00:32:24 +00001217 RunCommand([hook, base_branch], error_ok=True)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00001218
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001219 return 0
1220
1221
1222@usage('[upstream branch to apply against]')
1223def CMDdcommit(parser, args):
1224 """commit the current changelist via git-svn"""
1225 if not settings.GetIsGitSvn():
thakis@chromium.orgcde3bb62011-01-20 01:16:14 +00001226 message = """This doesn't appear to be an SVN repository.
1227If your project has a git mirror with an upstream SVN master, you probably need
1228to run 'git svn init', see your project's git mirror documentation.
1229If your project has a true writeable upstream repository, you probably want
1230to run 'git cl push' instead.
1231Choose wisely, if you get this wrong, your commit might appear to succeed but
1232will instead be silently ignored."""
1233 print(message)
maruel@chromium.org90541732011-04-01 17:54:18 +00001234 ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001235 return SendUpstream(parser, args, 'dcommit')
1236
1237
1238@usage('[upstream branch to apply against]')
1239def CMDpush(parser, args):
1240 """commit the current changelist via git"""
1241 if settings.GetIsGitSvn():
1242 print('This appears to be an SVN repository.')
1243 print('Are you sure you didn\'t mean \'git cl dcommit\'?')
maruel@chromium.org90541732011-04-01 17:54:18 +00001244 ask_for_data('[Press enter to push or ctrl-C to quit]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 return SendUpstream(parser, args, 'push')
1246
1247
1248@usage('<patch url or issue id>')
1249def CMDpatch(parser, args):
1250 """patch in a code review"""
1251 parser.add_option('-b', dest='newbranch',
1252 help='create a new branch off trunk for the patch')
1253 parser.add_option('-f', action='store_true', dest='force',
1254 help='with -b, clobber any existing branch')
1255 parser.add_option('--reject', action='store_true', dest='reject',
1256 help='allow failed patches and spew .rej files')
1257 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
1258 help="don't commit after patch applies")
1259 (options, args) = parser.parse_args(args)
1260 if len(args) != 1:
1261 parser.print_help()
1262 return 1
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00001263 issue_arg = args[0]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264
dpranke@chromium.org6a2d0832011-03-18 05:28:42 +00001265 if re.match(r'\d+', issue_arg):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 # Input is an issue id. Figure out the URL.
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00001267 issue = issue_arg
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001268 patch_data = Changelist().GetPatchSetDiff(issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269 else:
1270 # Assume it's a URL to the patch. Default to http.
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00001271 issue_url = FixUrl(issue_arg)
1272 match = re.match(r'.*?/issue(\d+)_\d+.diff', issue_url)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001273 if not match:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001274 DieWithError('Must pass an issue ID or full URL for '
1275 '\'Download raw patch set\'')
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001276 issue = match.group(1)
1277 patch_data = urllib2.urlopen(issue_arg).read()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001278
1279 if options.newbranch:
1280 if options.force:
1281 RunGit(['branch', '-D', options.newbranch],
1282 swallow_stderr=True, error_ok=True)
1283 RunGit(['checkout', '-b', options.newbranch,
1284 Changelist().GetUpstreamBranch()])
1285
1286 # Switch up to the top-level directory, if necessary, in preparation for
1287 # applying the patch.
1288 top = RunGit(['rev-parse', '--show-cdup']).strip()
1289 if top:
1290 os.chdir(top)
1291
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 # Git patches have a/ at the beginning of source paths. We strip that out
1293 # with a sed script rather than the -p flag to patch so we can feed either
1294 # Git or svn-style patches into the same apply command.
1295 # re.sub() should be used but flags=re.MULTILINE is only in python 2.7.
1296 sed_proc = Popen(['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],
1297 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
1298 patch_data = sed_proc.communicate(patch_data)[0]
1299 if sed_proc.returncode:
1300 DieWithError('Git patch mungling failed.')
1301 logging.info(patch_data)
1302 # We use "git apply" to apply the patch instead of "patch" so that we can
1303 # pick up file adds.
1304 # The --index flag means: also insert into the index (so we catch adds).
1305 cmd = ['git', 'apply', '--index', '-p0']
1306 if options.reject:
1307 cmd.append('--reject')
1308 patch_proc = Popen(cmd, stdin=subprocess.PIPE)
1309 patch_proc.communicate(patch_data)
1310 if patch_proc.returncode:
1311 DieWithError('Failed to apply the patch')
1312
1313 # If we had an issue, commit the current state and register the issue.
1314 if not options.nocommit:
1315 RunGit(['commit', '-m', 'patch from issue %s' % issue])
1316 cl = Changelist()
1317 cl.SetIssue(issue)
1318 print "Committed patch."
1319 else:
1320 print "Patch applied to index."
1321 return 0
1322
1323
1324def CMDrebase(parser, args):
1325 """rebase current branch on top of svn repo"""
1326 # Provide a wrapper for git svn rebase to help avoid accidental
1327 # git svn dcommit.
1328 # It's the only command that doesn't use parser at all since we just defer
1329 # execution to git-svn.
1330 RunGit(['svn', 'rebase'] + args, redirect_stdout=False)
1331 return 0
1332
1333
1334def GetTreeStatus():
1335 """Fetches the tree status and returns either 'open', 'closed',
1336 'unknown' or 'unset'."""
1337 url = settings.GetTreeStatusUrl(error_ok=True)
1338 if url:
1339 status = urllib2.urlopen(url).read().lower()
1340 if status.find('closed') != -1 or status == '0':
1341 return 'closed'
1342 elif status.find('open') != -1 or status == '1':
1343 return 'open'
1344 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345 return 'unset'
1346
dpranke@chromium.org970c5222011-03-12 00:32:24 +00001347
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001348def GetTreeStatusReason():
1349 """Fetches the tree status from a json url and returns the message
1350 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00001351 url = settings.GetTreeStatusUrl()
1352 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001353 connection = urllib2.urlopen(json_url)
1354 status = json.loads(connection.read())
1355 connection.close()
1356 return status['message']
1357
dpranke@chromium.org970c5222011-03-12 00:32:24 +00001358
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001359def CMDtree(parser, args):
1360 """show the status of the tree"""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00001361 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362 status = GetTreeStatus()
1363 if 'unset' == status:
1364 print 'You must configure your tree status URL by running "git cl config".'
1365 return 2
1366
1367 print "The tree is %s" % status
1368 print
1369 print GetTreeStatusReason()
1370 if status != 'open':
1371 return 1
1372 return 0
1373
1374
1375def CMDupstream(parser, args):
1376 """print the name of the upstream branch, if any"""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00001377 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001378 cl = Changelist()
1379 print cl.GetUpstreamBranch()
1380 return 0
1381
1382
1383def Command(name):
1384 return getattr(sys.modules[__name__], 'CMD' + name, None)
1385
1386
1387def CMDhelp(parser, args):
1388 """print list of commands or help for a specific command"""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00001389 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001390 if len(args) == 1:
1391 return main(args + ['--help'])
1392 parser.print_help()
1393 return 0
1394
1395
1396def GenUsage(parser, command):
1397 """Modify an OptParse object with the function's documentation."""
1398 obj = Command(command)
1399 more = getattr(obj, 'usage_more', '')
1400 if command == 'help':
1401 command = '<command>'
1402 else:
1403 # OptParser.description prefer nicely non-formatted strings.
1404 parser.description = re.sub('[\r\n ]{2,}', ' ', obj.__doc__)
1405 parser.set_usage('usage: %%prog %s [options] %s' % (command, more))
1406
1407
1408def main(argv):
1409 """Doesn't parse the arguments here, just find the right subcommand to
1410 execute."""
1411 # Do it late so all commands are listed.
1412 CMDhelp.usage_more = ('\n\nCommands are:\n' + '\n'.join([
1413 ' %-10s %s' % (fn[3:], Command(fn[3:]).__doc__.split('\n')[0].strip())
1414 for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')]))
1415
1416 # Create the option parse and add --verbose support.
1417 parser = optparse.OptionParser()
maruel@chromium.org899e1c12011-04-07 17:03:18 +00001418 parser.add_option(
1419 '-v', '--verbose', action='count', default=0,
1420 help='Use 2 times for more debugging info')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 old_parser_args = parser.parse_args
1422 def Parse(args):
1423 options, args = old_parser_args(args)
maruel@chromium.org899e1c12011-04-07 17:03:18 +00001424 if options.verbose >= 2:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001425 logging.basicConfig(level=logging.DEBUG)
maruel@chromium.org899e1c12011-04-07 17:03:18 +00001426 elif options.verbose:
1427 logging.basicConfig(level=logging.INFO)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001428 else:
1429 logging.basicConfig(level=logging.WARNING)
1430 return options, args
1431 parser.parse_args = Parse
1432
1433 if argv:
1434 command = Command(argv[0])
1435 if command:
1436 # "fix" the usage and the description now that we know the subcommand.
1437 GenUsage(parser, argv[0])
1438 try:
1439 return command(parser, argv[1:])
1440 except urllib2.HTTPError, e:
1441 if e.code != 500:
1442 raise
1443 DieWithError(
1444 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
1445 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
1446
1447 # Not a known command. Default to help.
1448 GenUsage(parser, 'help')
1449 return CMDhelp(parser, argv)
1450
1451
1452if __name__ == '__main__':
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00001453 fix_encoding.fix_encoding()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001454 sys.exit(main(sys.argv[1:]))