macfreek avatar macfreek committed c52f082

relative_uri patch. Fixes #916.

Comments (0)

Files changed (1)


         return to
     b2 = base.split(SEP)
     t2 = to.split(SEP)
-    # remove common segments
-    for x, y in zip(b2, t2):
+    # remove common segments (except the last segment)
+    for x, y in zip(b2[:-1], t2[:-1]):
         if x != y:
+    if b2 == t2:
+        # Special case: relative_uri('f/index.html','f/index.html')
+        # returns '', not 'index.html'
+        return ''
+    if len(b2) == 1 and t2 == ['']:
+        # Special case: relative_uri('f/index.html','f/') should 
+        # return './', not ''
+        return '.' +  SEP
     return ('..' + SEP) * (len(b2)-1) + SEP.join(t2)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.