Enforces using cwd in all svn calls.

gclient_scm.py

Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index c78559076d69d2cfeebc7831890b9f7ee89d8ea4..cfe31c902108b9ae60c0ba251a2b864f50acada5 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -711,8 +711,9 @@ class SVNWrapper(SCMWrapper):
   def GetRevisionDate(self, revision):
     """Returns the given revision's date in ISO-8601 format (which contains the
     time zone)."""
-    date = scm.SVN.Capture(['propget', '--revprop', 'svn:date', '-r', revision,
-                            os.path.join(self.checkout_path, '.')])
+    date = scm.SVN.Capture(
+        ['propget', '--revprop', 'svn:date', '-r', revision],
+        os.path.join(self.checkout_path, '.'))

[Dirk Pranke, 2011/12/03 03:20:16]

isn't os.path.join(self.checkout_path, '.') just self.checkout_path? (or at
least normpath(self.checkout_path) ?

[M-A Ruel, 2011/12/05 15:23:50]

I recall I did it on purpose but I forgot why exactly, and forgot to put a
comment there. :/

It had to do with the way it processes directories and if it looks at the
containing directory first. svn's behavior is a tad annoying with that. In
theory using cwd should alleviate that but I don't want to change the behavior
in this CL since it's already risky enough.

     return date.strip()
 
   def cleanup(self, options, args, file_list):
@@ -796,7 +797,8 @@ class SVNWrapper(SCMWrapper):
 
     # Get the existing scm url and the revision number of the current checkout.
     try:
-      from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.'))
+      from_info = scm.SVN.CaptureInfo(
+          None, os.path.join(self.checkout_path, '.'))
     except (gclient_utils.Error, subprocess2.CalledProcessError):
       raise gclient_utils.Error(
           ('Can\'t update/checkout %s if an unversioned directory is present. '
@@ -809,14 +811,16 @@ class SVNWrapper(SCMWrapper):
             self.checkout_path, from_info))
 
     # Look for locked directories.
-    dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
+    dir_info = scm.SVN.CaptureStatus(
+        None, os.path.join(self.checkout_path, '.'))
     if any(d[0][2] == 'L' for d in dir_info):
       try:
         self._Run(['cleanup', self.checkout_path], options)
       except subprocess2.CalledProcessError, e:
         # Get the status again, svn cleanup may have cleaned up at least
         # something.
-        dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
+        dir_info = scm.SVN.CaptureStatus(
+            None, os.path.join(self.checkout_path, '.'))
 
         # Try to fix the failures by removing troublesome files.
         for d in dir_info:
@@ -832,14 +836,14 @@ class SVNWrapper(SCMWrapper):
 
     # Retrieve the current HEAD version because svn is slow at null updates.
     if options.manually_grab_svn_rev and not revision:
-      from_info_live = scm.SVN.CaptureInfo(from_info['URL'])
+      from_info_live = scm.SVN.CaptureInfo(from_info['URL'], None)

[Dirk Pranke, 2011/12/03 03:20:16]

Seems like CaptureInfo() is usually either from a URL w/ None or from a local
dir with th e URL being None. I'd probably split this into something like
CaptureLocalInfo() and CaptureRemoteInfo() to make the intent clearer (or pass
named parameters); otherwise it seems easy to screw up and pass None for the
wrong arg.

[M-A Ruel, 2011/12/05 15:23:50]

done, good idea.

       revision = str(from_info_live['Revision'])
       rev_str = ' at %s' % revision
 
     if from_info['URL'] != base_url:
       # The repository url changed, need to switch.
       try:
-        to_info = scm.SVN.CaptureInfo(url)
+        to_info = scm.SVN.CaptureInfo(url, None)
       except (gclient_utils.Error, subprocess2.CalledProcessError):
         # The url is invalid or the server is not accessible, it's safer to bail
         # out right now.
@@ -868,7 +872,7 @@ class SVNWrapper(SCMWrapper):
       else:
         if not options.force and not options.reset:
           # Look for local modifications but ignore unversioned files.
-          for status in scm.SVN.CaptureStatus(self.checkout_path):
+          for status in scm.SVN.CaptureStatus(None, self.checkout_path):
             if status[0] != '?':
               raise gclient_utils.Error(
                   ('Can\'t switch the checkout to %s; UUID don\'t match and '
@@ -979,7 +983,7 @@ class SVNWrapper(SCMWrapper):
   def revinfo(self, options, args, file_list):
     """Display revision"""
     try:
-      return scm.SVN.CaptureRevision(self.checkout_path)
+      return scm.SVN.CaptureRevision(None, self.checkout_path)
     except (gclient_utils.Error, subprocess2.CalledProcessError):
       return None