Fix resolving svn revisions in release scripts.

BUG=chromium:410721
LOG=n
TEST=script_test.py
R=tandrii@chromium.org
TBR=tandrii@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24247 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py
index 456156f..a1e6256 100644 (file)
--- a/tools/push-to-trunk/git_recipes.py
+++ b/tools/push-to-trunk/git_recipes.py
@@ -295,8 +295,11 @@ class GitRecipesMixin(object):
   @Strip
   def GitSVNFindGitHash(self, revision, branch="", **kwargs):
     assert revision
-    return self.Git(
-        MakeArgs(["svn find-rev", "r%s" % revision, branch]), **kwargs)
+    args = MakeArgs(["svn find-rev", "r%s" % revision, branch])
+
+    # Pick the last line if multiple lines are available. The first lines might
+    # print information about rebuilding the svn-git mapping.
+    return self.Git(args, **kwargs).splitlines()[-1]
 
   @Strip
   def GitSVNFindSVNRev(self, git_hash, branch="", **kwargs):

diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py
index bca7ae6..4edb348 100644 (file)
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -1221,7 +1221,8 @@ LOG=N
       Cmd("git svn find-rev hash3 origin/master", "56789"),
       Cmd("git log -1 --format=%s hash3", "Title3"),
       RL("Y"),  # Automatically add corresponding ports (34567, 56789)?
-      Cmd("git svn find-rev r12345 origin/master", "hash4"),
+      Cmd("git svn find-rev r12345 origin/master",
+          "Partial-rebuilding bla\nDone rebuilding blub\nhash4"),
       # Simulate svn being down which stops the script.
       Cmd("git svn find-rev r23456 origin/master", None),
       # Restart script in the failing step.