git_cl: Enable updating description from local.

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 and Gerrit."""
 
 from __future__ import print_function
@@ skipping 1304 matching lines @@
           'last-upload-hash',
           self._codereview_impl.IssueConfigKey(),
           self._codereview_impl.PatchsetConfigKey(),
           self._codereview_impl.CodereviewServerConfigKey(),
       ] + self._PostUnsetIssueProperties()
       for prop in reset_suffixes:
         self._GitSetBranchConfigValue(prop, None, error_ok=True)
       self.issue = None
       self.patchset = None
 
-  def GetChange(self, upstream_branch, author):
+  def GetChange(self, upstream_branch, author, local_description=False):
     if not self.GitSanityChecks(upstream_branch):
       DieWithError('\nGit sanity check failure')
 
     root = settings.GetRelativeRoot()
     if not root:
       root = '.'
     absroot = os.path.abspath(root)
 
     # We use the sha1 of HEAD as a name of this change.
     name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
     # Need to pass a relative path for msysgit.
     try:
       files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
     except subprocess2.CalledProcessError:
       DieWithError(
           ('\nFailed to diff against upstream branch %s\n\n'
            'This branch probably doesn\'t exist anymore. To reset the\n'
            'tracking branch, please run\n'
            '    git branch --set-upstream %s trunk\n'
            'replacing trunk with origin/master or the relevant branch') %
           (upstream_branch, self.GetBranch()))
 
     issue = self.GetIssue()
     patchset = self.GetPatchset()
-    if issue:
+    if issue and not local_description:
       description = self.GetDescription()
     else:
       # If the change was never uploaded, use the log messages of all commits
       # up to the branch point, as git cl upload will prefill the description
       # with these log messages.
       args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
       description = RunGitWithCode(args)[1].strip()
 
     if not author:
       author = RunGit(['config', 'user.email']).strip() or None
@@ skipping 2213 matching lines @@
       json.dump(summary, f)
   return 0
 
 
 @subcommand.usage('[codereview url or issue id]')
 def CMDdescription(parser, args):
   """Brings up the editor for the current CL's description."""
   parser.add_option('-d', '--display', action='store_true',
                     help='Display the description instead of opening an editor')
   parser.add_option('-n', '--new-description',
-                    help='New description to set for this issue (- for stdin)')
+                    help='New description to set for this issue (- for stdin, '
+                         '+ to load from local commit HEAD)')
 
   _add_codereview_select_options(parser)
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   _process_codereview_select_options(parser, options)
 
   target_issue = None
   if len(args) > 0:
     target_issue = ParseIssueNumberArgument(args[0])
     if not target_issue.valid:
@@ skipping 18 matching lines @@
   description = ChangeDescription(cl.GetDescription())
 
   if options.display:
     print(description.description)
     return 0
 
   if options.new_description:
     text = options.new_description
     if text == '-':
       text = '\n'.join(l.rstrip() for l in sys.stdin)
+    elif text == '+':
+      base_branch = cl.GetCommonAncestorWithUpstream()
+      change = cl.GetChange(base_branch, None, local_description=True)
+      text = change.FullDescriptionText()
 
     description.set_description(text)
   else:
     description.prompt()
 
   if cl.GetDescription() != description.description:
     cl.UpdateDescription(description.description)
   return 0
 
 
@@ skipping 1584 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)