commit 2151c2904b868f9367df35b1b6d8b8a214e3d466
author tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 04 00:57:32 2010 +0000
committer tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 04 00:57:32 2010 +0000
tree d45999fa6fe720eb069661b5609570fa19f53599
parent fb176482f3a1f8019db810f5a9f564676e512da1

Revert r48897, --force doesn't work on svn 1.4 which is used on mac.

TBR=maruel

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48898 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 1fe263c..134df35 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -740,7 +740,8 @@
     if not os.path.exists(checkout_path):
       # We need to checkout.
       command = ['checkout', url, checkout_path]
-      command = self.AddAdditionalFlags(command, options, revision)
+      if revision:
+        command.extend(['--revision', str(revision).strip()])
       scm.SVN.RunAndGetFileList(options, command, self._root_dir, file_list)
       return
 
@@ -797,7 +798,8 @@
         gclient_utils.RemoveDirectory(checkout_path)
         # We need to checkout.
         command = ['checkout', url, checkout_path]
-        command = self.AddAdditionalFlags(command, options, revision)
+        if revision:
+          command.extend(['--revision', str(revision).strip()])
         scm.SVN.RunAndGetFileList(options, command, self._root_dir, file_list)
         return
 
@@ -810,7 +812,8 @@
       return
 
     command = ["update", checkout_path]
-    command = self.AddAdditionalFlags(command, options, revision)
+    if revision:
+      command.extend(['--revision', str(revision).strip()])
     scm.SVN.RunAndGetFileList(options, command, self._root_dir, file_list)
 
   def updatesingle(self, options, args, file_list):
@@ -838,7 +841,8 @@
         os.makedirs(checkout_path)
       command = ["export", os.path.join(self.url, filename),
                  os.path.join(checkout_path, filename)]
-      command = self.AddAdditionalFlags(command, options, options.revision)
+      if options.revision:
+        command.extend(['--revision', str(options.revision).strip()])
       scm.SVN.Run(command, self._root_dir)
 
   def revert(self, options, args, file_list):
@@ -923,15 +927,3 @@
   def FullUrlForRelativeUrl(self, url):
     # Find the forth '/' and strip from there. A bit hackish.
     return '/'.join(self.url.split('/')[:4]) + url
-
-  def AddAdditionalFlags(self, command, options, revision):
-    """Add additional flags to command depending on what options are set.
-    command should be a list of strings that represents an svn command.
-
-    This method returns a new list to be used as a command."""
-    new_command = command[:]
-    if revision:
-      new_command.extend(['--revision', str(revision).strip()])
-    if options.force:
-      new_command.append('--force')
-    return new_command