Fix R= line handling when there is no value and improve presubmit TAG line regex

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import json
@@ skipping 780 matching lines @@
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url', False)
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
-  R_LINE = r'^\s*(TBR|R)\s*=\s*(.+)\s*$'
+  R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
 
   def __init__(self, description):
     self._description = (description or '').strip()
 
   @property
   def description(self):
     return self._description
 
   def update_reviewers(self, reviewers):
     """Rewrites the R=/TBR= line(s) as a single line."""
     assert isinstance(reviewers, list), reviewers
     if not reviewers:
       return
     regexp = re.compile(self.R_LINE, re.MULTILINE)
     matches = list(regexp.finditer(self._description))
     is_tbr = any(m.group(1) == 'TBR' for m in matches)
     if len(matches) > 1:
       # Erase all except the first one.
       for i in xrange(len(matches) - 1, 0, -1):
         self._description = (
             self._description[:matches[i].start()] +
-            self._description[matches[i].end()+1:])
+            self._description[matches[i].end():])
 
     if is_tbr:
       new_r_line = 'TBR=' + ', '.join(reviewers)
     else:
       new_r_line = 'R=' + ', '.join(reviewers)
 
     if matches:
       self._description = (
         self._description[:matches[0].start()] + new_r_line +
-        self._description[matches[0].end()+1:])
+        self._description[matches[0].end():]).strip()
     else:
       self.append_footer(new_r_line)
 
   def prompt(self):
     """Asks the user to update the description."""
     self._description = (
       '# Enter a description of the change.\n'
       '# This will displayed on the codereview site.\n'
       '# The first line will also be used as the subject of the review.\n'
     ) + self._description
@@ skipping 18 matching lines @@
       else:
         last_line = self._description.rsplit('\n', 1)[1]
         if (not presubmit_support.Change.TAG_LINE_RE.match(last_line) or
             not presubmit_support.Change.TAG_LINE_RE.match(line)):
           self._description += '\n'
     self._description += '\n' + line
 
   def get_reviewers(self):
     """Retrieves the list of reviewers."""
     regexp = re.compile(self.R_LINE, re.MULTILINE)
-    reviewers = [i.group(2) for i in regexp.finditer(self._description)]
+    reviewers = [i.group(2).strip() for i in regexp.finditer(self._description)]
     return cleanup_list(reviewers)
 
 
 def FindCodereviewSettingsFile(filename='codereview.settings'):
   """Finds the given file starting in the cwd and going up.
 
   Only looks up to the top of the repository unless an
   'inherit-review-settings-ok' file exists in the root of the repository.
   """
   inherit_ok_file = 'inherit-review-settings-ok'
@@ skipping 1085 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))