[Python-apps-commits] r8963 - in packages/rabbitvcs/trunk/debian (3 files)

[adejong at users.alioth.debian.org]

    Date: Saturday, July 21, 2012 @ 09:21:53
  Author: adejong
Revision: 8963

  * Add 60_support_subversion_1.7.patch from upstream that adds support
    for Subversion 1.7 working copies.

Added:
  packages/rabbitvcs/trunk/debian/patches/60_support_subversion_1.7.patch
Modified:
  packages/rabbitvcs/trunk/debian/changelog
  packages/rabbitvcs/trunk/debian/patches/series

Modified: packages/rabbitvcs/trunk/debian/changelog
===================================================================
--- packages/rabbitvcs/trunk/debian/changelog	2012-07-19 14:06:10 UTC (rev 8962)
+++ packages/rabbitvcs/trunk/debian/changelog	2012-07-21 09:21:53 UTC (rev 8963)
@@ -1,3 +1,10 @@
+rabbitvcs (0.15.0.5-2) UNRELEASED; urgency=low
+
+  * Add 60_support_subversion_1.7.patch from upstream that adds support
+    for Subversion 1.7 working copies.
+
+ -- Arthur de Jong <adejong at debian.org>  Sat, 21 Jul 2012 11:21:03 +0200
+
 rabbitvcs (0.15.0.5-1) unstable; urgency=low
 
   * Team upload.

Added: packages/rabbitvcs/trunk/debian/patches/60_support_subversion_1.7.patch
===================================================================
--- packages/rabbitvcs/trunk/debian/patches/60_support_subversion_1.7.patch	                        (rev 0)
+++ packages/rabbitvcs/trunk/debian/patches/60_support_subversion_1.7.patch	2012-07-21 09:21:53 UTC (rev 8963)
@@ -0,0 +1,45 @@
+Description: Support Subversion 1.7 working copies
+Author: Adam Plumb <adamplumb at gmail.com>
+Origin: upstream, http://code.google.com/p/rabbitvcs/source/detail?r=3047
+Bug: http://code.google.com/p/rabbitvcs/issues/detail?id=601
+Bug: http://code.google.com/p/rabbitvcs/issues/detail?id=623
+
+--- a/rabbitvcs/vcs/svn/__init__.py
++++ b/rabbitvcs/vcs/svn/__init__.py
+@@ -276,6 +276,16 @@
+             path = realpath(path)
+         return self.client.info(path)
+ 
++    def find_repository_path(self, path):
++        path_to_check = path
++        while path_to_check != "/" and path_to_check != "":
++            if os.path.isdir(os.path.join(path_to_check, ".svn")):
++                return path_to_check
++            
++            path_to_check = os.path.split(path_to_check)[0]
++        
++        return None
++
+     def status(self, path, summarize=True, invalidate=False):
+         if path in self.cache:
+             if invalidate:
+@@ -323,14 +333,17 @@
+             return False
+ 
+     def is_in_a_or_a_working_copy(self, path):
+-        return self.is_working_copy(path) or self.is_working_copy(os.path.split(path)[0])
++        if self.is_working_copy(path):
++            return True
++
++        return (self.find_repository_path(os.path.split(path)[0]) != "")
+ 
+     def is_versioned(self, path):
+         if self.is_working_copy(path):
+             return True
+         else:
+             # info will return nothing for an unversioned file inside a working copy
+-            if (self.is_working_copy(os.path.split(path)[0]) and
++            if (self.is_in_a_or_a_working_copy(path) and
+                     self.client_info(path)):
+                 return True
+ 

Modified: packages/rabbitvcs/trunk/debian/patches/series
===================================================================
--- packages/rabbitvcs/trunk/debian/patches/series	2012-07-19 14:06:10 UTC (rev 8962)
+++ packages/rabbitvcs/trunk/debian/patches/series	2012-07-21 09:21:53 UTC (rev 8963)
@@ -1,2 +1,3 @@
 50_fix_gedit3_plugin.patch
+60_support_subversion_1.7.patch
 99_setup.py.patch