gcl: Make fix the override_description code and add a silent flag....

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 958 matching lines @@
       revision = re.compile(".*?\nCommitted revision (\d+)",
                             re.DOTALL).match(output).group(1)
       viewvc_url = GetCodeReviewSetting("VIEW_VC")
       change_info.description = change_info.description + '\n'
       if viewvc_url:
         change_info.description += "\nCommitted: " + viewvc_url + revision
       change_info.CloseIssue()
   os.chdir(previous_cwd)
 
 
-def Change(change_info, override_description):
+def Change(change_info, args):
   """Creates/edits a changelist."""
+  silent = FilterFlag(args, "--silent")
+  if (len(args) == 1):
+    filename = args[0]
+    f = open(filename, 'rU')
+    override_description = f.read()
+    f.close()
+  else:
+    override_description = None
+      
   if change_info.issue:
     try:
       description = GetIssueDescription(change_info.issue)
     except urllib2.HTTPError, err:
       if err.code == 404:
         # The user deleted the issue in Rietveld, so forget the old issue id.
         description = change_info.description
         change_info.issue = 0
         change_info.Save()
       else:
@@ skipping 24 matching lines @@
             '\n'.join([f[0] + f[1] for f in affected_files]) + '\n')
   else:
     text += ('\n'.join([f[0] + f[1] for f in affected_files]) + '\n' +
             separator2)
   text += '\n'.join([f[0] + f[1] for f in unaffected_files]) + '\n'
 
   handle, filename = tempfile.mkstemp(text=True)
   os.write(handle, text)
   os.close(handle)
 
-  os.system(GetEditor() + " " + filename)
+  if not silent:
+    os.system(GetEditor() + " " + filename)
 
   result = ReadFile(filename)
   os.remove(filename)
 
   if not result:
     return
 
   split_result = result.split(separator1, 1)
   if len(split_result) != 2:
     ErrorExit("Don't modify the text starting with ---!\n\n" + result)
@@ skipping 173 matching lines @@
   # change didn't exist. All other commands require an existing change.
   fail_on_not_found = command != "try" and command != "change"
   if command == "try" and changename.find(',') != -1:
     change_info = LoadChangelistInfoForMultiple(changename, GetRepositoryRoot(),
                                                 True, True)
   else:
     change_info = ChangeInfo.Load(changename, GetRepositoryRoot(),
                                   fail_on_not_found, True)
 
   if command == "change":
-    if (len(argv) == 4):
-      filename = argv[3]
-      f = open(filename, 'rU')
-      override_description = f.read()
-      f.close()
-    else:
-      override_description = None
-    Change(change_info, override_description)
+    Change(change_info, argv[3:])
   elif command == "lint":
     Lint(change_info, argv[3:])
   elif command == "upload":
     UploadCL(change_info, argv[3:])
   elif command == "presubmit":
     PresubmitCL(change_info)
   elif command in ("commit", "submit"):
     Commit(change_info, argv[3:])
   elif command == "delete":
     change_info.Delete()
@@ skipping 11 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())