Fix @hash in DEPS file

gclient_scm.py

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 150 matching lines @@
     Raises:
       Error: if can't get URL for relative path.
     """
 
     if args:
       raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
 
     self._CheckMinVersion("1.6.6")
 
     default_rev = "refs/heads/master"
-    url, revision = gclient_utils.SplitUrlRevision(self.url)
+    url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
     rev_str = ""
+    revision = deps_revision
     if options.revision:
       # Override the revision number.
       revision = str(options.revision)
     if not revision:
       revision = default_rev
 
     rev_str = ' at %s' % revision
     files = []
 
     printed_path = False
@@ skipping 98 matching lines @@
       if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
         # Our git-svn branch (upstream_branch) is our upstream
         self._AttemptRebase(upstream_branch, files, verbose=options.verbose,
                             newbase=revision, printed_path=printed_path)
         printed_path = True
       else:
         # Can't find a merge-base since we don't know our upstream. That makes
         # this command VERY likely to produce a rebase failure. For now we
         # assume origin is our upstream since that's what the old behavior was.
         upstream_branch = 'origin'
-        if options.revision:
+        if options.revision or deps_revision:
           upstream_branch = revision
         self._AttemptRebase(upstream_branch, files=files,
                             verbose=options.verbose, printed_path=printed_path)
         printed_path = True
     elif rev_type == 'hash':
       # case 2
       self._AttemptRebase(upstream_branch, files, verbose=options.verbose,
                           newbase=revision, printed_path=printed_path)
       printed_path = True
     elif revision.replace('heads', 'remotes/origin') != upstream_branch:
@@ skipping 518 matching lines @@
       print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
             "does not exist."
             % (' '.join(command), path))
       # There's no file list to retrieve.
     else:
       scm.SVN.RunAndGetFileList(options, command, path, file_list)
 
   def FullUrlForRelativeUrl(self, url):
     # Find the forth '/' and strip from there. A bit hackish.
     return '/'.join(self.url.split('/')[:4]) + url