Make gclient pack work again by not prefixing "thread_id>"

gclient_scm.py

 # 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
 import sys
 import time
 
 import gclient_utils
 import scm
 import subprocess2
 
 
-class DiffFilterer(object):
+class DiffFiltererWrapper(object):
   """Simple class which tracks which file is being diffed and
   replaces instances of its file name in the original and
   working copy lines of the svn/git diff output."""
-  index_string = "Index: "
+  index_string = ""

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

index_string = None
so the code would fail if not properly overridden.

[haitao.feng, 2012/05/03 09:15:18]

Done.

   original_prefix = "--- "
   working_prefix = "+++ "
 
   def __init__(self, relpath):
     # Note that we always use '/' as the path separator to be
     # consistent with svn's cygwin-style output on Windows
     self._relpath = relpath.replace("\\", "/")
     self._current_file = ""

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

None

[haitao.feng, 2012/05/03 09:15:18]

Done.

     self._replacement_file = ""

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

self._replacement_file is not really needed, you can just use:
@property
def replacement_file(self):
  return posixpath.join(self._relpath, self._current_file)

[haitao.feng, 2012/05/03 09:15:18]

Done.

 
   def SetCurrentFile(self, current_file):
-    self._current_file = current_file
-    # Note that we always use '/' as the path separator to be
-    # consistent with svn's cygwin-style output on Windows
-    self._replacement_file = posixpath.join(self._relpath, current_file)
+    pass
 
   def _Replace(self, line):
-    return line.replace(self._current_file, self._replacement_file)
+    pass
 
   def Filter(self, line):
     if (line.startswith(self.index_string)):
       self.SetCurrentFile(line[len(self.index_string):])
       line = self._Replace(line)
     else:
       if (line.startswith(self.original_prefix) or

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

Note that this will fail to process git diff with a file move/rename.

You may want to look at patch.py, which handles all this in a much better way.
patch.py already has support to "rebase" a diff to a subdirectory.

[haitao.feng, 2012/05/03 09:15:18]

Thanks for the note. Do I need to submit a bug for it? It seems that set_relpath
in patch.py is not used by other commands. How to use the "rebase" functionality
via gclient/gcl/git cl?

[M-A Ruel, 2012/05/03 13:37:07]

It's used in the commit queue, which is in a separate directory, e.g.
chrome/trunk/tools/commit-queue.

But I realized the set_relpath probably has issues with renames too. :)

So it's fine to have an ad-hoc version here, I don't mind.

           line.startswith(self.working_prefix)):
         line = self._Replace(line)
     print(line)
 

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

2 lines

[haitao.feng, 2012/05/03 09:15:18]

Done.

+class SvnDiffFilterer(DiffFiltererWrapper):
+  """Simple class which tracks which file is being diffed and
+  replaces instances of its file name in the original and
+  working copy lines of the svn diff output."""
+  index_string = "Index: "
+
+  def __init__(self, relpath):

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

You can remove this constructor entirely. The class will work fine without it.

[haitao.feng, 2012/05/03 09:15:18]

Done.

+    DiffFiltererWrapper.__init__(self, relpath)
+
+  def SetCurrentFile(self, current_file):
+    self._current_file = current_file
+    self._replacement_file = posixpath.join(self._relpath, current_file)
+
+  def _Replace(self, line):
+    return line.replace(self._current_file, self._replacement_file)
+

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

2 lines

[haitao.feng, 2012/05/03 09:15:18]

Done.

+class GitDiffFilterer(DiffFiltererWrapper):
+  """Simple class which tracks which file is being diffed and
+  replaces instances of its file name in the original and
+  working copy lines of the git diff output."""
+  index_string = "diff --git "
+
+  def __init__(self, relpath):

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

Same, remove

[haitao.feng, 2012/05/03 09:15:18]

Done.

+    DiffFiltererWrapper.__init__(self, relpath)
+
+  def SetCurrentFile(self, current_file):
+    self._current_file = current_file.split()[0][2:]
+    self._replacement_file = posixpath.join(self._relpath, self._current_file)
+
+  def _Replace(self, line):
+    result = line.replace("a/" + self._current_file, self._replacement_file)

[Marc-Antoine Ruel (Google), 2012/05/03 01:30:53]

that's a bit tricky though, if the file name is in the content.

[haitao.feng, 2012/05/03 09:15:18]

Replace with re.sub("[a|b]/" + self._current_file, self._replacement_file, line)

+    return result.replace("b/" + self._current_file, self._replacement_file)
+
 
 def ask_for_data(prompt):
   try:
     return raw_input(prompt)
   except KeyboardInterrupt:
     # Hide the exception.
     sys.exit(1)
 
 
 ### SCM abstraction layer
@@ skipping 107 matching lines @@
     """Generates a patch file which can be applied to the root of the
     repository.
 
     The patch file is generated from a diff of the merge base of HEAD and
     its upstream branch.
     """
     merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
     gclient_utils.CheckCallAndFilter(
         ['git', 'diff', merge_base],
         cwd=self.checkout_path,
-        filter_fn=DiffFilterer(self.relpath).Filter)
+        filter_fn=GitDiffFilterer(self.relpath).Filter)
 
   def update(self, options, args, file_list):
     """Runs git to update or transparently checkout the working copy.
 
     All updated files will be appended to file_list.
 
     Raises:
       Error: if can't get URL for relative path.
     """
     if args:
@@ skipping 632 matching lines @@
   def pack(self, options, args, file_list):
     """Generates a patch file which can be applied to the root of the
     repository."""
     if not os.path.isdir(self.checkout_path):
       raise gclient_utils.Error('Directory %s is not present.' %
           self.checkout_path)
     gclient_utils.CheckCallAndFilter(
         ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
         cwd=self.checkout_path,
         print_stdout=False,
-        filter_fn=DiffFilterer(self.relpath).Filter)
+        filter_fn=SvnDiffFilterer(self.relpath).Filter)
 
   def update(self, options, args, file_list):
     """Runs svn to update or transparently checkout the working copy.
 
     All updated files will be appended to file_list.
 
     Raises:
       Error: if can't get URL for relative path.
     """
     # Only update if git or hg is not controlling the directory.
@@ skipping 311 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command