kallithea Changeset - b4a5632733d9

Changeset - b4a5632733d9

Parent rev.

Child rev.

[Not reviewed]

stable

0 2 0

Branko Majic (branko) - 8 years ago 2018-02-13 16:23:55
branko@majic.rs

vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):

- Treat passed-in paths as exact matches, dissallowing any type of
globbing/regex/pattern matching.
- Added accompanying tests.

2 files changed with 37 insertions and 1 deletions:

kallithea/lib/vcs/backends/hg/repository.py

kallithea/tests/vcs/test_repository.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -262,13 +262,13 @@ class MercurialRepository(BaseRepository @@
         # Check if given revisions are present at repository (may raise
         # ChangesetDoesNotExistError)
         if rev1 != self.EMPTY_CHANGESET:
             self.get_changeset(rev1)
         self.get_changeset(rev2)
         if path:
             file_filter = match(self.path, '', [path])
+            file_filter = match(self.path, '', [path], exact=True)
         else:
             file_filter = None
         return ''.join(patch.diff(self._repo, rev1, rev2, match=file_filter,
                           opts=diffopts(git=True,
                                         showfunc=True,

kallithea/tests/vcs/test_repository.py

➞

Show inline comments

@@ @@ -76,19 +76,32 @@ class RepositoryGetDiffTest(_BackendTest @@
                 'date': datetime.datetime(2010, 1, 1, 22),
                 'changed': [
                     FileNode('foobar3', content='FOOBAR\nFOOBAR\nFOOBAR\n'),
                 ],
                 'removed': [FileNode('foobar')],
             },
+            {
                 'message': u'Commit that contains glob pattern in filename',
                 'author': 'Jane Doe <jane.doe@example.com>',
                 'date': datetime.datetime(2010, 1, 1, 22),
                 'added': [
                     FileNode('README{', content='Strangely-named README file'),
                 ],
             },
+        ]
         return commits
     def test_raise_for_wrong(self):
         with self.assertRaises(ChangesetDoesNotExistError):
             self.repo.get_diff('a' * 40, 'b' * 40)
     def test_glob_patterns_in_filename_do_not_raise_exception(self):
         revs = self.repo.revisions
         diff = self.repo.get_diff(revs[2], revs[3], path='README{') # should not raise
 class GitRepositoryGetDiffTest(RepositoryGetDiffTest, unittest.TestCase):
     backend_alias = 'git'
     def test_initial_commit_diff(self):
         initial_rev = self.repo.revisions[0]
@@ @@ -150,12 +163,24 @@ index c11c37d41d33fb47741cff93fa5f9d798c @@
 \ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 ''')
     def test_fourth_changeset_diff(self):
         revs = self.repo.revisions
         self.assertEqual(self.repo.get_diff(revs[2], revs[3]), '''diff --git a/README{ b/README{
 new file mode 100644
 index 0000000000000000000000000000000000000000..cdc0c1b5d234feedb37bbac19cd1b6442061102d
 --- /dev/null
 +++ b/README{
@@ -0,0 +1 @@
 +Strangely-named README file
 \ No newline at end of file
 ''')
 class HgRepositoryGetDiffTest(RepositoryGetDiffTest, unittest.TestCase):
     backend_alias = 'hg'
     def test_initial_commit_diff(self):
         initial_rev = self.repo.revisions[0]
@@ @@ -211,12 +236,23 @@ diff --git a/foobar3 b/foobar3 @@
 \ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 ''')
     def test_fourth_changeset_diff(self):
         revs = self.repo.revisions
         self.assertEqual(self.repo.get_diff(revs[2], revs[3]), '''diff --git a/README{ b/README{
 new file mode 100644
 --- /dev/null
 +++ b/README{
@@ -0,0 +1,1 @@
 +Strangely-named README file
 \ No newline at end of file
 ''')
 # For each backend create test case class
 for alias in SCM_TESTS:
     attrs = {
         'backend_alias': alias,
+    }

0 comments (0 inline, 0 general)