Revert of git_cl: Add the ability to set the description.

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 distutils.version import LooseVersion
@@ skipping 3261 matching lines @@
     with open(options.json_file, 'wb') as f:
       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)')
 
   _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:
     issue_arg = ParseIssueNumberArgument(args[0])
     if not issue_arg.valid:
       parser.print_help()
       return 1
     target_issue = issue_arg.issue
 
   auth_config = auth.extract_auth_config_from_options(options)
 
   cl = Changelist(
       auth_config=auth_config, issue=target_issue,
       codereview=options.forced_codereview)
 
   if not cl.GetIssue():
     DieWithError('This branch has no associated changelist.')
   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(sys.stdin.splitlines())
-
-    description.set_description(text)
-  else:
-    description.prompt()
-
+  description.prompt()
   if cl.GetDescription() != description.description:
     cl.UpdateDescription(description.description)
   return 0
 
 
 def CreateDescriptionFromLog(args):
   """Pulls out the commit log to use as a base for the CL description."""
   log_args = []
   if len(args) == 1 and not args[0].endswith('.'):
     log_args = [args[0] + '..']
@@ skipping 1546 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)