[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#684387: unblock: rabbitvcs/0.15.0.5-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package rabbitvcs. Version 0.15.0.5-3 was just uploaded to
unstable which includes an upstream patch to support Subversion 1.7 working
copies. As such it is part of the effort to get Subversion 1.7 in
wheezy.

Attached is a debdiff from the version currently in wheezy.

Thanks.

unblock rabbitvcs/0.15.0.5-3

-- 
-- arthur - adejong@debian.org - http://people.debian.org/~adejong --
diff -Nru rabbitvcs-0.15.0.5/debian/changelog rabbitvcs-0.15.0.5/debian/changelog
--- rabbitvcs-0.15.0.5/debian/changelog	2012-03-21 23:09:27.000000000 +0100
+++ rabbitvcs-0.15.0.5/debian/changelog	2012-08-09 11:43:56.000000000 +0200
@@ -1,3 +1,18 @@
+rabbitvcs (0.15.0.5-3) unstable; urgency=low
+
+  * Team upload.
+  * Upload to unstable targeted for wheezy.
+
+ -- Arthur de Jong <adejong@debian.org>  Thu, 09 Aug 2012 11:43:56 +0200
+
+rabbitvcs (0.15.0.5-2) experimental; urgency=low
+
+  * Team upload.
+  * Add 60_support_subversion_1.7.patch from upstream that adds support
+    for Subversion 1.7 working copies.
+
+ -- Arthur de Jong <adejong@debian.org>  Mon, 23 Jul 2012 21:32:41 +0200
+
 rabbitvcs (0.15.0.5-1) unstable; urgency=low
 
   * Team upload.
diff -Nru rabbitvcs-0.15.0.5/debian/patches/60_support_subversion_1.7.patch rabbitvcs-0.15.0.5/debian/patches/60_support_subversion_1.7.patch
--- rabbitvcs-0.15.0.5/debian/patches/60_support_subversion_1.7.patch	1970-01-01 01:00:00.000000000 +0100
+++ rabbitvcs-0.15.0.5/debian/patches/60_support_subversion_1.7.patch	2012-07-21 00:38:10.000000000 +0200
@@ -0,0 +1,45 @@
+Description: Support Subversion 1.7 working copies
+Author: Adam Plumb <adamplumb@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
+ 
diff -Nru rabbitvcs-0.15.0.5/debian/patches/series rabbitvcs-0.15.0.5/debian/patches/series
--- rabbitvcs-0.15.0.5/debian/patches/series	2012-03-19 22:18:05.000000000 +0100
+++ rabbitvcs-0.15.0.5/debian/patches/series	2012-07-21 00:33:39.000000000 +0200
@@ -1,2 +1,3 @@
 50_fix_gedit3_plugin.patch
+60_support_subversion_1.7.patch
 99_setup.py.patch

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: