kallithea Changeset - 8f3469917832

Changeset - 8f3469917832

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

Mads Kiilerich - 8 years ago 2018-02-14 01:54:12
mads@kiilerich.com

Merge stable

3 files changed with 38 insertions and 2 deletions:

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

kallithea/public/less/style.less

kallithea/tests/vcs/test_repository.py

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -255,25 +255,25 @@ class MercurialRepository(BaseRepository @@
         if hasattr(rev1, 'raw_id'):
             rev1 = getattr(rev1, 'raw_id')
         if hasattr(rev2, 'raw_id'):
             rev2 = getattr(rev2, 'raw_id')
         # 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,
                                         ignorews=ignore_whitespace,
                                         context=context)))
     @classmethod
     def _check_url(cls, url, repoui=None):
         """

kallithea/public/less/style.less

➞

Show inline comments

@@ @@ -748,25 +748,25 @@ div.comment-prev-next-links div.next-com @@
   margin-left: 0;
+}
 #content div.panel .changelog-panel > .changelog-heading,
 #content div.panel .changelog-panel > ul.pagination {
   margin-left: 100px;
+}
 /* repo table icons */
 #repos_list_wrap_wrapper {
   /* make icon-folder and repotag the same width */
   .icon-folder:before {
-    margin: 0; // default margin would otherwise add to the total width
     margin: 0; // default margin would otherwise add to the total width
     width: 24px;
     text-align: left;
+  }
   .label-repo {
     display: inline-block;
     width: 24px;
+  }
+}
 /* changelog table columns */
 .table#changesets {
   table-layout: fixed;

kallithea/tests/vcs/test_repository.py

➞

Show inline comments

@@ @@ -69,31 +69,44 @@ class RepositoryGetDiffTest(_BackendTest @@
                     FileNode('foobar', 'FOOBAR'),
                 ],
             },
+            {
                 'message': 'Removed foobar, changed foobar3',
                 'author': 'Jane Doe <jane.doe@example.com>',
                 '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 pytest.raises(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 TestGitRepositoryGetDiff(RepositoryGetDiffTest):
     backend_alias = 'git'
     def test_initial_commit_diff(self):
         initial_rev = self.repo.revisions[0]
         assert self.repo.get_diff(self.repo.EMPTY_CHANGESET, initial_rev) == '''diff --git a/foobar b/foobar
 new file mode 100644
 index 0000000000000000000000000000000000000000..f6ea0495187600e7b2288c8ac19c5886383a4632
 --- /dev/null
 +++ b/foobar
@@ -0,0 +1 @@
@@ @@ -143,24 +156,36 @@ index 389865bb681b358c9b102d79abd8d5f941 @@
 diff --git a/foobar3 b/foobar3
 index c11c37d41d33fb47741cff93fa5f9d798c1535b0..f9324477362684ff692aaf5b9a81e01b9e9a671c 100644
 --- a/foobar3
 +++ b/foobar3
@@ -1 +1,3 @@
 -foobar3
 \ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 '''
     def test_fourth_changeset_diff(self):
         revs = self.repo.revisions
         assert 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 TestHgRepositoryGetDiff(RepositoryGetDiffTest):
     backend_alias = 'hg'
     def test_initial_commit_diff(self):
         initial_rev = self.repo.revisions[0]
         assert self.repo.get_diff(self.repo.EMPTY_CHANGESET, initial_rev) == '''diff --git a/foobar b/foobar
 new file mode 100644
 --- /dev/null
 +++ b/foobar
@@ -0,0 +1,1 @@
 +foobar
@@ @@ -204,20 +229,31 @@ deleted file mode 100644 @@
 \ No newline at end of file
 diff --git a/foobar3 b/foobar3
 --- a/foobar3
 +++ b/foobar3
@@ -1,1 +1,3 @@
 -foobar3
 \ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 '''
     def test_fourth_changeset_diff(self):
         revs = self.repo.revisions
         assert 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,
+    }
     cls_name = 'Test' + alias.capitalize() + RepositoryBaseTest.__name__
     globals()[cls_name] = type(cls_name, (RepositoryBaseTest,), attrs)

0 comments (0 inline, 0 general)