Verify our assumptions about SCM commands deleting files from checkout

BUG=131061

Review URL: https://codereview.chromium.org/319673003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@275235 0039d316-1c4b-4281-b951-d872f2087c98
parent 1fddd11b
...@@ -174,6 +174,7 @@ class RawCheckout(CheckoutBase): ...@@ -174,6 +174,7 @@ class RawCheckout(CheckoutBase):
filepath = os.path.join(self.project_path, p.filename) filepath = os.path.join(self.project_path, p.filename)
if p.is_delete: if p.is_delete:
os.remove(filepath) os.remove(filepath)
assert(not os.path.exists(filepath))
stdout.append('Deleted.') stdout.append('Deleted.')
else: else:
dirname = os.path.dirname(p.filename) dirname = os.path.dirname(p.filename)
...@@ -361,6 +362,7 @@ class SvnCheckout(CheckoutBase, SvnMixIn): ...@@ -361,6 +362,7 @@ class SvnCheckout(CheckoutBase, SvnMixIn):
if p.is_delete: if p.is_delete:
stdout.append(self._check_output_svn( stdout.append(self._check_output_svn(
['delete', p.filename, '--force'], credentials=False)) ['delete', p.filename, '--force'], credentials=False))
assert(not os.path.exists(filepath))
stdout.append('Deleted.') stdout.append('Deleted.')
else: else:
# svn add while creating directories otherwise svn add on the # svn add while creating directories otherwise svn add on the
...@@ -654,6 +656,7 @@ class GitCheckout(CheckoutBase): ...@@ -654,6 +656,7 @@ class GitCheckout(CheckoutBase):
pass pass
else: else:
stdout.append(self._check_output_git(['rm', p.filename])) stdout.append(self._check_output_git(['rm', p.filename]))
assert(not os.path.exists(filepath))
stdout.append('Deleted.') stdout.append('Deleted.')
else: else:
dirname = os.path.dirname(p.filename) dirname = os.path.dirname(p.filename)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment