Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: tools/auto_bisect/source_control.py

Issue 470803009: Teach bisect script to resolve Cr-Commit-Positions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/auto_bisect/source_control.py
diff --git a/tools/auto_bisect/source_control.py b/tools/auto_bisect/source_control.py
index ea6bde8bafb0338773489371a3ecdf101154cfcc..a6a30cc401cb820250dc3720b6179102156b3113 100644
--- a/tools/auto_bisect/source_control.py
+++ b/tools/auto_bisect/source_control.py
@@ -114,7 +114,7 @@ class GitSourceControl(SourceControl):
def ResolveToRevision(self, revision_to_check, depot, depot_deps_dict,
search, cwd=None):
- """If an SVN revision is supplied, try to resolve it to a git SHA1.
+ """Tries to resolve an SVN revision or commit position to a git SHA1.
Args:
revision_to_check: The user supplied revision string that may need to be
@@ -151,8 +151,9 @@ class GitSourceControl(SourceControl):
for i in search_range:
svn_pattern = 'git-svn-id: %s@%d' % (depot_svn, i)
+ commit_position_pattern = 'Cr-Commit-Position: .*@{#%d}' % i
cmd = ['log', '--format=%H', '-1', '--grep', svn_pattern,
- 'origin/master']
+ '--grep', commit_position_pattern, 'origin/master']
(log_output, return_code) = bisect_utils.RunGit(cmd, cwd=cwd)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698