aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove gclient_utils.CheckCall() usage from scm.py

Browse Source 
Remove reference to shutil while at it.

R=dpranke@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/7851001

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100182 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
maruel@chromium.org 14 years ago
parent ca0f839801
commit da64d639c1
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File

56
scm.py
Unescape Escape View File

@ -1,4 +1,4 @@
# Copyright (c) 2010 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
@ -9,8 +9,6 @@ import glob
import logging import logging
import os import os
import re import re
import shutil
import subprocess
import sys import sys
import tempfile import tempfile
import time import time
@ -90,8 +88,8 @@ def determine_scm(root):
class GIT(object): class GIT(object):
@staticmethod @staticmethod
def Capture(args, **kwargs): def Capture(args, **kwargs):
return gclient_utils.CheckCall(['git'] + args, print_error=False, return subprocess2.check_output(
**kwargs)[0] ['git'] + args, stderr=subprocess2.VOID, **kwargs)
@staticmethod @staticmethod
def CaptureStatus(files, upstream_branch=None): def CaptureStatus(files, upstream_branch=None):
@ -133,7 +131,7 @@ class GIT(object):
# should be fine for now, users should simply configure their git settings. # should be fine for now, users should simply configure their git settings.
try: try:
return GIT.Capture(['config', 'user.email'], cwd=cwd).strip() return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
return '' return ''
@staticmethod @staticmethod
@ -158,7 +156,7 @@ class GIT(object):
try: try:
GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd) GIT.Capture(['config', '--get-regexp', r'^svn-remote\.'], cwd=cwd)
return True return True
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
return False return False
@staticmethod @staticmethod
@ -218,7 +216,7 @@ class GIT(object):
# pipe at a time. # pipe at a time.
# The -100 is an arbitrary limit so we don't search forever. # The -100 is an arbitrary limit so we don't search forever.
cmd = ['git', 'log', '-100', '--pretty=medium'] cmd = ['git', 'log', '-100', '--pretty=medium']
proc = gclient_utils.Popen(cmd, stdout=subprocess.PIPE) proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE)
url = None url = None
for line in proc.stdout: for line in proc.stdout:
match = git_svn_re.match(line) match = git_svn_re.match(line)
@ -241,7 +239,7 @@ class GIT(object):
['config', 'svn-remote.%s.fetch' % remote], ['config', 'svn-remote.%s.fetch' % remote],
cwd=cwd).strip() cwd=cwd).strip()
branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False) branch = GIT.MatchSvnGlob(url, base_url, fetch_spec, False)
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
branch = None branch = None
if branch: if branch:
return branch return branch
@ -250,7 +248,7 @@ class GIT(object):
['config', 'svn-remote.%s.branches' % remote], ['config', 'svn-remote.%s.branches' % remote],
cwd=cwd).strip() cwd=cwd).strip()
branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True) branch = GIT.MatchSvnGlob(url, base_url, branch_spec, True)
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
branch = None branch = None
if branch: if branch:
return branch return branch
@ -259,7 +257,7 @@ class GIT(object):
['config', 'svn-remote.%s.tags' % remote], ['config', 'svn-remote.%s.tags' % remote],
cwd=cwd).strip() cwd=cwd).strip()
branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True) branch = GIT.MatchSvnGlob(url, base_url, tag_spec, True)
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
branch = None branch = None
if branch: if branch:
return branch return branch
@ -275,25 +273,25 @@ class GIT(object):
try: try:
upstream_branch = GIT.Capture( upstream_branch = GIT.Capture(
['config', 'branch.%s.merge' % branch], cwd=cwd).strip() ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
upstream_branch = None upstream_branch = None
if upstream_branch: if upstream_branch:
try: try:
remote = GIT.Capture( remote = GIT.Capture(
['config', 'branch.%s.remote' % branch], cwd=cwd).strip() ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
pass pass
else: else:
try: try:
upstream_branch = GIT.Capture( upstream_branch = GIT.Capture(
['config', 'rietveld.upstream-branch'], cwd=cwd).strip() ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
upstream_branch = None upstream_branch = None
if upstream_branch: if upstream_branch:
try: try:
remote = GIT.Capture( remote = GIT.Capture(
['config', 'rietveld.upstream-remote'], cwd=cwd).strip() ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
pass pass
else: else:
# Fall back on trying a git-svn upstream branch. # Fall back on trying a git-svn upstream branch.
@ -397,9 +395,9 @@ class SVN(object):
def Capture(args, **kwargs): def Capture(args, **kwargs):
"""Always redirect stderr. """Always redirect stderr.
Throws an exception if non-0 is returned.""" Throws an exception if non-0 is returned.
return gclient_utils.CheckCall(['svn'] + args, print_error=False, """
**kwargs)[0] return subprocess2.check_output(['svn'] + args, **kwargs)
@staticmethod @staticmethod
def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None): def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
@ -464,7 +462,7 @@ class SVN(object):
always=verbose, always=verbose,
filter_fn=CaptureMatchingLines, filter_fn=CaptureMatchingLines,
stdout=stdout) stdout=stdout)
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
def IsKnownFailure(): def IsKnownFailure():
for x in failure: for x in failure:
if (x.startswith('svn: OPTIONS of') or if (x.startswith('svn: OPTIONS of') or
@ -665,7 +663,7 @@ class SVN(object):
""" """
try: try:
return SVN.Capture(['propget', property_name, filename]) return SVN.Capture(['propget', property_name, filename])
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
return '' return ''
@staticmethod @staticmethod
@ -691,7 +689,7 @@ class SVN(object):
bogus_dir, bogus_dir,
full_move=full_move, revision=revision) full_move=full_move, revision=revision)
finally: finally:
shutil.rmtree(bogus_dir) gclient_utils.RemoveDirectory(bogus_dir)
@staticmethod @staticmethod
def _DiffItemInternal(filename, info, bogus_dir, full_move=False, def _DiffItemInternal(filename, info, bogus_dir, full_move=False,
@ -741,7 +739,7 @@ class SVN(object):
# Normal simple case. # Normal simple case.
try: try:
data = SVN.Capture(command) data = SVN.Capture(command)
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
if revision: if revision:
data = GenFakeDiff(filename) data = GenFakeDiff(filename)
else: else:
@ -805,7 +803,7 @@ class SVN(object):
src = srcurl[len(root)+1:] src = srcurl[len(root)+1:]
try: try:
srcinfo = SVN.CaptureInfo(srcurl) srcinfo = SVN.CaptureInfo(srcurl)
except gclient_utils.CheckCallError, e: except subprocess2.CalledProcessError, e:
if not 'Not a valid URL' in e.stderr: if not 'Not a valid URL' in e.stderr:
raise raise
# Assume the file was deleted. No idea how to figure out at which # Assume the file was deleted. No idea how to figure out at which
@ -839,14 +837,14 @@ class SVN(object):
return result return result
finally: finally:
os.chdir(previous_cwd) os.chdir(previous_cwd)
shutil.rmtree(bogus_dir) gclient_utils.RemoveDirectory(bogus_dir)
@staticmethod @staticmethod
def GetEmail(repo_root): def GetEmail(repo_root):
"""Retrieves the svn account which we assume is an email address.""" """Retrieves the svn account which we assume is an email address."""
try: try:
infos = SVN.CaptureInfo(repo_root) infos = SVN.CaptureInfo(repo_root)
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
return None return None
# Should check for uuid but it is incorrectly saved for https creds. # Should check for uuid but it is incorrectly saved for https creds.
@ -908,7 +906,7 @@ class SVN(object):
info = SVN.CaptureInfo(directory) info = SVN.CaptureInfo(directory)
cur_dir_repo_root = info['Repository Root'] cur_dir_repo_root = info['Repository Root']
url = info['URL'] url = info['URL']
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
return None return None
while True: while True:
parent = os.path.dirname(directory) parent = os.path.dirname(directory)
@ -918,7 +916,7 @@ class SVN(object):
info['URL'] != os.path.dirname(url)): info['URL'] != os.path.dirname(url)):
break break
url = info['URL'] url = info['URL']
except (gclient_utils.Error, subprocess2.CalledProcessError): except subprocess2.CalledProcessError:
break break
directory = parent directory = parent
return GetCasedPath(directory) return GetCasedPath(directory)
@ -973,7 +971,7 @@ class SVN(object):
logging.info('os.remove(%s)' % file_path) logging.info('os.remove(%s)' % file_path)
os.remove(file_path) os.remove(file_path)
elif os.path.isdir(file_path): elif os.path.isdir(file_path):
logging.info('gclient_utils.RemoveDirectory(%s)' % file_path) logging.info('RemoveDirectory(%s)' % file_path)
gclient_utils.RemoveDirectory(file_path) gclient_utils.RemoveDirectory(file_path)
else: else:
logging.critical( logging.critical(
@ -986,7 +984,7 @@ class SVN(object):
# revert, like for properties. # revert, like for properties.
try: try:
SVN.Capture(['revert', file_status[1]], cwd=repo_root) SVN.Capture(['revert', file_status[1]], cwd=repo_root)
except gclient_utils.CheckCallError: except subprocess2.CalledProcessError:
if not os.path.exists(file_path): if not os.path.exists(file_path):
continue continue
raise raise

Write Preview
Loading…
Cancel
Save