[#5810] standardize slashes in tree_paths
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 64a36ca..1d6a815 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -396,7 +396,7 @@
def compute_tree_new(self, commit, tree_path='/'):
from allura.model import repo as RM
- tree_path = tree_path[:-1]
+ tree_path = '/' + tree_path.strip('/') # always leading slash, never trailing
tree_id = self._tree_oid(commit._id, tree_path)
tree = RM.Tree.query.get(_id=tree_id)
if tree:
@@ -587,7 +587,7 @@
single common parent path (i.e., you are only asking for
a subset of the nodes of a single tree, one level deep).
'''
- tree_path = os.path.commonprefix(paths).strip('/')
+ tree_path = '/' + os.path.commonprefix(paths).strip('/') # always leading slash, never trailing
rev = self._revision(commit._id)
try:
infos = self._svn.info2(
diff --git a/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py b/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
new file mode 100644
index 0000000..3a5ae5d
--- /dev/null
+++ b/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
@@ -0,0 +1,55 @@
+from mock import Mock, MagicMock, patch
+import pysvn
+from nose.tools import assert_equal
+
+from allura.model.repo import Commit
+from forgesvn.model.svn import Repository, SVNImplementation
+
+
+class TestSVNImplementation(object):
+
+ def test_compute_tree_new(self):
+ self._test_compute_tree_new('/trunk/foo/')
+ self._test_compute_tree_new('/trunk/foo')
+ self._test_compute_tree_new('trunk/foo/')
+ self._test_compute_tree_new('trunk/foo')
+
+ @patch('allura.model.repo.LastCommitDoc.m.update_partial')
+ @patch('allura.model.repo.TreesDoc.m.update_partial')
+ @patch('allura.model.repo.Tree.upsert')
+ @patch('allura.model.repo.Tree.query.get')
+ def _test_compute_tree_new(self, path, tree_get, tree_upsert, treesdoc_partial, lcd_partial):
+ repo = Mock(fs_path='/tmp/')
+ repo.name = 'code'
+ impl = SVNImplementation(repo)
+ impl._svn.info2 = Mock()
+ impl._svn.info2.return_value = [('foo', Mock())]
+ tree_get.return_value = None # no existing tree
+ commit = Commit()
+ commit._id = '5057636b9c1040636b81e4b1:6'
+ tree_upsert.return_value = (Mock(), True)
+
+ tree_id = impl.compute_tree_new(commit, path)
+
+ assert_equal(impl._svn.info2.call_args[0][0], 'file:///tmp/code/trunk/foo')
+ treesdoc_partial.assert_called()
+ lcd_partial.assert_called()
+
+
+ def test_last_commit_ids(self):
+ self._test_last_commit_ids('/trunk/foo/')
+ self._test_last_commit_ids('/trunk/foo')
+ self._test_last_commit_ids('trunk/foo/')
+ self._test_last_commit_ids('trunk/foo')
+
+ def _test_last_commit_ids(self, path):
+ repo = Mock(fs_path='/tmp/')
+ repo.name = 'code'
+ impl = SVNImplementation(repo)
+ impl._svn.info2 = Mock()
+ impl._svn.info2.return_value = [('foo', Mock())]
+ commit = Commit()
+ commit._id = '5057636b9c1040636b81e4b1:6'
+ tree_id = impl.last_commit_ids(commit, [path])
+
+ assert_equal(impl._svn.info2.call_args[0][0], 'file:///tmp/code/trunk/foo')
