Mercurial > kallithea
changeset 7168:8f3469917832
Merge stable
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 14 Feb 2018 01:54:12 +0100 |
parents | 2d6ec8b9b633 (current diff) b4a5632733d9 (diff) |
children | 7d02958345ff |
files | kallithea/lib/vcs/backends/hg/repository.py kallithea/public/less/style.less kallithea/tests/vcs/test_repository.py |
diffstat | 3 files changed, 38 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/vcs/backends/hg/repository.py Tue Feb 06 22:00:01 2018 +0100 +++ b/kallithea/lib/vcs/backends/hg/repository.py Wed Feb 14 01:54:12 2018 +0100 @@ -264,7 +264,7 @@ 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
--- a/kallithea/public/less/style.less Tue Feb 06 22:00:01 2018 +0100 +++ b/kallithea/public/less/style.less Wed Feb 14 01:54:12 2018 +0100 @@ -757,7 +757,7 @@ #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; }
--- a/kallithea/tests/vcs/test_repository.py Tue Feb 06 22:00:01 2018 +0100 +++ b/kallithea/tests/vcs/test_repository.py Wed Feb 14 01:54:12 2018 +0100 @@ -78,6 +78,14 @@ ], '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 @@ -85,6 +93,11 @@ 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' @@ -152,6 +165,18 @@ +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' @@ -213,6 +238,17 @@ +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: