Make gclient revert work with DEPS when DEPS url changes.

gclient_scm.py

 # Copyright (c) 2012 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."""
 
 from __future__ import print_function
 
 import errno
 import logging
@@ skipping 699 matching lines @@
     default_rev = "refs/heads/master"
     if options.upstream:
       if self._GetCurrentBranch():
         upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
         default_rev = upstream_branch or default_rev
     _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
     if not deps_revision:
       deps_revision = default_rev
     if deps_revision.startswith('refs/heads/'):
       deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
-    deps_revision = self.GetUsableRev(deps_revision, options)
+    try:
+      deps_revision = self.GetUsableRev(deps_revision, options)
+    except gclient_utils.Error as e:
+      # If the DEPS entry's url and hash changed, try to update the origin.
+      # See also http://crbug.com/520067.
+      if 'safesync_url response "%s"' % deps_revision in e.message:

[nodir, 2015/08/12 17:04:26]

Define a new exception class and raise it in lines 759 and 809
https://code.google.com/p/chromium/codesearch#chromium/tools/depot_tools/gcli...

[tandrii(chromium), 2015/08/12 17:17:33]

Good idea, I was just lazy. Done.

+        return self.update(options, [], file_list)
+      raise
 
     if file_list is not None:
       files = self._Capture(['diff', deps_revision, '--name-only']).split()
 
     self._Run(['reset', '--hard', deps_revision], options)
     self._Run(['clean', '-f', '-d'], options)
 
     if file_list is not None:
       file_list.extend([os.path.join(self.checkout_path, f) for f in files])
 
@@ skipping 911 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command