From bf13f08b0407c96447862fb66725b5b9b6005638 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Wed, 24 Sep 2014 23:48:33 +0000 Subject: [PATCH] Fix roll_dep.py to print the right latest SVN revision number on error. TEST="roll_dep.py breakpad/src 10000" should print ~1387, not 4. Review URL: https://codereview.chromium.org/604463002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292129 0039d316-1c4b-4281-b951-d872f2087c98 --- roll_dep.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roll_dep.py b/roll_dep.py index f071fcc01c..953b0e106d 100755 --- a/roll_dep.py +++ b/roll_dep.py @@ -107,6 +107,7 @@ def convert_svn_revision(dep_path, revision): """Find the git revision corresponding to an svn revision.""" err_msg = 'Unknown error' revision = int(revision) + latest_svn_rev = None with open(os.devnull, 'w') as devnull: for ref in ('HEAD', 'origin/master'): try: @@ -126,6 +127,8 @@ def convert_svn_revision(dep_path, revision): print >> sys.stderr, ( 'WARNING: Could not parse svn revision out of "%s"' % line) continue + if not latest_svn_rev or int(svn_rev) > int(latest_svn_rev): + latest_svn_rev = svn_rev if svn_rev == revision: return git_rev if svn_rev > revision: @@ -137,7 +140,8 @@ def convert_svn_revision(dep_path, revision): else: err_msg = ( 'latest available revision is %d; you may need to ' - '"git fetch origin" to get the latest commits.' % svn_rev) + '"git fetch origin" to get the latest commits.' % + latest_svn_rev) finally: log_p.terminate() grep_p.terminate()