AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[Release] Remove usage of roll ref

Browse Source 
The roll ref is no longer used because we
simply roll the lkgr ref.

LOG=N
NOTRY=true
R=machenbach@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#31140}
This commit is contained in:
hablich 2015-10-07 03:27:06 -07:00 committed by Commit bot
parent 6fbf7903f9
commit e267936c42
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/release/mergeinfo.py
View File

@ -57,10 +57,6 @@ def get_branches_for_commit(git_working_dir, hash_to_search):
branches = branches.splitlines() branches = branches.splitlines()
return map(str.strip, branches) return map(str.strip, branches)
def is_rolling(git_working_dir, hash_to_search):
branches = get_branches_for_commit(git_working_dir, hash_to_search)
return 'remotes/origin/roll' in branches
def is_lkgr(git_working_dir, hash_to_search): def is_lkgr(git_working_dir, hash_to_search):
branches = get_branches_for_commit(git_working_dir, hash_to_search) branches = get_branches_for_commit(git_working_dir, hash_to_search)
return 'remotes/origin/lkgr' in branches return 'remotes/origin/lkgr' in branches
@ -79,9 +75,7 @@ def print_analysis(git_working_dir, hash_to_search):
print '=====================ORIGINAL COMMIT START===================' print '=====================ORIGINAL COMMIT START==================='
print describe_commit(git_working_dir, hash_to_search) print describe_commit(git_working_dir, hash_to_search)
print '=====================ORIGINAL COMMIT END=====================' print '=====================ORIGINAL COMMIT END====================='
print '2.) General information:' print '2.) General information:'
print 'Is rolling: ' + str(is_rolling(git_working_dir, hash_to_search))
print 'Is LKGR: ' + str(is_lkgr(git_working_dir, hash_to_search)) print 'Is LKGR: ' + str(is_lkgr(git_working_dir, hash_to_search))
print 'Is on Canary: ' + ( print 'Is on Canary: ' + (
str(get_first_canary(git_working_dir, hash_to_search))) str(get_first_canary(git_working_dir, hash_to_search)))

12
tools/release/test_mergeinfo.py
View File

@ -151,18 +151,6 @@ class TestMergeInfo(unittest.TestCase):
self.assertTrue(hash_of_hit in merges) self.assertTrue(hash_of_hit in merges)
self.assertTrue(hash_of_ignored not in merges) self.assertTrue(hash_of_ignored not in merges)
def testIsRolling(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
self._make_empty_commit('This one is the roll head')
self._execute_git(['branch', 'remotes/origin/roll'])
hash_of_not_rolled = self._make_empty_commit('This one is not yet rolled')
self.assertTrue(mergeinfo.is_rolling(
self.base_dir, hash_of_first_commit))
self.assertFalse(mergeinfo.is_rolling(
self.base_dir, hash_of_not_rolled))
def testIsLkgr(self): def testIsLkgr(self):
commits = self._get_commits() commits = self._get_commits()
hash_of_first_commit = commits[0] hash_of_first_commit = commits[0]