Add gclient_scm.GitWrapper.pack()

gclient_scm.py

 # Copyright (c) 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
+import posixpath
 import re
 import subprocess
 
 import scm
 import gclient_utils
 
 
+class DiffFilterer(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 diff output."""
+  index_string = "Index: "
+  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 = ""
+    self._replacement_file = ""
+
+  def SetCurrentFile(self, file):
+    self._current_file = 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, file)
+
+  def ReplaceAndPrint(self, line):
+    print(line.replace(self._current_file, self._replacement_file))
+
+  def Filter(self, line):
+    if (line.startswith(self.index_string)):
+      self.SetCurrentFile(line[len(self.index_string):])
+      self.ReplaceAndPrint(line)
+    else:
+      if (line.startswith(self.original_prefix) or
+          line.startswith(self.working_prefix)):
+        self.ReplaceAndPrint(line)
+      else:
+        print line
+
+
 ### SCM abstraction layer
 
 # Factory Method for SCM wrapper creation
 
 def CreateSCM(url=None, root_dir=None, relpath=None, scm_name='svn'):
   # TODO(maruel): Deduce the SCM from the url.
   scm_map = {
     'svn' : SVNWrapper,
     'git' : GitWrapper,
   }
@@ skipping 36 matching lines @@
     if file_list is None:
       file_list = []
 
     commands = ['cleanup', 'export', 'update', 'revert', 'revinfo',
                 'status', 'diff', 'pack', 'runhooks']
 
     if not command in commands:
       raise gclient_utils.Error('Unknown command %s' % command)
 
     if not command in dir(self):
-      raise gclient_utils.Error('Command %s not implemnted in %s wrapper' % (
+      raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
           command, self.scm_name))
 
     return getattr(self, command)(options, args, file_list)
 
 
 class GitWrapper(SCMWrapper, scm.GIT):
   """Wrapper for Git"""
 
   def cleanup(self, options, args, file_list):
     """Cleanup working copy."""
     __pychecker__ = 'unusednames=args,file_list,options'
     self._Run(['prune'], redirect_stdout=False)
     self._Run(['fsck'], redirect_stdout=False)
     self._Run(['gc'], redirect_stdout=False)
 
   def diff(self, options, args, file_list):
     __pychecker__ = 'unusednames=args,file_list,options'
     merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
     self._Run(['diff', merge_base], redirect_stdout=False)
 
   def export(self, options, args, file_list):
     __pychecker__ = 'unusednames=file_list,options'
     assert len(args) == 1
     export_path = os.path.abspath(os.path.join(args[0], self.relpath))
     if not os.path.exists(export_path):
       os.makedirs(export_path)
     self._Run(['checkout-index', '-a', '--prefix=%s/' % export_path],
               redirect_stdout=False)
 
+  def pack(self, options, args, file_list):
+    """Generates a patch file which can be applied to the root of the
+    repository."""
+    __pychecker__ = 'unusednames=file_list,options'
+    path = os.path.join(self._root_dir, self.relpath)
+    merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
+    command = ['diff', merge_base]
+    filterer = DiffFilterer(self.relpath)
+    self.RunAndFilterOutput(command, path, False, False, filterer.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 159 matching lines @@
     export_path = os.path.abspath(os.path.join(args[0], self.relpath))
     try:
       os.makedirs(export_path)
     except OSError:
       pass
     assert os.path.exists(export_path)
     command = ['export', '--force', '.']
     command.append(export_path)
     self.Run(command, os.path.join(self._root_dir, self.relpath))
 
+  def pack(self, options, args, file_list):
+    """Generates a patch file which can be applied to the root of the
+    repository."""
+    __pychecker__ = 'unusednames=file_list,options'
+    path = os.path.join(self._root_dir, self.relpath)
+    command = ['diff']
+    command.extend(args)
+
+    filterer = DiffFilterer(self.relpath)
+    self.RunAndFilterOutput(command, path, False, False, filterer.Filter)
+
   def update(self, options, args, file_list):
     """Runs SCM 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 is not controlling the directory.
     checkout_path = os.path.join(self._root_dir, self.relpath)
@@ skipping 167 matching lines @@
     command = ['status']
     command.extend(args)
     if not os.path.isdir(path):
       # svn status won't work if the directory doesn't exist.
       print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
             "does not exist."
             % (' '.join(command), path))
       # There's no file list to retrieve.
     else:
       self.RunAndGetFileList(options, command, path, file_list)
-
-  def pack(self, options, args, file_list):
-    """Generates a patch file which can be applied to the root of the
-    repository."""
-    __pychecker__ = 'unusednames=file_list,options'
-    path = os.path.join(self._root_dir, self.relpath)
-    command = ['diff']
-    command.extend(args)
-    # 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.
-    class DiffFilterer(object):
-      index_string = "Index: "
-      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 = ""
-        self._replacement_file = ""
-
-      def SetCurrentFile(self, file):
-        self._current_file = file
-        # Note that we always use '/' as the path separator to be
-        # consistent with svn's cygwin-style output on Windows
-        self._replacement_file = self._relpath + '/' + file
-
-      def ReplaceAndPrint(self, line):
-        print(line.replace(self._current_file, self._replacement_file))
-
-      def Filter(self, line):
-        if (line.startswith(self.index_string)):
-          self.SetCurrentFile(line[len(self.index_string):])
-          self.ReplaceAndPrint(line)
-        else:
-          if (line.startswith(self.original_prefix) or
-              line.startswith(self.working_prefix)):
-            self.ReplaceAndPrint(line)
-          else:
-            print line
-
-    filterer = DiffFilterer(self.relpath)
-    self.RunAndFilterOutput(command, path, False, False, filterer.Filter)