# 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",
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 = '''
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.
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