commit bb45734988bb4860ba2bfd1adc1123968ff3cdca
author Anthony Polito <apolito@google.com> Fri Nov 15 22:26:01 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Nov 15 22:26:01 2019 +0000
tree b69d263d36215319b36834c0cb14700018bc30cd
parent 46689b09c559194413644b71c4a84e7a0a50605f

Changed "gclient sync -D" logic to compare against the expected DEPS version

Also add a better warning if 'gclient sync -D' fails due to a modified file.
I've tested this code via deleting a DEP and running gclient sync -D.

Bug: 981149
Change-Id: I97035ac238d163ccb1684c3ee423c223ed0f6299
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1891830
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Anthony Polito <apolito@google.com>

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index ae6dc59..fc0272c 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -912,10 +912,11 @@
       self.Print('________ couldn\'t run status in %s:\n'
                  'The directory does not exist.' % self.checkout_path)
     else:
-      try:
-        merge_base = [self._Capture(['merge-base', 'HEAD', self.remote])]
-      except subprocess2.CalledProcessError:
-        merge_base = []
+      merge_base = []
+      if self.url:
+        _, base_rev = gclient_utils.SplitUrlRevision(self.url)
+        if base_rev:
+          merge_base = [base_rev]
       self._Run(
           ['-c', 'core.quotePath=false', 'diff', '--name-status'] + merge_base,
           options, always_show_header=options.verbose)