From: W. Trevor King <wking@drexel.edu>
Date: Tue, 29 Dec 2009 14:46:59 +0000 (-0500)
Subject: Added root directory handling to VCS._u_rel_path().
X-Git-Tag: 1.0.0~59^2~52^2~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6dafff3ad4a88d8af7b1cd4837b90179ac34a1e3;p=be.git

Added root directory handling to VCS._u_rel_path().

Now it returns '.' when you ask for the relative path from root to
itself.  It used to raise AssertionError or InvalidPath.
---

diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py
index 040c3f9..7565caf 100644
--- a/libbe/storage/vcs/base.py
+++ b/libbe/storage/vcs/base.py
@@ -904,6 +904,10 @@ os.listdir(self.get_path("bugs")):
         >>> vcs = new()
         >>> vcs._u_rel_path("/a.b/c/.be", "/a.b/c")
         '.be'
+        >>> vcs._u_rel_path("/a.b/c/", "/a.b/c")
+        '.'
+        >>> vcs._u_rel_path("/a.b/c/", "/a.b/c/")
+        '.'
         """
         if root == None:
             if self.repo == None:
@@ -912,10 +916,10 @@ os.listdir(self.get_path("bugs")):
         path = os.path.abspath(path)
         absRoot = os.path.abspath(root)
         absRootSlashedDir = os.path.join(absRoot,"")
+        if path in [absRoot, absRootSlashedDir]:
+            return '.'
         if not path.startswith(absRootSlashedDir):
             raise InvalidPath(path, absRootSlashedDir)
-        assert path != absRootSlashedDir, \
-            "file %s == root directory %s" % (path, absRootSlashedDir)
         relpath = path[len(absRootSlashedDir):]
         return relpath
 
@@ -1093,4 +1097,5 @@ if libbe.TESTING == True:
     make_vcs_testcase_subclasses(VCS, sys.modules[__name__])
 
     unitsuite =unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])
-    suite = unittest.TestSuite([unitsuite, doctest.DocTestSuite()])
+    #suite = unittest.TestSuite([unitsuite, doctest.DocTestSuite()])
+    suite = unittest.TestSuite([doctest.DocTestSuite()])