Skip to content

C
Chromium_Depot_tools
Commit 34edb9bf authored by iannucci@chromium.org's avatar iannucci@chromium.org
Browse files
Options

Update upload.py in depot_tools to infra.git@3d174a0959ba68a4cd83a5abce9f497e30bfce68 

Includes fix for bug 388937.

R=agable@chromium.org, jrobbins@chromium.org, maruel@chromium.org
BUG=388937

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293259 0039d316-1c4b-4281-b951-d872f2087c98
parent 51259520
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 87 deletions
third_party/upload.py
View file @ 34edb9bf
...@@ -102,22 +102,18 @@ VCS_CVS = "CVS" ...@@ -102,22 +102,18 @@ VCS_CVS = "CVS"
VCS_UNKNOWN = "Unknown" VCS_UNKNOWN = "Unknown"
VCS = [ VCS = [
{ {'name': VCS_MERCURIAL,
'name': VCS_MERCURIAL, 'aliases': ['hg', 'mercurial']},
'aliases': ['hg', 'mercurial'], {'name': VCS_SUBVERSION,
}, { 'aliases': ['svn', 'subversion'],},
'name': VCS_SUBVERSION, {'name': VCS_PERFORCE,
'aliases': ['svn', 'subversion'], 'aliases': ['p4', 'perforce']},
}, { {'name': VCS_GIT,
'name': VCS_PERFORCE, 'aliases': ['git']},
'aliases': ['p4', 'perforce'], {'name': VCS_CVS,
}, { 'aliases': ['cvs']},
'name': VCS_GIT, ]
'aliases': ['git'],
}, {
'name': VCS_CVS,
'aliases': ['cvs'],
}]
VCS_SHORT_NAMES = [] # hg, svn, ... VCS_SHORT_NAMES = [] # hg, svn, ...
VCS_ABBREVIATIONS = {} # alias: name, ... VCS_ABBREVIATIONS = {} # alias: name, ...
...@@ -217,7 +213,7 @@ def StatusUpdate(msg): ...@@ -217,7 +213,7 @@ def StatusUpdate(msg):
def ErrorExit(msg): def ErrorExit(msg):
"""Print an error message to stderr and exit.""" """Print an error message to stderr and exit."""
print >>sys.stderr, msg print >> sys.stderr, msg
sys.exit(1) sys.exit(1)
...@@ -380,41 +376,41 @@ class AbstractRpcServer(object): ...@@ -380,41 +376,41 @@ class AbstractRpcServer(object):
try: try:
auth_token = self._GetAuthToken(credentials[0], credentials[1]) auth_token = self._GetAuthToken(credentials[0], credentials[1])
except ClientLoginError, e: except ClientLoginError, e:
print >>sys.stderr, '' print >> sys.stderr, ''
if e.reason == "BadAuthentication": if e.reason == "BadAuthentication":
if e.info == "InvalidSecondFactor": if e.info == "InvalidSecondFactor":
print >>sys.stderr, ( print >> sys.stderr, (
"Use an application-specific password instead " "Use an application-specific password instead "
"of your regular account password.\n" "of your regular account password.\n"
"See http://www.google.com/" "See http://www.google.com/"
"support/accounts/bin/answer.py?answer=185833") "support/accounts/bin/answer.py?answer=185833")
else: else:
print >>sys.stderr, "Invalid username or password." print >> sys.stderr, "Invalid username or password."
elif e.reason == "CaptchaRequired": elif e.reason == "CaptchaRequired":
print >>sys.stderr, ( print >> sys.stderr, (
"Please go to\n" "Please go to\n"
"https://www.google.com/accounts/DisplayUnlockCaptcha\n" "https://www.google.com/accounts/DisplayUnlockCaptcha\n"
"and verify you are a human. Then try again.\n" "and verify you are a human. Then try again.\n"
"If you are using a Google Apps account the URL is:\n" "If you are using a Google Apps account the URL is:\n"
"https://www.google.com/a/yourdomain.com/UnlockCaptcha") "https://www.google.com/a/yourdomain.com/UnlockCaptcha")
elif e.reason == "NotVerified": elif e.reason == "NotVerified":
print >>sys.stderr, "Account not verified." print >> sys.stderr, "Account not verified."
elif e.reason == "TermsNotAgreed": elif e.reason == "TermsNotAgreed":
print >>sys.stderr, "User has not agreed to TOS." print >> sys.stderr, "User has not agreed to TOS."
elif e.reason == "AccountDeleted": elif e.reason == "AccountDeleted":
print >>sys.stderr, "The user account has been deleted." print >> sys.stderr, "The user account has been deleted."
elif e.reason == "AccountDisabled": elif e.reason == "AccountDisabled":
print >>sys.stderr, "The user account has been disabled." print >> sys.stderr, "The user account has been disabled."
break break
elif e.reason == "ServiceDisabled": elif e.reason == "ServiceDisabled":
print >>sys.stderr, ("The user's access to the service has been " print >> sys.stderr, ("The user's access to the service has been "
"disabled.") "disabled.")
elif e.reason == "ServiceUnavailable": elif e.reason == "ServiceUnavailable":
print >>sys.stderr, "The service is not available; try again later." print >> sys.stderr, "The service is not available; try again later."
else: else:
# Unknown error. # Unknown error.
raise raise
print >>sys.stderr, '' print >> sys.stderr, ''
continue continue
self._GetAuthCookie(auth_token) self._GetAuthCookie(auth_token)
return return
...@@ -461,7 +457,7 @@ class AbstractRpcServer(object): ...@@ -461,7 +457,7 @@ class AbstractRpcServer(object):
for header, value in extra_headers.items(): for header, value in extra_headers.items():
req.add_header(header, value) req.add_header(header, value)
try: try:
f = self.opener.open(req) f = self.opener.open(req, timeout=70)
response = f.read() response = f.read()
f.close() f.close()
return response return response
...@@ -572,7 +568,7 @@ parser = optparse.OptionParser( ...@@ -572,7 +568,7 @@ parser = optparse.OptionParser(
"See also: http://code.google.com/p/rietveld/wiki/UploadPyUsage"), "See also: http://code.google.com/p/rietveld/wiki/UploadPyUsage"),
add_help_option=False, add_help_option=False,
formatter=CondensedHelpFormatter() formatter=CondensedHelpFormatter()
) )
parser.add_option("-h", "--help", action="store_true", parser.add_option("-h", "--help", action="store_true",
help="Show this help message and exit.") help="Show this help message and exit.")
parser.add_option("-y", "--assume_yes", action="store_true", parser.add_option("-y", "--assume_yes", action="store_true",
...@@ -680,8 +676,11 @@ group.add_option("--emulate_svn_auto_props", action="store_true", ...@@ -680,8 +676,11 @@ group.add_option("--emulate_svn_auto_props", action="store_true",
group = parser.add_option_group("Git-specific options") group = parser.add_option_group("Git-specific options")
group.add_option("--git_similarity", action="store", dest="git_similarity", group.add_option("--git_similarity", action="store", dest="git_similarity",
metavar="SIM", type="int", default=50, metavar="SIM", type="int", default=50,
help=("Set the minimum similarity index for detecting renames " help=("Set the minimum similarity percentage for detecting "
"and copies. See `git diff -C`. (default 50).")) "renames and copies. See `git diff -C`. (default 50)."))
group.add_option("--git_only_search_patch", action="store_false", default=True,
dest='git_find_copies_harder',
help="Removes --find-copies-harder when seaching for copies")
group.add_option("--git_no_find_copies", action="store_false", default=True, group.add_option("--git_no_find_copies", action="store_false", default=True,
dest="git_find_copies", dest="git_find_copies",
help=("Prevents git from looking for copies (default off).")) help=("Prevents git from looking for copies (default off)."))
...@@ -1009,7 +1008,7 @@ use_shell = sys.platform.startswith("win") ...@@ -1009,7 +1008,7 @@ use_shell = sys.platform.startswith("win")
def RunShellWithReturnCodeAndStderr(command, print_output=False, def RunShellWithReturnCodeAndStderr(command, print_output=False,
universal_newlines=True, universal_newlines=True,
env=os.environ): env=os.environ):
"""Executes a command and returns the output from stdout, stderr and the return code. """Run a command and return output from stdout, stderr and the return code.
Args: Args:
command: Command to execute. command: Command to execute.
...@@ -1040,7 +1039,7 @@ def RunShellWithReturnCodeAndStderr(command, print_output=False, ...@@ -1040,7 +1039,7 @@ def RunShellWithReturnCodeAndStderr(command, print_output=False,
p.wait() p.wait()
errout = p.stderr.read() errout = p.stderr.read()
if print_output and errout: if print_output and errout:
print >>sys.stderr, errout print >> sys.stderr, errout
p.stdout.close() p.stdout.close()
p.stderr.close() p.stderr.close()
return output, errout, p.returncode return output, errout, p.returncode
...@@ -1048,7 +1047,7 @@ def RunShellWithReturnCodeAndStderr(command, print_output=False, ...@@ -1048,7 +1047,7 @@ def RunShellWithReturnCodeAndStderr(command, print_output=False,
def RunShellWithReturnCode(command, print_output=False, def RunShellWithReturnCode(command, print_output=False,
universal_newlines=True, universal_newlines=True,
env=os.environ): env=os.environ):
"""Executes a command and returns the output from stdout and the return code.""" """Run a command and return output from stdout and the return code."""
out, err, retcode = RunShellWithReturnCodeAndStderr(command, print_output, out, err, retcode = RunShellWithReturnCodeAndStderr(command, print_output,
universal_newlines, env) universal_newlines, env)
return out, retcode return out, retcode
...@@ -1223,7 +1222,8 @@ class VersionControlSystem(object): ...@@ -1223,7 +1222,8 @@ class VersionControlSystem(object):
mimetype = mimetypes.guess_type(filename)[0] mimetype = mimetypes.guess_type(filename)[0]
if not mimetype: if not mimetype:
return False return False
return mimetype.startswith("image/") and not mimetype.startswith("image/svg") return (mimetype.startswith("image/") and
not mimetype.startswith("image/svg"))
def IsBinaryData(self, data): def IsBinaryData(self, data):
"""Returns true if data contains a null byte.""" """Returns true if data contains a null byte."""
...@@ -1341,6 +1341,7 @@ class SubversionVCS(VersionControlSystem): ...@@ -1341,6 +1341,7 @@ class SubversionVCS(VersionControlSystem):
if m.group(2): if m.group(2):
return "$%s::%s$" % (m.group(1), " " * len(m.group(3))) return "$%s::%s$" % (m.group(1), " " * len(m.group(3)))
return "$%s$" % m.group(1) return "$%s$" % m.group(1)
keywords = [keyword keywords = [keyword
for name in keyword_str.split(" ") for name in keyword_str.split(" ")
for keyword in svn_keywords.get(name, [])] for keyword in svn_keywords.get(name, [])]
...@@ -1393,7 +1394,8 @@ class SubversionVCS(VersionControlSystem): ...@@ -1393,7 +1394,8 @@ class SubversionVCS(VersionControlSystem):
if returncode: if returncode:
# Directory might not yet exist at start revison # Directory might not yet exist at start revison
# svn: Unable to find repository location for 'abc' in revision nnn # svn: Unable to find repository location for 'abc' in revision nnn
if re.match('^svn: Unable to find repository location for .+ in revision \d+', err): if re.match('^svn: Unable to find repository location '
'for .+ in revision \d+', err):
old_files = () old_files = ()
else: else:
ErrorExit("Failed to get status for %s:\n%s" % (filename, err)) ErrorExit("Failed to get status for %s:\n%s" % (filename, err))
...@@ -1615,16 +1617,18 @@ class GitVCS(VersionControlSystem): ...@@ -1615,16 +1617,18 @@ class GitVCS(VersionControlSystem):
# append a diff (with rename detection), without deletes. # append a diff (with rename detection), without deletes.
cmd = [ cmd = [
"git", "diff", "--no-color", "--no-ext-diff", "--full-index", "git", "diff", "--no-color", "--no-ext-diff", "--full-index",
"--ignore-submodules", "--ignore-submodules", "--src-prefix=a/", "--dst-prefix=b/",
] ]
diff = RunShell( diff = RunShell(
cmd + ["--no-renames", "--diff-filter=D"] + extra_args, cmd + ["--no-renames", "--diff-filter=D"] + extra_args,
env=env, silent_ok=True) env=env, silent_ok=True)
assert 0 <= self.options.git_similarity <= 100
if self.options.git_find_copies: if self.options.git_find_copies:
similarity_options = ["--find-copies-harder", "-l100000", similarity_options = ["-l100000", "-C%d%%" % self.options.git_similarity]
"-C%s" % self.options.git_similarity ] if self.options.git_find_copies_harder:
similarity_options.append("--find-copies-harder")
else: else:
similarity_options = ["-M%s" % self.options.git_similarity ] similarity_options = ["-M%d%%" % self.options.git_similarity ]
diff += RunShell( diff += RunShell(
cmd + ["--diff-filter=AMCRT"] + similarity_options + extra_args, cmd + ["--diff-filter=AMCRT"] + similarity_options + extra_args,
env=env, silent_ok=True) env=env, silent_ok=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment