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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
#!/usr/bin/env python3
# Copyright (C) 2019 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
import asyncio
import fcntl
import os
from pathlib import Path
import re
from typing import Any, Dict, List, Optional, Tuple
from .version import Version, ChangeRange, FixedByTag
from logger import get_logger
log = get_logger('repository')
repo_base = 'ssh://codereview.qt-project.org:29418/'
file_path = os.path.dirname(os.path.abspath(__file__))
working_dir = os.path.abspath(os.path.join(file_path, '..', 'git_repos'))
Path(working_dir).mkdir(parents=True, exist_ok=True)
class Repository:
def __init__(self, name: str) -> None:
self.name = name
self._issue_key_regexp = re.compile(r'^[A-Z]+-\d+$')
# self._fd: int = -1 # lock file descriptor
Path(os.path.dirname(self.repo_path)).mkdir(parents=True, exist_ok=True)
async def __aenter__(self) -> "Repository":
lock_path = self.repo_path + '_lock'
self._fd = os.open(lock_path, os.O_CREAT | os.O_RDWR)
try:
fcntl.flock(self._fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
except BlockingIOError:
loop = asyncio.get_event_loop()
await loop.run_in_executor(None, lambda: fcntl.flock(self._fd, fcntl.LOCK_EX))
return self
async def __aexit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
fcntl.flock(self._fd, fcntl.LOCK_UN)
os.close(self._fd)
@property
def repo_path(self) -> str:
return os.path.join(working_dir, self.name)
def git_command(self, command: str) -> str:
return "git --git-dir=%s %s" % (self.repo_path, command)
async def _check_repo(self) -> None:
if os.path.exists(self.repo_path):
return
Path(os.path.dirname(self.repo_path)).mkdir(parents=True, exist_ok=True)
log.info("Cloning '%s", self.name)
command = "git clone --bare %s %s" % (repo_base + self.name, self.repo_path)
process = await asyncio.create_subprocess_exec(*command.split())
# wait for the process to finish
await asyncio.wait_for(process.communicate(), 360)
async def _git_fetch_heads(self) -> None:
log.info("git fetch '%s'", self.name)
command = self.git_command("fetch origin +refs/heads/*:refs/heads/* --prune")
process = await asyncio.create_subprocess_exec(*command.split(), stdout=asyncio.subprocess.DEVNULL, stderr=asyncio.subprocess.PIPE)
# wait for the process to finish
await asyncio.wait_for(process.communicate(), 180)
if process.returncode:
if process.stderr:
log.error(f"Error when fetching heads!\n{process.stderr}\n")
async def _git_show_ref(self, tags: bool = False) -> str:
refType = '--tags' if tags else '--heads'
command = self.git_command("show-ref %s" % refType)
process = await asyncio.create_subprocess_exec(*command.split(), stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
# wait for the process to finish
stdout, stderr = await asyncio.wait_for(process.communicate(), 60)
if stderr:
log.warning("Error when running git show-ref: '%s'", stderr.decode('utf-8'))
return stdout.decode('utf-8').strip()
def _show_ref_output_to_dict(self, output: str) -> Dict[str, str]:
d = {}
for line in output.splitlines():
sha1_ref = line.split()
d[sha1_ref[1]] = sha1_ref[0]
return d
async def new_changes(self, since: Optional[str] = None) -> List[ChangeRange]:
# git show-ref --heads
# git fetch origin +refs/heads/*:refs/heads/* --prune
# git show-ref --heads
await self._check_repo()
before = self._show_ref_output_to_dict(await self._git_show_ref())
log.debug('before %s', before)
await self._git_fetch_heads()
after = self._show_ref_output_to_dict(await self._git_show_ref())
log.debug('after %s', after)
changes: List[ChangeRange] = []
for branch, sha1 in after.items():
if since:
# We ignore recent changes and only take since into account
changes.append(ChangeRange(repository=self.name, branch=branch, before=None, after=sha1, since=since))
elif before.get(branch) != sha1:
changes.append(ChangeRange(repository=self.name, branch=branch, before=before.get(branch), after=sha1, since=None))
return changes
def get_task_number_and_fixes(self, body: str) -> Tuple[List[str], List[str]]:
task_numbers = []
fixes = []
for line in body.splitlines():
if line.startswith('Task-number:'):
issue_key = line[12:].strip()
if self._issue_key_regexp.fullmatch(issue_key):
task_numbers.append(issue_key)
if line.startswith('Fixes:'):
issue_key = line[6:].strip()
if self._issue_key_regexp.fullmatch(issue_key):
fixes.append(issue_key)
return task_numbers, fixes
@staticmethod
def _clean_branch_name(ref: str) -> str:
refs_heads = 'refs/heads/'
if ref.startswith(refs_heads):
return ref[len(refs_heads):]
return ref
@staticmethod
def _clean_tag_name(ref: str) -> str:
refs_tags = 'refs/tags/'
if ref.startswith(refs_tags):
ref = ref[len(refs_tags):]
if ref.startswith('v'):
return ref[1:]
return ref
@staticmethod
def _find_first_comparable_minor_version(ref: Version, sorted_versions: List[Version]) -> Optional[Version]:
for v in sorted_versions:
if v.version[0] == ref.version[0] and v.version[1] == ref.version[1]:
return v
return None
@staticmethod
async def _guess_version(ref: str, branches: List[str], tags: List[str]) -> Optional[str]:
ref = Repository._clean_branch_name(ref)
if ref.count('.') == 2:
return ref
branch_list: List[Version] = []
for b in branches:
try:
branch_list.append(Version(Repository._clean_branch_name(b)))
except ValueError:
# skip versions that are not x.y.z
pass
branch_list = sorted(branch_list, reverse=True)
tag_list: List[Version] = []
for t in tags:
try:
tag_list.append(Version(Repository._clean_tag_name(t)))
except ValueError:
# skip versions that are not x.y.z
pass
tag_list = sorted(tag_list, reverse=True)
if ref in ['dev', 'master'] and len(branch_list) > 0:
# take the last version found and increase minor by one
previous = branch_list[0].version
return '%s.%s.0' % (previous[0], str(int(previous[1] + 1)))
# x.y - find the hightest tag or branch of the same version
if ref.count('.') == 1:
try:
ref_version = Version(ref)
log.warning("found highest version: %s", sorted(branch_list + tag_list, reverse=True))
highest = Repository._find_first_comparable_minor_version(ref_version, sorted(branch_list + tag_list, reverse=True))
log.warning("found highest version: %s", highest)
if highest and highest.original_version_string.count('.') > 1:
# assume that 5.12 will be 5.12.7 if we find 5.12.6 in tags or branches
# the only exception is that if we got '5.12' as original version, we must assume 5.12.0, so end up in else
return '%s.%s.%s' % (highest.version[0], highest.version[1], str(int(highest.version[2]) + 1))
else:
return '%s.%s.0' % (ref_version.version[0], ref_version.version[1])
except ValueError:
log.debug("Invalid version number: '%s'", ref)
return None
log.error("Could not determine version for ref: '%s' (branches: %s, tags: %s)", ref, branches, tags)
return None
async def parse_commit_messages(self, change: ChangeRange) -> List[FixedByTag]:
format_options = {
"id": "%H",
"author_name": "%an",
"author_email": "%ae",
"date": "%ad",
"subject": "%s",
"body": "%b"}
git_log_fields = "%x1f".join((format_options['id'], format_options['author_name'], format_options['subject'], format_options['body']))
# use '1e' as start and '1f' as field separator
format_string = "%x1e" + git_log_fields + "%x1f"
# if a new branch is created, before will be None
commit_range = "%s..%s" % (change.before, change.after) if change.before else change.after
since = ''
if change.since:
since = '--since %s' % change.since
command = self.git_command("log %s --format=%s %s" % (commit_range, format_string, since))
process = await asyncio.create_subprocess_exec(*command.split(), stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
stdout, stderr = await asyncio.wait_for(process.communicate(), 60)
if stderr:
log.warning("Error when running git command '%s': '%s'", command, stderr.decode('utf-8'))
commits = stdout.decode('utf-8', errors='replace').strip('\x1e').split('\x1e')
result: List[FixedByTag] = []
if commits == ['']: # ### FIXME: see test_gitlog, qt/qtlocation-mapboxgl comes up empty here
return result
for commit in commits:
# -2 to remove \x1f\n
sha1, author, subject, body = commit[:-2].split('\x1f')
task_numbers, fixes = self.get_task_number_and_fixes(body)
if task_numbers or fixes:
version = await self._guess_version(
change.branch,
branches=list(self._show_ref_output_to_dict(await self._git_show_ref(tags=False)).keys()),
tags=list(self._show_ref_output_to_dict(await self._git_show_ref(tags=True)).keys()))
result.append(FixedByTag(repository=self.name, branch=self._clean_branch_name(change.branch),
version=version,
sha1=sha1, author=author, subject=subject,
task_numbers=task_numbers, fixes=fixes))
return result
|
