Use the function recently added to common in svndiff.py

tools/svndiff.py

 #!/usr/bin/python
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
 Generates a visual diff of all pending changes in the local SVN (or git!)
@@ skipping 28 matching lines @@
 # the 'tools' directory containing this script, which will be the case if
 # 'trunk' was checked out as a single unit.
 GM_DIRECTORY = os.path.realpath(
     os.path.join(os.path.dirname(os.path.dirname(__file__)), 'gm'))
 if GM_DIRECTORY not in sys.path:
     sys.path.append(GM_DIRECTORY)
 import gm_json
 import jsondiff
 import svn
 
+from common.py.utils import git_utils

[tfarina, 2014/10/09 03:07:10]

is this right? I'm not familiar with python way to import things. I copied from
roll_deps.py

gm/rebaseline_server/ scripts do it differently, as:

from py.utils import git_utils

[borenet, 2014/10/09 12:14:36]

It depends on what's in PYTHONPATH.  I'm fine with using "from common.py.utils",
but you'll need to add the checkout root to PYTHONPATH:

CHECKOUT_ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__),
os.pardir))
sys.path.append(CHECKOUT_ROOT)

I believe that in the buildbot repo we added the common directory to PYTHONPATH
(hence "from py.utils") because "common" conflicts with a directory added to
PYTHONPATH by upstream code.

[tfarina, 2014/10/10 00:03:59]

Done.

+
 USAGE_STRING = 'Usage: %s [options]'
 HELP_STRING = '''
 
 Generates a visual diff of all pending changes in the local SVN/git checkout.
 
 This includes a list of all files that have been added, deleted, or modified
 (as far as SVN/git knows about).  For any image modifications, pixel diffs will
 be generated.
 
 '''
@@ skipping 119 matching lines @@
     @param args a list of arguments
     """
     proc = subprocess.Popen(args,
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE)
     (stdout, stderr) = proc.communicate()
     if proc.returncode is not 0:
         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.
 
     @param file_within_repo path to the file within the repo whose base
            version you wish to obtain
     @param dest_path destination to which to write the base content
 
     TODO(epoger): Move this into a git utility package?
     """
@@ skipping 43 matching lines @@
     for dir in [modified_flattened_dir, original_flattened_dir, diff_dir] :
         shutil.rmtree(dir, ignore_errors=True)
         os.mkdir(dir)
 
     # Get a list of all locally modified (including added/deleted) files,
     # descending subdirectories.
     if using_svn:
         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
     # 2. copy its original contents into original_flattened_dir
     for modified_file_path in modified_file_paths:
         if modified_file_path.endswith('.json'):
             # Special handling for JSON files, in the hopes that they
             # contain GM result summaries.
             original_file = tempfile.NamedTemporaryFile(delete = False)
             original_file.close()
@@ skipping 59 matching lines @@
                       help='path to already-built skdiff tool; if not set, '
                       'will search for it in typical directories near this '
                       'script')
     parser.add_option(OPTION_SOURCE_DIR,
                       action='store', type='string',
                       default=os.path.join('expectations', 'gm'),
                       help='root directory within which to compare all ' +
                       'files; defaults to "%default"')
     (options, args) = parser.parse_args()
     Main(options, args)