Use the function recently added to common in svndiff.py

GetModifiedFiles() function was added to common repo in
https://skia.googlesource.com/common/+/af1de867422c42855ae54ed3838c62ea445ea6b4

BUG=None
TEST=None
R=borenet@google.com

Review URL: https://codereview.chromium.org/634313006

diff --git a/DEPS b/DEPS
index 9fb9078..f883b58 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@ use_relative_paths = True
 # Dependencies on outside packages.
 #
 deps = {
-  "common": "https://skia.googlesource.com/common.git@5dd2918f96b277ebe04eb66469ec3d5c7ba6952a",
+  "common": "https://skia.googlesource.com/common.git@af1de867422c42855ae54ed3838c62ea445ea6b4",
 
   "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@23a8a433529d9db23882c702a29d5e594841563d",
   "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",

diff --git a/tools/svndiff.py b/tools/svndiff.py
index 716d497..deb1b55 100755 (executable)
--- a/tools/svndiff.py
+++ b/tools/svndiff.py
@@ -46,6 +46,11 @@ import gm_json
 import jsondiff
 import svn
 
+CHECKOUT_ROOT = os.path.realpath(
+    os.path.join(os.path.dirname(__file__), os.pardir))
+sys.path.append(CHECKOUT_ROOT)
+from common.py.utils import git_utils
+
 USAGE_STRING = 'Usage: %s [options]'
 HELP_STRING = '''
 
@@ -185,12 +190,6 @@ def _RunCommand(args):
         raise Exception('command "%s" failed: %s' % (args, stderr))
     return stdout
 
-def _GitGetModifiedFiles():
-    """Returns a list of locally modified files within the current working dir.
-
-    TODO(epoger): Move this into a git utility package?
-    """
-    return _RunCommand(['git', 'ls-files', '-m']).splitlines()
 
 def _GitExportBaseVersionOfFile(file_within_repo, dest_path):
     """Retrieves a copy of the base version of a file within the repository.
@@ -254,7 +253,7 @@ def SvnDiff(path_to_skdiff, dest_dir, source_dir):
         modified_file_paths = svn_repo.GetFilesWithStatus(
             svn.STATUS_ADDED | svn.STATUS_DELETED | svn.STATUS_MODIFIED)
     else:
-        modified_file_paths = _GitGetModifiedFiles()
+        modified_file_paths = git_utils.GetModifiedFiles()
 
     # For each modified file:
     # 1. copy its current contents into modified_flattened_dir