Chromium Code Reviews| Index: scripts/slave/chromium_commands.py |
| =================================================================== |
| --- scripts/slave/chromium_commands.py (revision 118512) |
| +++ scripts/slave/chromium_commands.py (working copy) |
| @@ -143,7 +143,6 @@ |
| def __init__(self, *args, **kwargs): |
| # TODO(maruel): Mainly to keep pylint happy, remove once buildbot fixed |
| # their style. |
| - self.branch = None |
| self.srcdir = None |
| self.revision = None |
| self.env = None |
| @@ -277,13 +276,7 @@ |
| # GClient accepts --revision argument of two types 'module@rev' and 'rev'. |
| if self.revision: |
| command.append('--revision') |
| - if (not self.branch or |
| - self.no_gclient_branch or |
| - '@' in str(self.revision)): |
| - command.append(str(self.revision)) |
| - else: |
| - # Make the revision look like branch@revision. |
| - command.append('%s@%s' % (self.branch, self.revision)) |
| + command.append(str(self.revision)) |
|
nsylvain
2012/01/25 20:19:54
do you really want to touch this? or is this a reb
Dirk Pranke
2012/01/25 22:39:07
Change contamination :( Reverted.
|
| # We only add the transitive flag if we have a revision, otherwise it is |
| # meaningless. |
| if self.gclient_transitive: |
| @@ -444,7 +437,7 @@ |
| return d |
| def doVCUpdateOnPatch(self, res): |
| - if self.revision and not self.branch and '@' not in str(self.revision): |
| + if self.revision: |
| self.branch = 'src' |
| return self.doVCUpdate() |