1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186 | diff --git a/gitubuntu/git_repository.py b/gitubuntu/git_repository.py
index 305e3a2..10f6d82 100644
--- a/gitubuntu/git_repository.py
+++ b/gitubuntu/git_repository.py
@@ -21,6 +21,8 @@ try:
import debian.changelog
pkg = 'python3-pygit2'
import pygit2
+ pkg = 'python3-pytest'
+ import pytest
except ImportError:
logging.error('Is %s installed?', pkg)
sys.exit(1)
@@ -97,22 +99,32 @@ class Changelog:
Uses the debian.changelog module from python3-debian for parsing, but when
this fails we fall back to grep/sed-based pattern matching automatically.
'''
- def __init__(self, repo, treeish):
+ def __init__(self, content_bytes):
'''
- repo: pygit2.Repository instance
- treeish: pygit2.Object subclass instance (must peel to pygit2.Tree)
+ contents: bytes string of file contents
'''
+ self._contents = content_bytes
+ self._changelog = debian.changelog.Changelog(self._contents)
+ if not len(self._changelog.versions):
+ # assume bad read, so fall back to shell later
+ self._changelog = None
+ @classmethod
+ def from_treeish(cls, repo, treeish_object):
+ '''
+ repo: pygit2.Repository instance
+ treeish_object: pygit2.Object subclass instance (must peel to pygit2.Tree)
+ '''
blob = follow_symlinks_to_blob(
repo=repo,
- treeish=treeish,
+ treeish_object=treeish_object,
path='debian/changelog'
)
- self._contents = blob.data
- self._changelog = debian.changelog.Changelog(self._contents)
- if not len(self._changelog.versions):
- # assume bad read, so fall back to shell later
- self._changelog = None
+ return cls(blob.data)
+
+ @classmethod
+ def from_path(cls, path):
+ return cls(open(path, 'rb').read())
@lru_cache()
def _shell(self, cmd):
@@ -128,7 +140,10 @@ class Changelog:
@property
def version(self):
if self._changelog:
- return str(self._changelog.versions[0])
+ try:
+ return str(self._changelog.versions[0])
+ except IndexError:
+ return None
else:
shell_cmd = 'grep -m1 \'^\S\' | sed \'s/.*(\(.*\)).*/\\1/\''
return self._shell(shell_cmd)
@@ -136,7 +151,10 @@ class Changelog:
@property
def previous_version(self):
if self._changelog:
- return str(self._changelog.versions[1])
+ try:
+ return str(self._changelog.versions[1])
+ except IndexError:
+ return None
else:
shell_cmd = 'grep -m1 \'^\S\' | tail -1 | sed \'s/.*(\(.*\)).*/\\1/\''
return self._shell(shell_cmd)
@@ -188,6 +206,15 @@ class Changelog:
shell_cmd = 'grep -m1 \'^\S\' | sed \'s/\(.*\)\ .*\ .*;.*/\\1/\''
return self._shell(shell_cmd)
+@pytest.mark.parametrize('changelog_path, expected', [
+ ('tests/changelogs/test_versions_1', ['1.0', None]),
+ ('tests/changelogs/test_versions_2', ['2.0', '1.0']),
+ ('tests/changelogs/test_versions_3', ['4.0', '3.0']),
+])
+def test_changelog_versions(changelog_path, expected):
+ test_changelog = Changelog.from_path(changelog_path)
+ assert [test_changelog.version, test_changelog.previous_version] == expected
+
class GitUbuntuChangelogError(Exception):
pass
@@ -553,7 +580,7 @@ class GitUbuntuRepository:
def garbage_collect(self):
self.git_run(['gc'])
- def extract_file_from_treeish(self, treeish, filename):
+ def extract_file_from_treeish(self, treeish_string, filename):
"""extract a file from @treeish to a local file
Arguments:
@@ -563,8 +590,8 @@ class GitUbuntuRepository:
Returns a NamedTemporaryFile that is flushed but not rewound.
"""
blob = follow_symlinks_to_blob(
- self._local_repo,
- treeish=self._local_repo.get(treeish),
+ self.raw_repo,
+ treeish_object=self.raw_repo.get(treeish_string),
path=filename,
)
outfile = tempfile.NamedTemporaryFile()
@@ -573,10 +600,10 @@ class GitUbuntuRepository:
return outfile
@lru_cache()
- def get_changelog_from_treeish(self, treeish):
- return Changelog(self._local_repo, self._local_repo.get(treeish))
+ def get_changelog_from_treeish(self, treeish_string):
+ return Changelog.from_treeish(self.raw_repo, self.raw_repo.get(treeish_string))
- def get_changelog_versions_from_treeish(self, treeish):
+ def get_changelog_versions_from_treeish(self, treeish_string):
"""Extract current and prior versions from debian/changelog in a
given treeish
@@ -584,7 +611,7 @@ class GitUbuntuRepository:
'debian/changelog' does not exist in the treeish.
"""
try:
- changelog = self.get_changelog_from_treeish(treeish)
+ changelog = self.get_changelog_from_treeish(treeish_string)
except KeyError:
# If 'debian/changelog' does
# not exist, then (None, None) is returned. KeyError propagates up
@@ -597,24 +624,24 @@ class GitUbuntuRepository:
'Cannot get changelog versions'
)
- def get_changelog_distribution_from_treeish(self, treeish):
+ def get_changelog_distribution_from_treeish(self, treeish_string):
"""Extract targetted distribution from debian/changelog in a
given treeish
"""
- if treeish is None:
+ if treeish_string is None:
return None
try:
- return self.get_changelog_from_treeish(treeish).distribution
+ return self.get_changelog_from_treeish(treeish_string).distribution
except (KeyError, CalledProcessError):
raise GitUbuntuChangelogError(
'Cannot get changelog distribution'
)
- def get_changelog_srcpkg_from_treeish(self, treeish):
+ def get_changelog_srcpkg_from_treeish(self, treeish_string):
"""Extract srcpkg from debian/changelog in a given treeish
"""
- if treeish is None:
+ if treeish_string is None:
return None
try:
@@ -645,12 +672,12 @@ class GitUbuntuRepository:
return versions
- def treeishs_identical(self, treeish1, treeish2):
- if treeish1 is None or treeish2 is None:
+ def treeishs_identical(self, treeish_string1, treeish_string2):
+ if treeish_string1 is None or treeish_string2 is None:
return False
- _treeish1 = self.raw_repo.get(treeish1).peel(pygit2.Tree).id
- _treeish2 = self.raw_repo.get(treeish2).peel(pygit2.Tree).id
- return _treeish1 == _treeish2
+ _treeish_id1 = self.raw_repo.get(treeish_string1).peel(pygit2.Tree).id
+ _treeish_id2 = self.raw_repo.get(treeish_string2).peel(pygit2.Tree).id
+ return _treeish_id1 == _treeish_id2
def get_head_by_name(self, name):
try:
|