Fix gcl sometimes stripping the new line characters when changing the issue description on the se...

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 simplifies working with groups
 of files.
 """
 
@@ skipping 1077 matching lines @@
   file_re = re.compile(r"^[a-z].+\Z", re.IGNORECASE)
   affected_files = [x for x in other_files if file_re.match(x[0])]
   unaffected_files = [x for x in other_files if not file_re.match(x[0])]
 
   description = description.rstrip() + '\n'
 
   separator1 = ("\n---All lines above this line become the description.\n"
                 "---Repository Root: " + change_info.GetLocalRoot() + "\n"
                 "---Paths in this changelist (" + change_info.name + "):\n")
   separator2 = "\n\n---Paths modified but not in any changelist:\n\n"
-  text = (description + separator1 + '\n' +
+  
+  description_to_write = description
+  if sys.platform == 'win32':
+    description_to_write = description.replace('\n', '\r\n')
+  
+  text = (description_to_write + separator1 + '\n' +
           '\n'.join([f[0] + f[1] for f in change_info.GetFiles()]))
 
   if change_info.Exists():
     text += (separator2 +
             '\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)
-
   # Open up the default editor in the system to get the CL description.
   try:
     if not silent:
       cmd = '%s %s' % (GetEditor(), filename)
       if sys.platform == 'win32' and os.environ.get('TERM') == 'msys':
         # Msysgit requires the usage of 'env' to be present.
         cmd = 'env ' + cmd
       try:
         # shell=True to allow the shell to handle all forms of quotes in
         # $EDITOR.
         subprocess2.check_call(cmd, shell=True)
       except subprocess2.CalledProcessError, e:
         ErrorExit('Editor returned %d' % e.returncode)
     result = gclient_utils.FileRead(filename, 'r')
   finally:
     os.remove(filename)
 
   if not result:
     return 0
 
   split_result = result.split(separator1, 1)
   if len(split_result) != 2:
     ErrorExit("Don't modify the text starting with ---!\n\n" + result)
 
   # Update the CL description if it has changed.
   new_description = split_result[0]
+  
+  if sys.platform == 'win32':
+    new_description = new_description.replace('\r\n', '\n')
+  
   cl_files_text = split_result[1]
   if new_description != description or override_description:
     change_info.description = new_description
     change_info.needs_upload = True
 
   new_cl_files = []
   for line in cl_files_text.splitlines():
     if not len(line):
       continue
     if line.startswith("---"):
@@ skipping 312 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))