Mercurial > kallithea

annotate kallithea/tests/vcs/test_repository.py @ 7811:0a277465fddf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scripts: initial run of import cleanup using isort
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 07 Aug 2019 00:25:02 +0200
parents 45a281a0f36f
children 082780404e6c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
1 import datetime
7117
5c9eb37bdec4 tests: cleanup imports
Branko Majic <branko@majic.rs>
parents: 7116
diff changeset
2
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
3 import pytest
7117
5c9eb37bdec4 tests: cleanup imports
Branko Majic <branko@majic.rs>
parents: 7116
diff changeset
4
7811
0a277465fddf scripts: initial run of import cleanup using isort
Mads Kiilerich <mads@kiilerich.com>
parents: 7209
diff changeset
5 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError
7117
5c9eb37bdec4 tests: cleanup imports
Branko Majic <branko@majic.rs>
parents: 7116
diff changeset
6 from kallithea.lib.vcs.nodes import FileNode
7811
0a277465fddf scripts: initial run of import cleanup using isort
Mads Kiilerich <mads@kiilerich.com>
parents: 7209
diff changeset
7 from kallithea.tests.vcs import TEST_USER_CONFIG_FILE
5051
12ae08b2fe3f tests: avoid executing tests in base classes
Marc Abramowitz <marc@marc-abramowitz.com>
parents: 4187
diff changeset
8 from kallithea.tests.vcs.base import _BackendTestMixin
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
9
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
10
5051
12ae08b2fe3f tests: avoid executing tests in base classes
Marc Abramowitz <marc@marc-abramowitz.com>
parents: 4187
diff changeset
11 class RepositoryBaseTest(_BackendTestMixin):
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
12 recreate_repo_per_test = False
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
13
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
14 @classmethod
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
15 def _get_commits(cls):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
16 return super(RepositoryBaseTest, cls)._get_commits()[:1]
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
17
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
18 def test_get_config_value(self):
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
19 assert self.repo.get_config_value('universal', 'foo', TEST_USER_CONFIG_FILE) == 'bar'
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
20
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
21 def test_get_config_value_defaults_to_None(self):
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
22 assert self.repo.get_config_value('universal', 'nonexist', TEST_USER_CONFIG_FILE) == None
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
23
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
24 def test_get_user_name(self):
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
25 assert self.repo.get_user_name(TEST_USER_CONFIG_FILE) == 'Foo Bar'
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
26
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
27 def test_get_user_email(self):
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
28 assert self.repo.get_user_email(TEST_USER_CONFIG_FILE) == 'foo.bar@example.com'
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
29
3692
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
30 def test_repo_equality(self):
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
31 assert self.repo == self.repo
3692
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
32
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
33 def test_repo_equality_broken_object(self):
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
34 import copy
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
35 _repo = copy.copy(self.repo)
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
36 delattr(_repo, 'path')
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
37 assert self.repo != _repo
3692
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
38
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
39 def test_repo_equality_other_object(self):
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
40 class dummy(object):
5f9f4ece4b52 added __eq__ operation on vcs Repository objects
Marcin Kuzminski <marcin@python-works.com>
parents: 2995
diff changeset
41 path = self.repo.path
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
42 assert self.repo != dummy()
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
43
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
44
7209
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
45 class TestGitRepositoryBase(RepositoryBaseTest):
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
46 backend_alias = 'git'
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
47
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
48
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
49 class TestHgRepositoryBase(RepositoryBaseTest):
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
50 backend_alias = 'hg'
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
51
45a281a0f36f tests: Remove metaprogramming constructs for vcs test classes (issue #309):
Branko Majic <branko@majic.rs>
parents: 7168
diff changeset
52
5051
12ae08b2fe3f tests: avoid executing tests in base classes
Marc Abramowitz <marc@marc-abramowitz.com>
parents: 4187
diff changeset
53 class RepositoryGetDiffTest(_BackendTestMixin):
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
54
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
55 @classmethod
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
56 def _get_commits(cls):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
57 commits = [
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
58 {
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
59 'message': 'Initial commit',
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
60 'author': 'Joe Doe <joe.doe@example.com>',
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
61 'date': datetime.datetime(2010, 1, 1, 20),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
62 'added': [
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
63 FileNode('foobar', content='foobar'),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
64 FileNode('foobar2', content='foobar2'),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
65 ],
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
66 },
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
67 {
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
68 'message': 'Changed foobar, added foobar3',
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
69 'author': 'Jane Doe <jane.doe@example.com>',
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
70 'date': datetime.datetime(2010, 1, 1, 21),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
71 'added': [
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
72 FileNode('foobar3', content='foobar3'),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
73 ],
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
74 'changed': [
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
75 FileNode('foobar', 'FOOBAR'),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
76 ],
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
77 },
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
78 {
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
79 'message': 'Removed foobar, changed foobar3',
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
80 'author': 'Jane Doe <jane.doe@example.com>',
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
81 'date': datetime.datetime(2010, 1, 1, 22),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
82 'changed': [
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
83 FileNode('foobar3', content='FOOBAR\nFOOBAR\nFOOBAR\n'),
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
84 ],
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
85 'removed': [FileNode('foobar')],
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
86 },
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
87 {
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
88 'message': u'Commit that contains glob pattern in filename',
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
89 'author': 'Jane Doe <jane.doe@example.com>',
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
90 'date': datetime.datetime(2010, 1, 1, 22),
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
91 'added': [
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
92 FileNode('README{', content='Strangely-named README file'),
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
93 ],
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
94 },
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
95 ]
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
96 return commits
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
97
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
98 def test_raise_for_wrong(self):
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
99 with pytest.raises(ChangesetDoesNotExistError):
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
100 self.repo.get_diff('a' * 40, 'b' * 40)
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
101
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
102 def test_glob_patterns_in_filename_do_not_raise_exception(self):
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
103 revs = self.repo.revisions
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
104
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
105 diff = self.repo.get_diff(revs[2], revs[3], path='README{') # should not raise
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
106
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
107
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
108 class TestGitRepositoryGetDiff(RepositoryGetDiffTest):
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
109 backend_alias = 'git'
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
110
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
111 def test_initial_commit_diff(self):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
112 initial_rev = self.repo.revisions[0]
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
113 assert self.repo.get_diff(self.repo.EMPTY_CHANGESET, initial_rev) == '''diff --git a/foobar b/foobar
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
114 new file mode 100644
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
115 index 0000000000000000000000000000000000000000..f6ea0495187600e7b2288c8ac19c5886383a4632
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
116 --- /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
117 +++ b/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
118 @@ -0,0 +1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
119 +foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
120 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
121 diff --git a/foobar2 b/foobar2
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
122 new file mode 100644
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
123 index 0000000000000000000000000000000000000000..e8c9d6b98e3dce993a464935e1a53f50b56a3783
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
124 --- /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
125 +++ b/foobar2
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
126 @@ -0,0 +1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
127 +foobar2
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
128 \ No newline at end of file
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
129 '''
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
130
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
131 def test_second_changeset_diff(self):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
132 revs = self.repo.revisions
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
133 assert self.repo.get_diff(revs[0], revs[1]) == '''diff --git a/foobar b/foobar
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
134 index f6ea0495187600e7b2288c8ac19c5886383a4632..389865bb681b358c9b102d79abd8d5f941e96551 100644
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
135 --- a/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
136 +++ b/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
137 @@ -1 +1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
138 -foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
139 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
140 +FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
141 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
142 diff --git a/foobar3 b/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
143 new file mode 100644
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
144 index 0000000000000000000000000000000000000000..c11c37d41d33fb47741cff93fa5f9d798c1535b0
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
145 --- /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
146 +++ b/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
147 @@ -0,0 +1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
148 +foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
149 \ No newline at end of file
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
150 '''
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
151
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
152 def test_third_changeset_diff(self):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
153 revs = self.repo.revisions
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
154 assert self.repo.get_diff(revs[1], revs[2]) == '''diff --git a/foobar b/foobar
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
155 deleted file mode 100644
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
156 index 389865bb681b358c9b102d79abd8d5f941e96551..0000000000000000000000000000000000000000
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
157 --- a/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
158 +++ /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
159 @@ -1 +0,0 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
160 -FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
161 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
162 diff --git a/foobar3 b/foobar3
2995
32471bd1f4ee Implemented generation of changesets based
Marcin Kuzminski <marcin@python-works.com>
parents: 2451
diff changeset
163 index c11c37d41d33fb47741cff93fa5f9d798c1535b0..f9324477362684ff692aaf5b9a81e01b9e9a671c 100644
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
164 --- a/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
165 +++ b/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
166 @@ -1 +1,3 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
167 -foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
168 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
169 +FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
170 +FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
171 +FOOBAR
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
172 '''
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
173
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
174 def test_fourth_changeset_diff(self):
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
175 revs = self.repo.revisions
7168
8f3469917832 Merge stable
Mads Kiilerich <mads@kiilerich.com>
parents: 7120 7167
diff changeset
176 assert self.repo.get_diff(revs[2], revs[3]) == '''diff --git a/README{ b/README{
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
177 new file mode 100644
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
178 index 0000000000000000000000000000000000000000..cdc0c1b5d234feedb37bbac19cd1b6442061102d
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
179 --- /dev/null
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
180 +++ b/README{
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
181 @@ -0,0 +1 @@
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
182 +Strangely-named README file
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
183 \ No newline at end of file
7168
8f3469917832 Merge stable
Mads Kiilerich <mads@kiilerich.com>
parents: 7120 7167
diff changeset
184 '''
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
185
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
186
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
187 class TestHgRepositoryGetDiff(RepositoryGetDiffTest):
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
188 backend_alias = 'hg'
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
189
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
190 def test_initial_commit_diff(self):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
191 initial_rev = self.repo.revisions[0]
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
192 assert self.repo.get_diff(self.repo.EMPTY_CHANGESET, initial_rev) == '''diff --git a/foobar b/foobar
3838
dbe9a08b2bcf fixed VCS tests after executable big issue was fixed
Marcin Kuzminski <marcin@python-works.com>
parents: 3797
diff changeset
193 new file mode 100644
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
194 --- /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
195 +++ b/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
196 @@ -0,0 +1,1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
197 +foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
198 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
199 diff --git a/foobar2 b/foobar2
3838
dbe9a08b2bcf fixed VCS tests after executable big issue was fixed
Marcin Kuzminski <marcin@python-works.com>
parents: 3797
diff changeset
200 new file mode 100644
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
201 --- /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
202 +++ b/foobar2
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
203 @@ -0,0 +1,1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
204 +foobar2
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
205 \ No newline at end of file
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
206 '''
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
207
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
208 def test_second_changeset_diff(self):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
209 revs = self.repo.revisions
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
210 assert self.repo.get_diff(revs[0], revs[1]) == '''diff --git a/foobar b/foobar
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
211 --- a/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
212 +++ b/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
213 @@ -1,1 +1,1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
214 -foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
215 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
216 +FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
217 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
218 diff --git a/foobar3 b/foobar3
3838
dbe9a08b2bcf fixed VCS tests after executable big issue was fixed
Marcin Kuzminski <marcin@python-works.com>
parents: 3797
diff changeset
219 new file mode 100644
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
220 --- /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
221 +++ b/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
222 @@ -0,0 +1,1 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
223 +foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
224 \ No newline at end of file
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
225 '''
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
226
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
227 def test_third_changeset_diff(self):
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
228 revs = self.repo.revisions
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
229 assert self.repo.get_diff(revs[1], revs[2]) == '''diff --git a/foobar b/foobar
3838
dbe9a08b2bcf fixed VCS tests after executable big issue was fixed
Marcin Kuzminski <marcin@python-works.com>
parents: 3797
diff changeset
230 deleted file mode 100644
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
231 --- a/foobar
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
232 +++ /dev/null
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
233 @@ -1,1 +0,0 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
234 -FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
235 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
236 diff --git a/foobar3 b/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
237 --- a/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
238 +++ b/foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
239 @@ -1,1 +1,3 @@
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
240 -foobar3
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
241 \ No newline at end of file
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
242 +FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
243 +FOOBAR
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
244 +FOOBAR
7120
8f30206a15b5 tests: convert remaining vcs tests to py.test
Branko Majic <branko@majic.rs>
parents: 7117
diff changeset
245 '''
2451
402a96fcfa22 Added vcs testsuite for better integration tests + added fetching
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
246
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
247 def test_fourth_changeset_diff(self):
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
248 revs = self.repo.revisions
7168
8f3469917832 Merge stable
Mads Kiilerich <mads@kiilerich.com>
parents: 7120 7167
diff changeset
249 assert self.repo.get_diff(revs[2], revs[3]) == '''diff --git a/README{ b/README{
7167
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
250 new file mode 100644
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
251 --- /dev/null
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
252 +++ b/README{
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
253 @@ -0,0 +1,1 @@
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
254 +Strangely-named README file
b4a5632733d9 vcs: Fix internal server error when trying to get diff from Mercurial for paths that include globbing patterns (Issue #308):
Branko Majic <branko@majic.rs>
parents: 5474
diff changeset
255 \ No newline at end of file
7168
8f3469917832 Merge stable
Mads Kiilerich <mads@kiilerich.com>
parents: 7120 7167
diff changeset
256 '''