From 4dbec6722fed762199bf764eb7aea1e5341404e1 Mon Sep 17 00:00:00 2001 From: Ryan Tseng Date: Tue, 14 Feb 2017 12:03:45 -0800 Subject: [PATCH] bot_update: Rewrite repo@HEAD to repo@origin/master BUG=692140,664880 Change-Id: I3ddd899f1841930e601a906d658c5c78e2d76673 Reviewed-on: https://chromium-review.googlesource.com/442707 Reviewed-by: Dirk Pranke Commit-Queue: Ryan Tseng --- recipe_modules/bot_update/resources/bot_update.py | 2 ++ tests/bot_update_coverage_test.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py index 2d9d87eefc..182259c4d3 100755 --- a/recipe_modules/bot_update/resources/bot_update.py +++ b/recipe_modules/bot_update/resources/bot_update.py @@ -354,6 +354,8 @@ def gclient_sync(with_branch_heads, shallow, revisions, break_repo_locks): if break_repo_locks: args += ['--break_repo_locks'] for name, revision in sorted(revisions.iteritems()): + if revision.upper() == 'HEAD': + revision = 'origin/master' args.extend(['--revision', '%s@%s' % (name, revision)]) try: diff --git a/tests/bot_update_coverage_test.py b/tests/bot_update_coverage_test.py index a14da63f95..91ef6832f6 100755 --- a/tests/bot_update_coverage_test.py +++ b/tests/bot_update_coverage_test.py @@ -215,7 +215,7 @@ class BotUpdateUnittests(unittest.TestCase): '--revision', idx_first_revision+1) with self.assertRaises(ValueError): args.index('--revision', idx_second_revision+1) - self.assertEquals(args[idx_first_revision+1], 'src@HEAD') + self.assertEquals(args[idx_first_revision+1], 'src@origin/master') self.assertEquals(args[idx_second_revision+1], 'src/v8@deadbeef') return self.call.records