##// END OF EJS Templates
git: limit sync-fetch to tags/ and heads/ with default execution arguments
marcink -
r766:7807f9db default
parent child Browse files
Show More
@@ -1,1144 +1,1150 b''
1 # RhodeCode VCSServer provides access to different vcs backends via network.
1 # RhodeCode VCSServer provides access to different vcs backends via network.
2 # Copyright (C) 2014-2019 RhodeCode GmbH
2 # Copyright (C) 2014-2019 RhodeCode GmbH
3 #
3 #
4 # This program is free software; you can redistribute it and/or modify
4 # This program is free software; you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License as published by
5 # it under the terms of the GNU General Public License as published by
6 # the Free Software Foundation; either version 3 of the License, or
6 # the Free Software Foundation; either version 3 of the License, or
7 # (at your option) any later version.
7 # (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software Foundation,
15 # along with this program; if not, write to the Free Software Foundation,
16 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
18 import collections
18 import collections
19 import logging
19 import logging
20 import os
20 import os
21 import posixpath as vcspath
21 import posixpath as vcspath
22 import re
22 import re
23 import stat
23 import stat
24 import traceback
24 import traceback
25 import urllib
25 import urllib
26 import urllib2
26 import urllib2
27 from functools import wraps
27 from functools import wraps
28
28
29 import more_itertools
29 import more_itertools
30 import pygit2
30 import pygit2
31 from pygit2 import Repository as LibGit2Repo
31 from pygit2 import Repository as LibGit2Repo
32 from dulwich import index, objects
32 from dulwich import index, objects
33 from dulwich.client import HttpGitClient, LocalGitClient
33 from dulwich.client import HttpGitClient, LocalGitClient
34 from dulwich.errors import (
34 from dulwich.errors import (
35 NotGitRepository, ChecksumMismatch, WrongObjectException,
35 NotGitRepository, ChecksumMismatch, WrongObjectException,
36 MissingCommitError, ObjectMissing, HangupException,
36 MissingCommitError, ObjectMissing, HangupException,
37 UnexpectedCommandError)
37 UnexpectedCommandError)
38 from dulwich.repo import Repo as DulwichRepo
38 from dulwich.repo import Repo as DulwichRepo
39 from dulwich.server import update_server_info
39 from dulwich.server import update_server_info
40
40
41 from vcsserver import exceptions, settings, subprocessio
41 from vcsserver import exceptions, settings, subprocessio
42 from vcsserver.utils import safe_str, safe_int
42 from vcsserver.utils import safe_str, safe_int
43 from vcsserver.base import RepoFactory, obfuscate_qs
43 from vcsserver.base import RepoFactory, obfuscate_qs
44 from vcsserver.hgcompat import (
44 from vcsserver.hgcompat import (
45 hg_url as url_parser, httpbasicauthhandler, httpdigestauthhandler)
45 hg_url as url_parser, httpbasicauthhandler, httpdigestauthhandler)
46 from vcsserver.git_lfs.lib import LFSOidStore
46 from vcsserver.git_lfs.lib import LFSOidStore
47 from vcsserver.vcs_base import RemoteBase
47 from vcsserver.vcs_base import RemoteBase
48
48
49 DIR_STAT = stat.S_IFDIR
49 DIR_STAT = stat.S_IFDIR
50 FILE_MODE = stat.S_IFMT
50 FILE_MODE = stat.S_IFMT
51 GIT_LINK = objects.S_IFGITLINK
51 GIT_LINK = objects.S_IFGITLINK
52 PEELED_REF_MARKER = '^{}'
52 PEELED_REF_MARKER = '^{}'
53
53
54
54
55 log = logging.getLogger(__name__)
55 log = logging.getLogger(__name__)
56
56
57
57
58 def str_to_dulwich(value):
58 def str_to_dulwich(value):
59 """
59 """
60 Dulwich 0.10.1a requires `unicode` objects to be passed in.
60 Dulwich 0.10.1a requires `unicode` objects to be passed in.
61 """
61 """
62 return value.decode(settings.WIRE_ENCODING)
62 return value.decode(settings.WIRE_ENCODING)
63
63
64
64
65 def reraise_safe_exceptions(func):
65 def reraise_safe_exceptions(func):
66 """Converts Dulwich exceptions to something neutral."""
66 """Converts Dulwich exceptions to something neutral."""
67
67
68 @wraps(func)
68 @wraps(func)
69 def wrapper(*args, **kwargs):
69 def wrapper(*args, **kwargs):
70 try:
70 try:
71 return func(*args, **kwargs)
71 return func(*args, **kwargs)
72 except (ChecksumMismatch, WrongObjectException, MissingCommitError, ObjectMissing,) as e:
72 except (ChecksumMismatch, WrongObjectException, MissingCommitError, ObjectMissing,) as e:
73 exc = exceptions.LookupException(org_exc=e)
73 exc = exceptions.LookupException(org_exc=e)
74 raise exc(safe_str(e))
74 raise exc(safe_str(e))
75 except (HangupException, UnexpectedCommandError) as e:
75 except (HangupException, UnexpectedCommandError) as e:
76 exc = exceptions.VcsException(org_exc=e)
76 exc = exceptions.VcsException(org_exc=e)
77 raise exc(safe_str(e))
77 raise exc(safe_str(e))
78 except Exception as e:
78 except Exception as e:
79 # NOTE(marcink): becuase of how dulwich handles some exceptions
79 # NOTE(marcink): becuase of how dulwich handles some exceptions
80 # (KeyError on empty repos), we cannot track this and catch all
80 # (KeyError on empty repos), we cannot track this and catch all
81 # exceptions, it's an exceptions from other handlers
81 # exceptions, it's an exceptions from other handlers
82 #if not hasattr(e, '_vcs_kind'):
82 #if not hasattr(e, '_vcs_kind'):
83 #log.exception("Unhandled exception in git remote call")
83 #log.exception("Unhandled exception in git remote call")
84 #raise_from_original(exceptions.UnhandledException)
84 #raise_from_original(exceptions.UnhandledException)
85 raise
85 raise
86 return wrapper
86 return wrapper
87
87
88
88
89 class Repo(DulwichRepo):
89 class Repo(DulwichRepo):
90 """
90 """
91 A wrapper for dulwich Repo class.
91 A wrapper for dulwich Repo class.
92
92
93 Since dulwich is sometimes keeping .idx file descriptors open, it leads to
93 Since dulwich is sometimes keeping .idx file descriptors open, it leads to
94 "Too many open files" error. We need to close all opened file descriptors
94 "Too many open files" error. We need to close all opened file descriptors
95 once the repo object is destroyed.
95 once the repo object is destroyed.
96 """
96 """
97 def __del__(self):
97 def __del__(self):
98 if hasattr(self, 'object_store'):
98 if hasattr(self, 'object_store'):
99 self.close()
99 self.close()
100
100
101
101
102 class Repository(LibGit2Repo):
102 class Repository(LibGit2Repo):
103
103
104 def __enter__(self):
104 def __enter__(self):
105 return self
105 return self
106
106
107 def __exit__(self, exc_type, exc_val, exc_tb):
107 def __exit__(self, exc_type, exc_val, exc_tb):
108 self.free()
108 self.free()
109
109
110
110
111 class GitFactory(RepoFactory):
111 class GitFactory(RepoFactory):
112 repo_type = 'git'
112 repo_type = 'git'
113
113
114 def _create_repo(self, wire, create, use_libgit2=False):
114 def _create_repo(self, wire, create, use_libgit2=False):
115 if use_libgit2:
115 if use_libgit2:
116 return Repository(wire['path'])
116 return Repository(wire['path'])
117 else:
117 else:
118 repo_path = str_to_dulwich(wire['path'])
118 repo_path = str_to_dulwich(wire['path'])
119 return Repo(repo_path)
119 return Repo(repo_path)
120
120
121 def repo(self, wire, create=False, use_libgit2=False):
121 def repo(self, wire, create=False, use_libgit2=False):
122 """
122 """
123 Get a repository instance for the given path.
123 Get a repository instance for the given path.
124 """
124 """
125 return self._create_repo(wire, create, use_libgit2)
125 return self._create_repo(wire, create, use_libgit2)
126
126
127 def repo_libgit2(self, wire):
127 def repo_libgit2(self, wire):
128 return self.repo(wire, use_libgit2=True)
128 return self.repo(wire, use_libgit2=True)
129
129
130
130
131 class GitRemote(RemoteBase):
131 class GitRemote(RemoteBase):
132
132
133 def __init__(self, factory):
133 def __init__(self, factory):
134 self._factory = factory
134 self._factory = factory
135 self._bulk_methods = {
135 self._bulk_methods = {
136 "date": self.date,
136 "date": self.date,
137 "author": self.author,
137 "author": self.author,
138 "branch": self.branch,
138 "branch": self.branch,
139 "message": self.message,
139 "message": self.message,
140 "parents": self.parents,
140 "parents": self.parents,
141 "_commit": self.revision,
141 "_commit": self.revision,
142 }
142 }
143
143
144 def _wire_to_config(self, wire):
144 def _wire_to_config(self, wire):
145 if 'config' in wire:
145 if 'config' in wire:
146 return dict([(x[0] + '_' + x[1], x[2]) for x in wire['config']])
146 return dict([(x[0] + '_' + x[1], x[2]) for x in wire['config']])
147 return {}
147 return {}
148
148
149 def _remote_conf(self, config):
149 def _remote_conf(self, config):
150 params = [
150 params = [
151 '-c', 'core.askpass=""',
151 '-c', 'core.askpass=""',
152 ]
152 ]
153 ssl_cert_dir = config.get('vcs_ssl_dir')
153 ssl_cert_dir = config.get('vcs_ssl_dir')
154 if ssl_cert_dir:
154 if ssl_cert_dir:
155 params.extend(['-c', 'http.sslCAinfo={}'.format(ssl_cert_dir)])
155 params.extend(['-c', 'http.sslCAinfo={}'.format(ssl_cert_dir)])
156 return params
156 return params
157
157
158 @reraise_safe_exceptions
158 @reraise_safe_exceptions
159 def discover_git_version(self):
159 def discover_git_version(self):
160 stdout, _ = self.run_git_command(
160 stdout, _ = self.run_git_command(
161 {}, ['--version'], _bare=True, _safe=True)
161 {}, ['--version'], _bare=True, _safe=True)
162 prefix = 'git version'
162 prefix = 'git version'
163 if stdout.startswith(prefix):
163 if stdout.startswith(prefix):
164 stdout = stdout[len(prefix):]
164 stdout = stdout[len(prefix):]
165 return stdout.strip()
165 return stdout.strip()
166
166
167 @reraise_safe_exceptions
167 @reraise_safe_exceptions
168 def is_empty(self, wire):
168 def is_empty(self, wire):
169 repo_init = self._factory.repo_libgit2(wire)
169 repo_init = self._factory.repo_libgit2(wire)
170 with repo_init as repo:
170 with repo_init as repo:
171
171
172 try:
172 try:
173 has_head = repo.head.name
173 has_head = repo.head.name
174 if has_head:
174 if has_head:
175 return False
175 return False
176
176
177 # NOTE(marcink): check again using more expensive method
177 # NOTE(marcink): check again using more expensive method
178 return repo.is_empty
178 return repo.is_empty
179 except Exception:
179 except Exception:
180 pass
180 pass
181
181
182 return True
182 return True
183
183
184 @reraise_safe_exceptions
184 @reraise_safe_exceptions
185 def assert_correct_path(self, wire):
185 def assert_correct_path(self, wire):
186 cache_on, context_uid, repo_id = self._cache_on(wire)
186 cache_on, context_uid, repo_id = self._cache_on(wire)
187 @self.region.conditional_cache_on_arguments(condition=cache_on)
187 @self.region.conditional_cache_on_arguments(condition=cache_on)
188 def _assert_correct_path(_context_uid, _repo_id):
188 def _assert_correct_path(_context_uid, _repo_id):
189 try:
189 try:
190 repo_init = self._factory.repo_libgit2(wire)
190 repo_init = self._factory.repo_libgit2(wire)
191 with repo_init as repo:
191 with repo_init as repo:
192 pass
192 pass
193 except pygit2.GitError:
193 except pygit2.GitError:
194 path = wire.get('path')
194 path = wire.get('path')
195 tb = traceback.format_exc()
195 tb = traceback.format_exc()
196 log.debug("Invalid Git path `%s`, tb: %s", path, tb)
196 log.debug("Invalid Git path `%s`, tb: %s", path, tb)
197 return False
197 return False
198
198
199 return True
199 return True
200 return _assert_correct_path(context_uid, repo_id)
200 return _assert_correct_path(context_uid, repo_id)
201
201
202 @reraise_safe_exceptions
202 @reraise_safe_exceptions
203 def bare(self, wire):
203 def bare(self, wire):
204 repo_init = self._factory.repo_libgit2(wire)
204 repo_init = self._factory.repo_libgit2(wire)
205 with repo_init as repo:
205 with repo_init as repo:
206 return repo.is_bare
206 return repo.is_bare
207
207
208 @reraise_safe_exceptions
208 @reraise_safe_exceptions
209 def blob_as_pretty_string(self, wire, sha):
209 def blob_as_pretty_string(self, wire, sha):
210 repo_init = self._factory.repo_libgit2(wire)
210 repo_init = self._factory.repo_libgit2(wire)
211 with repo_init as repo:
211 with repo_init as repo:
212 blob_obj = repo[sha]
212 blob_obj = repo[sha]
213 blob = blob_obj.data
213 blob = blob_obj.data
214 return blob
214 return blob
215
215
216 @reraise_safe_exceptions
216 @reraise_safe_exceptions
217 def blob_raw_length(self, wire, sha):
217 def blob_raw_length(self, wire, sha):
218 cache_on, context_uid, repo_id = self._cache_on(wire)
218 cache_on, context_uid, repo_id = self._cache_on(wire)
219 @self.region.conditional_cache_on_arguments(condition=cache_on)
219 @self.region.conditional_cache_on_arguments(condition=cache_on)
220 def _blob_raw_length(_repo_id, _sha):
220 def _blob_raw_length(_repo_id, _sha):
221
221
222 repo_init = self._factory.repo_libgit2(wire)
222 repo_init = self._factory.repo_libgit2(wire)
223 with repo_init as repo:
223 with repo_init as repo:
224 blob = repo[sha]
224 blob = repo[sha]
225 return blob.size
225 return blob.size
226
226
227 return _blob_raw_length(repo_id, sha)
227 return _blob_raw_length(repo_id, sha)
228
228
229 def _parse_lfs_pointer(self, raw_content):
229 def _parse_lfs_pointer(self, raw_content):
230
230
231 spec_string = 'version https://git-lfs.github.com/spec'
231 spec_string = 'version https://git-lfs.github.com/spec'
232 if raw_content and raw_content.startswith(spec_string):
232 if raw_content and raw_content.startswith(spec_string):
233 pattern = re.compile(r"""
233 pattern = re.compile(r"""
234 (?:\n)?
234 (?:\n)?
235 ^version[ ]https://git-lfs\.github\.com/spec/(?P<spec_ver>v\d+)\n
235 ^version[ ]https://git-lfs\.github\.com/spec/(?P<spec_ver>v\d+)\n
236 ^oid[ ] sha256:(?P<oid_hash>[0-9a-f]{64})\n
236 ^oid[ ] sha256:(?P<oid_hash>[0-9a-f]{64})\n
237 ^size[ ](?P<oid_size>[0-9]+)\n
237 ^size[ ](?P<oid_size>[0-9]+)\n
238 (?:\n)?
238 (?:\n)?
239 """, re.VERBOSE | re.MULTILINE)
239 """, re.VERBOSE | re.MULTILINE)
240 match = pattern.match(raw_content)
240 match = pattern.match(raw_content)
241 if match:
241 if match:
242 return match.groupdict()
242 return match.groupdict()
243
243
244 return {}
244 return {}
245
245
246 @reraise_safe_exceptions
246 @reraise_safe_exceptions
247 def is_large_file(self, wire, commit_id):
247 def is_large_file(self, wire, commit_id):
248
248
249 cache_on, context_uid, repo_id = self._cache_on(wire)
249 cache_on, context_uid, repo_id = self._cache_on(wire)
250 @self.region.conditional_cache_on_arguments(condition=cache_on)
250 @self.region.conditional_cache_on_arguments(condition=cache_on)
251 def _is_large_file(_repo_id, _sha):
251 def _is_large_file(_repo_id, _sha):
252 repo_init = self._factory.repo_libgit2(wire)
252 repo_init = self._factory.repo_libgit2(wire)
253 with repo_init as repo:
253 with repo_init as repo:
254 blob = repo[commit_id]
254 blob = repo[commit_id]
255 if blob.is_binary:
255 if blob.is_binary:
256 return {}
256 return {}
257
257
258 return self._parse_lfs_pointer(blob.data)
258 return self._parse_lfs_pointer(blob.data)
259
259
260 return _is_large_file(repo_id, commit_id)
260 return _is_large_file(repo_id, commit_id)
261
261
262 @reraise_safe_exceptions
262 @reraise_safe_exceptions
263 def in_largefiles_store(self, wire, oid):
263 def in_largefiles_store(self, wire, oid):
264 conf = self._wire_to_config(wire)
264 conf = self._wire_to_config(wire)
265 repo_init = self._factory.repo_libgit2(wire)
265 repo_init = self._factory.repo_libgit2(wire)
266 with repo_init as repo:
266 with repo_init as repo:
267 repo_name = repo.path
267 repo_name = repo.path
268
268
269 store_location = conf.get('vcs_git_lfs_store_location')
269 store_location = conf.get('vcs_git_lfs_store_location')
270 if store_location:
270 if store_location:
271
271
272 store = LFSOidStore(
272 store = LFSOidStore(
273 oid=oid, repo=repo_name, store_location=store_location)
273 oid=oid, repo=repo_name, store_location=store_location)
274 return store.has_oid()
274 return store.has_oid()
275
275
276 return False
276 return False
277
277
278 @reraise_safe_exceptions
278 @reraise_safe_exceptions
279 def store_path(self, wire, oid):
279 def store_path(self, wire, oid):
280 conf = self._wire_to_config(wire)
280 conf = self._wire_to_config(wire)
281 repo_init = self._factory.repo_libgit2(wire)
281 repo_init = self._factory.repo_libgit2(wire)
282 with repo_init as repo:
282 with repo_init as repo:
283 repo_name = repo.path
283 repo_name = repo.path
284
284
285 store_location = conf.get('vcs_git_lfs_store_location')
285 store_location = conf.get('vcs_git_lfs_store_location')
286 if store_location:
286 if store_location:
287 store = LFSOidStore(
287 store = LFSOidStore(
288 oid=oid, repo=repo_name, store_location=store_location)
288 oid=oid, repo=repo_name, store_location=store_location)
289 return store.oid_path
289 return store.oid_path
290 raise ValueError('Unable to fetch oid with path {}'.format(oid))
290 raise ValueError('Unable to fetch oid with path {}'.format(oid))
291
291
292 @reraise_safe_exceptions
292 @reraise_safe_exceptions
293 def bulk_request(self, wire, rev, pre_load):
293 def bulk_request(self, wire, rev, pre_load):
294 cache_on, context_uid, repo_id = self._cache_on(wire)
294 cache_on, context_uid, repo_id = self._cache_on(wire)
295 @self.region.conditional_cache_on_arguments(condition=cache_on)
295 @self.region.conditional_cache_on_arguments(condition=cache_on)
296 def _bulk_request(_repo_id, _rev, _pre_load):
296 def _bulk_request(_repo_id, _rev, _pre_load):
297 result = {}
297 result = {}
298 for attr in pre_load:
298 for attr in pre_load:
299 try:
299 try:
300 method = self._bulk_methods[attr]
300 method = self._bulk_methods[attr]
301 args = [wire, rev]
301 args = [wire, rev]
302 result[attr] = method(*args)
302 result[attr] = method(*args)
303 except KeyError as e:
303 except KeyError as e:
304 raise exceptions.VcsException(e)(
304 raise exceptions.VcsException(e)(
305 "Unknown bulk attribute: %s" % attr)
305 "Unknown bulk attribute: %s" % attr)
306 return result
306 return result
307
307
308 return _bulk_request(repo_id, rev, sorted(pre_load))
308 return _bulk_request(repo_id, rev, sorted(pre_load))
309
309
310 def _build_opener(self, url):
310 def _build_opener(self, url):
311 handlers = []
311 handlers = []
312 url_obj = url_parser(url)
312 url_obj = url_parser(url)
313 _, authinfo = url_obj.authinfo()
313 _, authinfo = url_obj.authinfo()
314
314
315 if authinfo:
315 if authinfo:
316 # create a password manager
316 # create a password manager
317 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
317 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
318 passmgr.add_password(*authinfo)
318 passmgr.add_password(*authinfo)
319
319
320 handlers.extend((httpbasicauthhandler(passmgr),
320 handlers.extend((httpbasicauthhandler(passmgr),
321 httpdigestauthhandler(passmgr)))
321 httpdigestauthhandler(passmgr)))
322
322
323 return urllib2.build_opener(*handlers)
323 return urllib2.build_opener(*handlers)
324
324
325 def _type_id_to_name(self, type_id):
325 def _type_id_to_name(self, type_id):
326 return {
326 return {
327 1: b'commit',
327 1: b'commit',
328 2: b'tree',
328 2: b'tree',
329 3: b'blob',
329 3: b'blob',
330 4: b'tag'
330 4: b'tag'
331 }[type_id]
331 }[type_id]
332
332
333 @reraise_safe_exceptions
333 @reraise_safe_exceptions
334 def check_url(self, url, config):
334 def check_url(self, url, config):
335 url_obj = url_parser(url)
335 url_obj = url_parser(url)
336 test_uri, _ = url_obj.authinfo()
336 test_uri, _ = url_obj.authinfo()
337 url_obj.passwd = '*****' if url_obj.passwd else url_obj.passwd
337 url_obj.passwd = '*****' if url_obj.passwd else url_obj.passwd
338 url_obj.query = obfuscate_qs(url_obj.query)
338 url_obj.query = obfuscate_qs(url_obj.query)
339 cleaned_uri = str(url_obj)
339 cleaned_uri = str(url_obj)
340 log.info("Checking URL for remote cloning/import: %s", cleaned_uri)
340 log.info("Checking URL for remote cloning/import: %s", cleaned_uri)
341
341
342 if not test_uri.endswith('info/refs'):
342 if not test_uri.endswith('info/refs'):
343 test_uri = test_uri.rstrip('/') + '/info/refs'
343 test_uri = test_uri.rstrip('/') + '/info/refs'
344
344
345 o = self._build_opener(url)
345 o = self._build_opener(url)
346 o.addheaders = [('User-Agent', 'git/1.7.8.0')] # fake some git
346 o.addheaders = [('User-Agent', 'git/1.7.8.0')] # fake some git
347
347
348 q = {"service": 'git-upload-pack'}
348 q = {"service": 'git-upload-pack'}
349 qs = '?%s' % urllib.urlencode(q)
349 qs = '?%s' % urllib.urlencode(q)
350 cu = "%s%s" % (test_uri, qs)
350 cu = "%s%s" % (test_uri, qs)
351 req = urllib2.Request(cu, None, {})
351 req = urllib2.Request(cu, None, {})
352
352
353 try:
353 try:
354 log.debug("Trying to open URL %s", cleaned_uri)
354 log.debug("Trying to open URL %s", cleaned_uri)
355 resp = o.open(req)
355 resp = o.open(req)
356 if resp.code != 200:
356 if resp.code != 200:
357 raise exceptions.URLError()('Return Code is not 200')
357 raise exceptions.URLError()('Return Code is not 200')
358 except Exception as e:
358 except Exception as e:
359 log.warning("URL cannot be opened: %s", cleaned_uri, exc_info=True)
359 log.warning("URL cannot be opened: %s", cleaned_uri, exc_info=True)
360 # means it cannot be cloned
360 # means it cannot be cloned
361 raise exceptions.URLError(e)("[%s] org_exc: %s" % (cleaned_uri, e))
361 raise exceptions.URLError(e)("[%s] org_exc: %s" % (cleaned_uri, e))
362
362
363 # now detect if it's proper git repo
363 # now detect if it's proper git repo
364 gitdata = resp.read()
364 gitdata = resp.read()
365 if 'service=git-upload-pack' in gitdata:
365 if 'service=git-upload-pack' in gitdata:
366 pass
366 pass
367 elif re.findall(r'[0-9a-fA-F]{40}\s+refs', gitdata):
367 elif re.findall(r'[0-9a-fA-F]{40}\s+refs', gitdata):
368 # old style git can return some other format !
368 # old style git can return some other format !
369 pass
369 pass
370 else:
370 else:
371 raise exceptions.URLError()(
371 raise exceptions.URLError()(
372 "url [%s] does not look like an git" % (cleaned_uri,))
372 "url [%s] does not look like an git" % (cleaned_uri,))
373
373
374 return True
374 return True
375
375
376 @reraise_safe_exceptions
376 @reraise_safe_exceptions
377 def clone(self, wire, url, deferred, valid_refs, update_after_clone):
377 def clone(self, wire, url, deferred, valid_refs, update_after_clone):
378 # TODO(marcink): deprecate this method. Last i checked we don't use it anymore
378 # TODO(marcink): deprecate this method. Last i checked we don't use it anymore
379 remote_refs = self.pull(wire, url, apply_refs=False)
379 remote_refs = self.pull(wire, url, apply_refs=False)
380 repo = self._factory.repo(wire)
380 repo = self._factory.repo(wire)
381 if isinstance(valid_refs, list):
381 if isinstance(valid_refs, list):
382 valid_refs = tuple(valid_refs)
382 valid_refs = tuple(valid_refs)
383
383
384 for k in remote_refs:
384 for k in remote_refs:
385 # only parse heads/tags and skip so called deferred tags
385 # only parse heads/tags and skip so called deferred tags
386 if k.startswith(valid_refs) and not k.endswith(deferred):
386 if k.startswith(valid_refs) and not k.endswith(deferred):
387 repo[k] = remote_refs[k]
387 repo[k] = remote_refs[k]
388
388
389 if update_after_clone:
389 if update_after_clone:
390 # we want to checkout HEAD
390 # we want to checkout HEAD
391 repo["HEAD"] = remote_refs["HEAD"]
391 repo["HEAD"] = remote_refs["HEAD"]
392 index.build_index_from_tree(repo.path, repo.index_path(),
392 index.build_index_from_tree(repo.path, repo.index_path(),
393 repo.object_store, repo["HEAD"].tree)
393 repo.object_store, repo["HEAD"].tree)
394
394
395 @reraise_safe_exceptions
395 @reraise_safe_exceptions
396 def branch(self, wire, commit_id):
396 def branch(self, wire, commit_id):
397 cache_on, context_uid, repo_id = self._cache_on(wire)
397 cache_on, context_uid, repo_id = self._cache_on(wire)
398 @self.region.conditional_cache_on_arguments(condition=cache_on)
398 @self.region.conditional_cache_on_arguments(condition=cache_on)
399 def _branch(_context_uid, _repo_id, _commit_id):
399 def _branch(_context_uid, _repo_id, _commit_id):
400 regex = re.compile('^refs/heads')
400 regex = re.compile('^refs/heads')
401
401
402 def filter_with(ref):
402 def filter_with(ref):
403 return regex.match(ref[0]) and ref[1] == _commit_id
403 return regex.match(ref[0]) and ref[1] == _commit_id
404
404
405 branches = filter(filter_with, self.get_refs(wire).items())
405 branches = filter(filter_with, self.get_refs(wire).items())
406 return [x[0].split('refs/heads/')[-1] for x in branches]
406 return [x[0].split('refs/heads/')[-1] for x in branches]
407
407
408 return _branch(context_uid, repo_id, commit_id)
408 return _branch(context_uid, repo_id, commit_id)
409
409
410 @reraise_safe_exceptions
410 @reraise_safe_exceptions
411 def commit_branches(self, wire, commit_id):
411 def commit_branches(self, wire, commit_id):
412 cache_on, context_uid, repo_id = self._cache_on(wire)
412 cache_on, context_uid, repo_id = self._cache_on(wire)
413 @self.region.conditional_cache_on_arguments(condition=cache_on)
413 @self.region.conditional_cache_on_arguments(condition=cache_on)
414 def _commit_branches(_context_uid, _repo_id, _commit_id):
414 def _commit_branches(_context_uid, _repo_id, _commit_id):
415 repo_init = self._factory.repo_libgit2(wire)
415 repo_init = self._factory.repo_libgit2(wire)
416 with repo_init as repo:
416 with repo_init as repo:
417 branches = [x for x in repo.branches.with_commit(_commit_id)]
417 branches = [x for x in repo.branches.with_commit(_commit_id)]
418 return branches
418 return branches
419
419
420 return _commit_branches(context_uid, repo_id, commit_id)
420 return _commit_branches(context_uid, repo_id, commit_id)
421
421
422 @reraise_safe_exceptions
422 @reraise_safe_exceptions
423 def add_object(self, wire, content):
423 def add_object(self, wire, content):
424 repo_init = self._factory.repo_libgit2(wire)
424 repo_init = self._factory.repo_libgit2(wire)
425 with repo_init as repo:
425 with repo_init as repo:
426 blob = objects.Blob()
426 blob = objects.Blob()
427 blob.set_raw_string(content)
427 blob.set_raw_string(content)
428 repo.object_store.add_object(blob)
428 repo.object_store.add_object(blob)
429 return blob.id
429 return blob.id
430
430
431 # TODO: this is quite complex, check if that can be simplified
431 # TODO: this is quite complex, check if that can be simplified
432 @reraise_safe_exceptions
432 @reraise_safe_exceptions
433 def commit(self, wire, commit_data, branch, commit_tree, updated, removed):
433 def commit(self, wire, commit_data, branch, commit_tree, updated, removed):
434 repo = self._factory.repo(wire)
434 repo = self._factory.repo(wire)
435 object_store = repo.object_store
435 object_store = repo.object_store
436
436
437 # Create tree and populates it with blobs
437 # Create tree and populates it with blobs
438 commit_tree = commit_tree and repo[commit_tree] or objects.Tree()
438 commit_tree = commit_tree and repo[commit_tree] or objects.Tree()
439
439
440 for node in updated:
440 for node in updated:
441 # Compute subdirs if needed
441 # Compute subdirs if needed
442 dirpath, nodename = vcspath.split(node['path'])
442 dirpath, nodename = vcspath.split(node['path'])
443 dirnames = map(safe_str, dirpath and dirpath.split('/') or [])
443 dirnames = map(safe_str, dirpath and dirpath.split('/') or [])
444 parent = commit_tree
444 parent = commit_tree
445 ancestors = [('', parent)]
445 ancestors = [('', parent)]
446
446
447 # Tries to dig for the deepest existing tree
447 # Tries to dig for the deepest existing tree
448 while dirnames:
448 while dirnames:
449 curdir = dirnames.pop(0)
449 curdir = dirnames.pop(0)
450 try:
450 try:
451 dir_id = parent[curdir][1]
451 dir_id = parent[curdir][1]
452 except KeyError:
452 except KeyError:
453 # put curdir back into dirnames and stops
453 # put curdir back into dirnames and stops
454 dirnames.insert(0, curdir)
454 dirnames.insert(0, curdir)
455 break
455 break
456 else:
456 else:
457 # If found, updates parent
457 # If found, updates parent
458 parent = repo[dir_id]
458 parent = repo[dir_id]
459 ancestors.append((curdir, parent))
459 ancestors.append((curdir, parent))
460 # Now parent is deepest existing tree and we need to create
460 # Now parent is deepest existing tree and we need to create
461 # subtrees for dirnames (in reverse order)
461 # subtrees for dirnames (in reverse order)
462 # [this only applies for nodes from added]
462 # [this only applies for nodes from added]
463 new_trees = []
463 new_trees = []
464
464
465 blob = objects.Blob.from_string(node['content'])
465 blob = objects.Blob.from_string(node['content'])
466
466
467 if dirnames:
467 if dirnames:
468 # If there are trees which should be created we need to build
468 # If there are trees which should be created we need to build
469 # them now (in reverse order)
469 # them now (in reverse order)
470 reversed_dirnames = list(reversed(dirnames))
470 reversed_dirnames = list(reversed(dirnames))
471 curtree = objects.Tree()
471 curtree = objects.Tree()
472 curtree[node['node_path']] = node['mode'], blob.id
472 curtree[node['node_path']] = node['mode'], blob.id
473 new_trees.append(curtree)
473 new_trees.append(curtree)
474 for dirname in reversed_dirnames[:-1]:
474 for dirname in reversed_dirnames[:-1]:
475 newtree = objects.Tree()
475 newtree = objects.Tree()
476 newtree[dirname] = (DIR_STAT, curtree.id)
476 newtree[dirname] = (DIR_STAT, curtree.id)
477 new_trees.append(newtree)
477 new_trees.append(newtree)
478 curtree = newtree
478 curtree = newtree
479 parent[reversed_dirnames[-1]] = (DIR_STAT, curtree.id)
479 parent[reversed_dirnames[-1]] = (DIR_STAT, curtree.id)
480 else:
480 else:
481 parent.add(name=node['node_path'], mode=node['mode'], hexsha=blob.id)
481 parent.add(name=node['node_path'], mode=node['mode'], hexsha=blob.id)
482
482
483 new_trees.append(parent)
483 new_trees.append(parent)
484 # Update ancestors
484 # Update ancestors
485 reversed_ancestors = reversed(
485 reversed_ancestors = reversed(
486 [(a[1], b[1], b[0]) for a, b in zip(ancestors, ancestors[1:])])
486 [(a[1], b[1], b[0]) for a, b in zip(ancestors, ancestors[1:])])
487 for parent, tree, path in reversed_ancestors:
487 for parent, tree, path in reversed_ancestors:
488 parent[path] = (DIR_STAT, tree.id)
488 parent[path] = (DIR_STAT, tree.id)
489 object_store.add_object(tree)
489 object_store.add_object(tree)
490
490
491 object_store.add_object(blob)
491 object_store.add_object(blob)
492 for tree in new_trees:
492 for tree in new_trees:
493 object_store.add_object(tree)
493 object_store.add_object(tree)
494
494
495 for node_path in removed:
495 for node_path in removed:
496 paths = node_path.split('/')
496 paths = node_path.split('/')
497 tree = commit_tree
497 tree = commit_tree
498 trees = [tree]
498 trees = [tree]
499 # Traverse deep into the forest...
499 # Traverse deep into the forest...
500 for path in paths:
500 for path in paths:
501 try:
501 try:
502 obj = repo[tree[path][1]]
502 obj = repo[tree[path][1]]
503 if isinstance(obj, objects.Tree):
503 if isinstance(obj, objects.Tree):
504 trees.append(obj)
504 trees.append(obj)
505 tree = obj
505 tree = obj
506 except KeyError:
506 except KeyError:
507 break
507 break
508 # Cut down the blob and all rotten trees on the way back...
508 # Cut down the blob and all rotten trees on the way back...
509 for path, tree in reversed(zip(paths, trees)):
509 for path, tree in reversed(zip(paths, trees)):
510 del tree[path]
510 del tree[path]
511 if tree:
511 if tree:
512 # This tree still has elements - don't remove it or any
512 # This tree still has elements - don't remove it or any
513 # of it's parents
513 # of it's parents
514 break
514 break
515
515
516 object_store.add_object(commit_tree)
516 object_store.add_object(commit_tree)
517
517
518 # Create commit
518 # Create commit
519 commit = objects.Commit()
519 commit = objects.Commit()
520 commit.tree = commit_tree.id
520 commit.tree = commit_tree.id
521 for k, v in commit_data.iteritems():
521 for k, v in commit_data.iteritems():
522 setattr(commit, k, v)
522 setattr(commit, k, v)
523 object_store.add_object(commit)
523 object_store.add_object(commit)
524
524
525 self.create_branch(wire, branch, commit.id)
525 self.create_branch(wire, branch, commit.id)
526
526
527 # dulwich set-ref
527 # dulwich set-ref
528 ref = 'refs/heads/%s' % branch
528 ref = 'refs/heads/%s' % branch
529 repo.refs[ref] = commit.id
529 repo.refs[ref] = commit.id
530
530
531 return commit.id
531 return commit.id
532
532
533 @reraise_safe_exceptions
533 @reraise_safe_exceptions
534 def pull(self, wire, url, apply_refs=True, refs=None, update_after=False):
534 def pull(self, wire, url, apply_refs=True, refs=None, update_after=False):
535 if url != 'default' and '://' not in url:
535 if url != 'default' and '://' not in url:
536 client = LocalGitClient(url)
536 client = LocalGitClient(url)
537 else:
537 else:
538 url_obj = url_parser(url)
538 url_obj = url_parser(url)
539 o = self._build_opener(url)
539 o = self._build_opener(url)
540 url, _ = url_obj.authinfo()
540 url, _ = url_obj.authinfo()
541 client = HttpGitClient(base_url=url, opener=o)
541 client = HttpGitClient(base_url=url, opener=o)
542 repo = self._factory.repo(wire)
542 repo = self._factory.repo(wire)
543
543
544 determine_wants = repo.object_store.determine_wants_all
544 determine_wants = repo.object_store.determine_wants_all
545 if refs:
545 if refs:
546 def determine_wants_requested(references):
546 def determine_wants_requested(references):
547 return [references[r] for r in references if r in refs]
547 return [references[r] for r in references if r in refs]
548 determine_wants = determine_wants_requested
548 determine_wants = determine_wants_requested
549
549
550 try:
550 try:
551 remote_refs = client.fetch(
551 remote_refs = client.fetch(
552 path=url, target=repo, determine_wants=determine_wants)
552 path=url, target=repo, determine_wants=determine_wants)
553 except NotGitRepository as e:
553 except NotGitRepository as e:
554 log.warning(
554 log.warning(
555 'Trying to fetch from "%s" failed, not a Git repository.', url)
555 'Trying to fetch from "%s" failed, not a Git repository.', url)
556 # Exception can contain unicode which we convert
556 # Exception can contain unicode which we convert
557 raise exceptions.AbortException(e)(repr(e))
557 raise exceptions.AbortException(e)(repr(e))
558
558
559 # mikhail: client.fetch() returns all the remote refs, but fetches only
559 # mikhail: client.fetch() returns all the remote refs, but fetches only
560 # refs filtered by `determine_wants` function. We need to filter result
560 # refs filtered by `determine_wants` function. We need to filter result
561 # as well
561 # as well
562 if refs:
562 if refs:
563 remote_refs = {k: remote_refs[k] for k in remote_refs if k in refs}
563 remote_refs = {k: remote_refs[k] for k in remote_refs if k in refs}
564
564
565 if apply_refs:
565 if apply_refs:
566 # TODO: johbo: Needs proper test coverage with a git repository
566 # TODO: johbo: Needs proper test coverage with a git repository
567 # that contains a tag object, so that we would end up with
567 # that contains a tag object, so that we would end up with
568 # a peeled ref at this point.
568 # a peeled ref at this point.
569 for k in remote_refs:
569 for k in remote_refs:
570 if k.endswith(PEELED_REF_MARKER):
570 if k.endswith(PEELED_REF_MARKER):
571 log.debug("Skipping peeled reference %s", k)
571 log.debug("Skipping peeled reference %s", k)
572 continue
572 continue
573 repo[k] = remote_refs[k]
573 repo[k] = remote_refs[k]
574
574
575 if refs and not update_after:
575 if refs and not update_after:
576 # mikhail: explicitly set the head to the last ref.
576 # mikhail: explicitly set the head to the last ref.
577 repo['HEAD'] = remote_refs[refs[-1]]
577 repo['HEAD'] = remote_refs[refs[-1]]
578
578
579 if update_after:
579 if update_after:
580 # we want to checkout HEAD
580 # we want to checkout HEAD
581 repo["HEAD"] = remote_refs["HEAD"]
581 repo["HEAD"] = remote_refs["HEAD"]
582 index.build_index_from_tree(repo.path, repo.index_path(),
582 index.build_index_from_tree(repo.path, repo.index_path(),
583 repo.object_store, repo["HEAD"].tree)
583 repo.object_store, repo["HEAD"].tree)
584 return remote_refs
584 return remote_refs
585
585
586 @reraise_safe_exceptions
586 @reraise_safe_exceptions
587 def sync_fetch(self, wire, url, refs=None):
587 def sync_fetch(self, wire, url, refs=None, all_refs=False):
588 repo = self._factory.repo(wire)
588 repo = self._factory.repo(wire)
589 if refs and not isinstance(refs, (list, tuple)):
589 if refs and not isinstance(refs, (list, tuple)):
590 refs = [refs]
590 refs = [refs]
591
591 config = self._wire_to_config(wire)
592 config = self._wire_to_config(wire)
592 # get all remote refs we'll use to fetch later
593 # get all remote refs we'll use to fetch later
594 cmd = ['ls-remote']
595 if not all_refs:
596 cmd += ['--heads', '--tags']
597 cmd += [url]
593 output, __ = self.run_git_command(
598 output, __ = self.run_git_command(
594 wire, ['ls-remote', url], fail_on_stderr=False,
599 wire, cmd, fail_on_stderr=False,
595 _copts=self._remote_conf(config),
600 _copts=self._remote_conf(config),
596 extra_env={'GIT_TERMINAL_PROMPT': '0'})
601 extra_env={'GIT_TERMINAL_PROMPT': '0'})
597
602
598 remote_refs = collections.OrderedDict()
603 remote_refs = collections.OrderedDict()
599 fetch_refs = []
604 fetch_refs = []
600
605
601 for ref_line in output.splitlines():
606 for ref_line in output.splitlines():
602 sha, ref = ref_line.split('\t')
607 sha, ref = ref_line.split('\t')
603 sha = sha.strip()
608 sha = sha.strip()
604 if ref in remote_refs:
609 if ref in remote_refs:
605 # duplicate, skip
610 # duplicate, skip
606 continue
611 continue
607 if ref.endswith(PEELED_REF_MARKER):
612 if ref.endswith(PEELED_REF_MARKER):
608 log.debug("Skipping peeled reference %s", ref)
613 log.debug("Skipping peeled reference %s", ref)
609 continue
614 continue
610 # don't sync HEAD
615 # don't sync HEAD
611 if ref in ['HEAD']:
616 if ref in ['HEAD']:
612 continue
617 continue
613
618
614 remote_refs[ref] = sha
619 remote_refs[ref] = sha
615
620
616 if refs and sha in refs:
621 if refs and sha in refs:
617 # we filter fetch using our specified refs
622 # we filter fetch using our specified refs
618 fetch_refs.append('{}:{}'.format(ref, ref))
623 fetch_refs.append('{}:{}'.format(ref, ref))
619 elif not refs:
624 elif not refs:
620 fetch_refs.append('{}:{}'.format(ref, ref))
625 fetch_refs.append('{}:{}'.format(ref, ref))
621 log.debug('Finished obtaining fetch refs, total: %s', len(fetch_refs))
626 log.debug('Finished obtaining fetch refs, total: %s', len(fetch_refs))
627
622 if fetch_refs:
628 if fetch_refs:
623 for chunk in more_itertools.chunked(fetch_refs, 1024 * 4):
629 for chunk in more_itertools.chunked(fetch_refs, 1024 * 4):
624 fetch_refs_chunks = list(chunk)
630 fetch_refs_chunks = list(chunk)
625 log.debug('Fetching %s refs from import url', len(fetch_refs_chunks))
631 log.debug('Fetching %s refs from import url', len(fetch_refs_chunks))
626 _out, _err = self.run_git_command(
632 _out, _err = self.run_git_command(
627 wire, ['fetch', url, '--force', '--prune', '--'] + fetch_refs_chunks,
633 wire, ['fetch', url, '--force', '--prune', '--'] + fetch_refs_chunks,
628 fail_on_stderr=False,
634 fail_on_stderr=False,
629 _copts=self._remote_conf(config),
635 _copts=self._remote_conf(config),
630 extra_env={'GIT_TERMINAL_PROMPT': '0'})
636 extra_env={'GIT_TERMINAL_PROMPT': '0'})
631
637
632 return remote_refs
638 return remote_refs
633
639
634 @reraise_safe_exceptions
640 @reraise_safe_exceptions
635 def sync_push(self, wire, url, refs=None):
641 def sync_push(self, wire, url, refs=None):
636 if not self.check_url(url, wire):
642 if not self.check_url(url, wire):
637 return
643 return
638 config = self._wire_to_config(wire)
644 config = self._wire_to_config(wire)
639 self._factory.repo(wire)
645 self._factory.repo(wire)
640 self.run_git_command(
646 self.run_git_command(
641 wire, ['push', url, '--mirror'], fail_on_stderr=False,
647 wire, ['push', url, '--mirror'], fail_on_stderr=False,
642 _copts=self._remote_conf(config),
648 _copts=self._remote_conf(config),
643 extra_env={'GIT_TERMINAL_PROMPT': '0'})
649 extra_env={'GIT_TERMINAL_PROMPT': '0'})
644
650
645 @reraise_safe_exceptions
651 @reraise_safe_exceptions
646 def get_remote_refs(self, wire, url):
652 def get_remote_refs(self, wire, url):
647 repo = Repo(url)
653 repo = Repo(url)
648 return repo.get_refs()
654 return repo.get_refs()
649
655
650 @reraise_safe_exceptions
656 @reraise_safe_exceptions
651 def get_description(self, wire):
657 def get_description(self, wire):
652 repo = self._factory.repo(wire)
658 repo = self._factory.repo(wire)
653 return repo.get_description()
659 return repo.get_description()
654
660
655 @reraise_safe_exceptions
661 @reraise_safe_exceptions
656 def get_missing_revs(self, wire, rev1, rev2, path2):
662 def get_missing_revs(self, wire, rev1, rev2, path2):
657 repo = self._factory.repo(wire)
663 repo = self._factory.repo(wire)
658 LocalGitClient(thin_packs=False).fetch(path2, repo)
664 LocalGitClient(thin_packs=False).fetch(path2, repo)
659
665
660 wire_remote = wire.copy()
666 wire_remote = wire.copy()
661 wire_remote['path'] = path2
667 wire_remote['path'] = path2
662 repo_remote = self._factory.repo(wire_remote)
668 repo_remote = self._factory.repo(wire_remote)
663 LocalGitClient(thin_packs=False).fetch(wire["path"], repo_remote)
669 LocalGitClient(thin_packs=False).fetch(wire["path"], repo_remote)
664
670
665 revs = [
671 revs = [
666 x.commit.id
672 x.commit.id
667 for x in repo_remote.get_walker(include=[rev2], exclude=[rev1])]
673 for x in repo_remote.get_walker(include=[rev2], exclude=[rev1])]
668 return revs
674 return revs
669
675
670 @reraise_safe_exceptions
676 @reraise_safe_exceptions
671 def get_object(self, wire, sha):
677 def get_object(self, wire, sha):
672 cache_on, context_uid, repo_id = self._cache_on(wire)
678 cache_on, context_uid, repo_id = self._cache_on(wire)
673 @self.region.conditional_cache_on_arguments(condition=cache_on)
679 @self.region.conditional_cache_on_arguments(condition=cache_on)
674 def _get_object(_context_uid, _repo_id, _sha):
680 def _get_object(_context_uid, _repo_id, _sha):
675 repo_init = self._factory.repo_libgit2(wire)
681 repo_init = self._factory.repo_libgit2(wire)
676 with repo_init as repo:
682 with repo_init as repo:
677
683
678 missing_commit_err = 'Commit {} does not exist for `{}`'.format(sha, wire['path'])
684 missing_commit_err = 'Commit {} does not exist for `{}`'.format(sha, wire['path'])
679 try:
685 try:
680 commit = repo.revparse_single(sha)
686 commit = repo.revparse_single(sha)
681 except (KeyError, ValueError) as e:
687 except (KeyError, ValueError) as e:
682 raise exceptions.LookupException(e)(missing_commit_err)
688 raise exceptions.LookupException(e)(missing_commit_err)
683
689
684 is_tag = False
690 is_tag = False
685 if isinstance(commit, pygit2.Tag):
691 if isinstance(commit, pygit2.Tag):
686 commit = repo.get(commit.target)
692 commit = repo.get(commit.target)
687 is_tag = True
693 is_tag = True
688
694
689 if not is_tag:
695 if not is_tag:
690 # check for dangling commit
696 # check for dangling commit
691 branches = [x for x in repo.branches.with_commit(commit.hex)]
697 branches = [x for x in repo.branches.with_commit(commit.hex)]
692 if not branches:
698 if not branches:
693 raise exceptions.LookupException(None)(missing_commit_err)
699 raise exceptions.LookupException(None)(missing_commit_err)
694
700
695 commit_id = commit.hex
701 commit_id = commit.hex
696 type_id = commit.type
702 type_id = commit.type
697
703
698 return {
704 return {
699 'id': commit_id,
705 'id': commit_id,
700 'type': self._type_id_to_name(type_id),
706 'type': self._type_id_to_name(type_id),
701 'commit_id': commit_id,
707 'commit_id': commit_id,
702 'idx': 0
708 'idx': 0
703 }
709 }
704
710
705 return _get_object(context_uid, repo_id, sha)
711 return _get_object(context_uid, repo_id, sha)
706
712
707 @reraise_safe_exceptions
713 @reraise_safe_exceptions
708 def get_refs(self, wire):
714 def get_refs(self, wire):
709 cache_on, context_uid, repo_id = self._cache_on(wire)
715 cache_on, context_uid, repo_id = self._cache_on(wire)
710 @self.region.conditional_cache_on_arguments(condition=cache_on)
716 @self.region.conditional_cache_on_arguments(condition=cache_on)
711 def _get_refs(_context_uid, _repo_id):
717 def _get_refs(_context_uid, _repo_id):
712
718
713 repo_init = self._factory.repo_libgit2(wire)
719 repo_init = self._factory.repo_libgit2(wire)
714 with repo_init as repo:
720 with repo_init as repo:
715 regex = re.compile('^refs/(heads|tags)/')
721 regex = re.compile('^refs/(heads|tags)/')
716 return {x.name: x.target.hex for x in
722 return {x.name: x.target.hex for x in
717 filter(lambda ref: regex.match(ref.name) ,repo.listall_reference_objects())}
723 filter(lambda ref: regex.match(ref.name) ,repo.listall_reference_objects())}
718
724
719 return _get_refs(context_uid, repo_id)
725 return _get_refs(context_uid, repo_id)
720
726
721 @reraise_safe_exceptions
727 @reraise_safe_exceptions
722 def get_branch_pointers(self, wire):
728 def get_branch_pointers(self, wire):
723 cache_on, context_uid, repo_id = self._cache_on(wire)
729 cache_on, context_uid, repo_id = self._cache_on(wire)
724 @self.region.conditional_cache_on_arguments(condition=cache_on)
730 @self.region.conditional_cache_on_arguments(condition=cache_on)
725 def _get_branch_pointers(_context_uid, _repo_id):
731 def _get_branch_pointers(_context_uid, _repo_id):
726
732
727 repo_init = self._factory.repo_libgit2(wire)
733 repo_init = self._factory.repo_libgit2(wire)
728 regex = re.compile('^refs/heads')
734 regex = re.compile('^refs/heads')
729 with repo_init as repo:
735 with repo_init as repo:
730 branches = filter(lambda ref: regex.match(ref.name), repo.listall_reference_objects())
736 branches = filter(lambda ref: regex.match(ref.name), repo.listall_reference_objects())
731 return {x.target.hex: x.shorthand for x in branches}
737 return {x.target.hex: x.shorthand for x in branches}
732
738
733 return _get_branch_pointers(context_uid, repo_id)
739 return _get_branch_pointers(context_uid, repo_id)
734
740
735 @reraise_safe_exceptions
741 @reraise_safe_exceptions
736 def head(self, wire, show_exc=True):
742 def head(self, wire, show_exc=True):
737 cache_on, context_uid, repo_id = self._cache_on(wire)
743 cache_on, context_uid, repo_id = self._cache_on(wire)
738 @self.region.conditional_cache_on_arguments(condition=cache_on)
744 @self.region.conditional_cache_on_arguments(condition=cache_on)
739 def _head(_context_uid, _repo_id, _show_exc):
745 def _head(_context_uid, _repo_id, _show_exc):
740 repo_init = self._factory.repo_libgit2(wire)
746 repo_init = self._factory.repo_libgit2(wire)
741 with repo_init as repo:
747 with repo_init as repo:
742 try:
748 try:
743 return repo.head.peel().hex
749 return repo.head.peel().hex
744 except Exception:
750 except Exception:
745 if show_exc:
751 if show_exc:
746 raise
752 raise
747 return _head(context_uid, repo_id, show_exc)
753 return _head(context_uid, repo_id, show_exc)
748
754
749 @reraise_safe_exceptions
755 @reraise_safe_exceptions
750 def init(self, wire):
756 def init(self, wire):
751 repo_path = str_to_dulwich(wire['path'])
757 repo_path = str_to_dulwich(wire['path'])
752 self.repo = Repo.init(repo_path)
758 self.repo = Repo.init(repo_path)
753
759
754 @reraise_safe_exceptions
760 @reraise_safe_exceptions
755 def init_bare(self, wire):
761 def init_bare(self, wire):
756 repo_path = str_to_dulwich(wire['path'])
762 repo_path = str_to_dulwich(wire['path'])
757 self.repo = Repo.init_bare(repo_path)
763 self.repo = Repo.init_bare(repo_path)
758
764
759 @reraise_safe_exceptions
765 @reraise_safe_exceptions
760 def revision(self, wire, rev):
766 def revision(self, wire, rev):
761
767
762 cache_on, context_uid, repo_id = self._cache_on(wire)
768 cache_on, context_uid, repo_id = self._cache_on(wire)
763 @self.region.conditional_cache_on_arguments(condition=cache_on)
769 @self.region.conditional_cache_on_arguments(condition=cache_on)
764 def _revision(_context_uid, _repo_id, _rev):
770 def _revision(_context_uid, _repo_id, _rev):
765 repo_init = self._factory.repo_libgit2(wire)
771 repo_init = self._factory.repo_libgit2(wire)
766 with repo_init as repo:
772 with repo_init as repo:
767 commit = repo[rev]
773 commit = repo[rev]
768 obj_data = {
774 obj_data = {
769 'id': commit.id.hex,
775 'id': commit.id.hex,
770 }
776 }
771 # tree objects itself don't have tree_id attribute
777 # tree objects itself don't have tree_id attribute
772 if hasattr(commit, 'tree_id'):
778 if hasattr(commit, 'tree_id'):
773 obj_data['tree'] = commit.tree_id.hex
779 obj_data['tree'] = commit.tree_id.hex
774
780
775 return obj_data
781 return obj_data
776 return _revision(context_uid, repo_id, rev)
782 return _revision(context_uid, repo_id, rev)
777
783
778 @reraise_safe_exceptions
784 @reraise_safe_exceptions
779 def date(self, wire, commit_id):
785 def date(self, wire, commit_id):
780 cache_on, context_uid, repo_id = self._cache_on(wire)
786 cache_on, context_uid, repo_id = self._cache_on(wire)
781 @self.region.conditional_cache_on_arguments(condition=cache_on)
787 @self.region.conditional_cache_on_arguments(condition=cache_on)
782 def _date(_repo_id, _commit_id):
788 def _date(_repo_id, _commit_id):
783 repo_init = self._factory.repo_libgit2(wire)
789 repo_init = self._factory.repo_libgit2(wire)
784 with repo_init as repo:
790 with repo_init as repo:
785 commit = repo[commit_id]
791 commit = repo[commit_id]
786
792
787 if hasattr(commit, 'commit_time'):
793 if hasattr(commit, 'commit_time'):
788 commit_time, commit_time_offset = commit.commit_time, commit.commit_time_offset
794 commit_time, commit_time_offset = commit.commit_time, commit.commit_time_offset
789 else:
795 else:
790 commit = commit.get_object()
796 commit = commit.get_object()
791 commit_time, commit_time_offset = commit.commit_time, commit.commit_time_offset
797 commit_time, commit_time_offset = commit.commit_time, commit.commit_time_offset
792
798
793 # TODO(marcink): check dulwich difference of offset vs timezone
799 # TODO(marcink): check dulwich difference of offset vs timezone
794 return [commit_time, commit_time_offset]
800 return [commit_time, commit_time_offset]
795 return _date(repo_id, commit_id)
801 return _date(repo_id, commit_id)
796
802
797 @reraise_safe_exceptions
803 @reraise_safe_exceptions
798 def author(self, wire, commit_id):
804 def author(self, wire, commit_id):
799 cache_on, context_uid, repo_id = self._cache_on(wire)
805 cache_on, context_uid, repo_id = self._cache_on(wire)
800 @self.region.conditional_cache_on_arguments(condition=cache_on)
806 @self.region.conditional_cache_on_arguments(condition=cache_on)
801 def _author(_repo_id, _commit_id):
807 def _author(_repo_id, _commit_id):
802 repo_init = self._factory.repo_libgit2(wire)
808 repo_init = self._factory.repo_libgit2(wire)
803 with repo_init as repo:
809 with repo_init as repo:
804 commit = repo[commit_id]
810 commit = repo[commit_id]
805
811
806 if hasattr(commit, 'author'):
812 if hasattr(commit, 'author'):
807 author = commit.author
813 author = commit.author
808 else:
814 else:
809 author = commit.get_object().author
815 author = commit.get_object().author
810
816
811 if author.email:
817 if author.email:
812 return u"{} <{}>".format(author.name, author.email)
818 return u"{} <{}>".format(author.name, author.email)
813
819
814 return u"{}".format(author.raw_name)
820 return u"{}".format(author.raw_name)
815 return _author(repo_id, commit_id)
821 return _author(repo_id, commit_id)
816
822
817 @reraise_safe_exceptions
823 @reraise_safe_exceptions
818 def message(self, wire, commit_id):
824 def message(self, wire, commit_id):
819 cache_on, context_uid, repo_id = self._cache_on(wire)
825 cache_on, context_uid, repo_id = self._cache_on(wire)
820 @self.region.conditional_cache_on_arguments(condition=cache_on)
826 @self.region.conditional_cache_on_arguments(condition=cache_on)
821 def _message(_repo_id, _commit_id):
827 def _message(_repo_id, _commit_id):
822 repo_init = self._factory.repo_libgit2(wire)
828 repo_init = self._factory.repo_libgit2(wire)
823 with repo_init as repo:
829 with repo_init as repo:
824 commit = repo[commit_id]
830 commit = repo[commit_id]
825 return commit.message
831 return commit.message
826 return _message(repo_id, commit_id)
832 return _message(repo_id, commit_id)
827
833
828 @reraise_safe_exceptions
834 @reraise_safe_exceptions
829 def parents(self, wire, commit_id):
835 def parents(self, wire, commit_id):
830 cache_on, context_uid, repo_id = self._cache_on(wire)
836 cache_on, context_uid, repo_id = self._cache_on(wire)
831 @self.region.conditional_cache_on_arguments(condition=cache_on)
837 @self.region.conditional_cache_on_arguments(condition=cache_on)
832 def _parents(_repo_id, _commit_id):
838 def _parents(_repo_id, _commit_id):
833 repo_init = self._factory.repo_libgit2(wire)
839 repo_init = self._factory.repo_libgit2(wire)
834 with repo_init as repo:
840 with repo_init as repo:
835 commit = repo[commit_id]
841 commit = repo[commit_id]
836 if hasattr(commit, 'parent_ids'):
842 if hasattr(commit, 'parent_ids'):
837 parent_ids = commit.parent_ids
843 parent_ids = commit.parent_ids
838 else:
844 else:
839 parent_ids = commit.get_object().parent_ids
845 parent_ids = commit.get_object().parent_ids
840
846
841 return [x.hex for x in parent_ids]
847 return [x.hex for x in parent_ids]
842 return _parents(repo_id, commit_id)
848 return _parents(repo_id, commit_id)
843
849
844 @reraise_safe_exceptions
850 @reraise_safe_exceptions
845 def children(self, wire, commit_id):
851 def children(self, wire, commit_id):
846 cache_on, context_uid, repo_id = self._cache_on(wire)
852 cache_on, context_uid, repo_id = self._cache_on(wire)
847 @self.region.conditional_cache_on_arguments(condition=cache_on)
853 @self.region.conditional_cache_on_arguments(condition=cache_on)
848 def _children(_repo_id, _commit_id):
854 def _children(_repo_id, _commit_id):
849 output, __ = self.run_git_command(
855 output, __ = self.run_git_command(
850 wire, ['rev-list', '--all', '--children'])
856 wire, ['rev-list', '--all', '--children'])
851
857
852 child_ids = []
858 child_ids = []
853 pat = re.compile(r'^%s' % commit_id)
859 pat = re.compile(r'^%s' % commit_id)
854 for l in output.splitlines():
860 for l in output.splitlines():
855 if pat.match(l):
861 if pat.match(l):
856 found_ids = l.split(' ')[1:]
862 found_ids = l.split(' ')[1:]
857 child_ids.extend(found_ids)
863 child_ids.extend(found_ids)
858
864
859 return child_ids
865 return child_ids
860 return _children(repo_id, commit_id)
866 return _children(repo_id, commit_id)
861
867
862 @reraise_safe_exceptions
868 @reraise_safe_exceptions
863 def set_refs(self, wire, key, value):
869 def set_refs(self, wire, key, value):
864 repo_init = self._factory.repo_libgit2(wire)
870 repo_init = self._factory.repo_libgit2(wire)
865 with repo_init as repo:
871 with repo_init as repo:
866 repo.references.create(key, value, force=True)
872 repo.references.create(key, value, force=True)
867
873
868 @reraise_safe_exceptions
874 @reraise_safe_exceptions
869 def create_branch(self, wire, branch_name, commit_id, force=False):
875 def create_branch(self, wire, branch_name, commit_id, force=False):
870 repo_init = self._factory.repo_libgit2(wire)
876 repo_init = self._factory.repo_libgit2(wire)
871 with repo_init as repo:
877 with repo_init as repo:
872 commit = repo[commit_id]
878 commit = repo[commit_id]
873
879
874 if force:
880 if force:
875 repo.branches.local.create(branch_name, commit, force=force)
881 repo.branches.local.create(branch_name, commit, force=force)
876 elif not repo.branches.get(branch_name):
882 elif not repo.branches.get(branch_name):
877 # create only if that branch isn't existing
883 # create only if that branch isn't existing
878 repo.branches.local.create(branch_name, commit, force=force)
884 repo.branches.local.create(branch_name, commit, force=force)
879
885
880 @reraise_safe_exceptions
886 @reraise_safe_exceptions
881 def remove_ref(self, wire, key):
887 def remove_ref(self, wire, key):
882 repo_init = self._factory.repo_libgit2(wire)
888 repo_init = self._factory.repo_libgit2(wire)
883 with repo_init as repo:
889 with repo_init as repo:
884 repo.references.delete(key)
890 repo.references.delete(key)
885
891
886 @reraise_safe_exceptions
892 @reraise_safe_exceptions
887 def tag_remove(self, wire, tag_name):
893 def tag_remove(self, wire, tag_name):
888 repo_init = self._factory.repo_libgit2(wire)
894 repo_init = self._factory.repo_libgit2(wire)
889 with repo_init as repo:
895 with repo_init as repo:
890 key = 'refs/tags/{}'.format(tag_name)
896 key = 'refs/tags/{}'.format(tag_name)
891 repo.references.delete(key)
897 repo.references.delete(key)
892
898
893 @reraise_safe_exceptions
899 @reraise_safe_exceptions
894 def tree_changes(self, wire, source_id, target_id):
900 def tree_changes(self, wire, source_id, target_id):
895 # TODO(marcink): remove this seems it's only used by tests
901 # TODO(marcink): remove this seems it's only used by tests
896 repo = self._factory.repo(wire)
902 repo = self._factory.repo(wire)
897 source = repo[source_id].tree if source_id else None
903 source = repo[source_id].tree if source_id else None
898 target = repo[target_id].tree
904 target = repo[target_id].tree
899 result = repo.object_store.tree_changes(source, target)
905 result = repo.object_store.tree_changes(source, target)
900 return list(result)
906 return list(result)
901
907
902 @reraise_safe_exceptions
908 @reraise_safe_exceptions
903 def tree_and_type_for_path(self, wire, commit_id, path):
909 def tree_and_type_for_path(self, wire, commit_id, path):
904
910
905 cache_on, context_uid, repo_id = self._cache_on(wire)
911 cache_on, context_uid, repo_id = self._cache_on(wire)
906 @self.region.conditional_cache_on_arguments(condition=cache_on)
912 @self.region.conditional_cache_on_arguments(condition=cache_on)
907 def _tree_and_type_for_path(_context_uid, _repo_id, _commit_id, _path):
913 def _tree_and_type_for_path(_context_uid, _repo_id, _commit_id, _path):
908 repo_init = self._factory.repo_libgit2(wire)
914 repo_init = self._factory.repo_libgit2(wire)
909
915
910 with repo_init as repo:
916 with repo_init as repo:
911 commit = repo[commit_id]
917 commit = repo[commit_id]
912 try:
918 try:
913 tree = commit.tree[path]
919 tree = commit.tree[path]
914 except KeyError:
920 except KeyError:
915 return None, None, None
921 return None, None, None
916
922
917 return tree.id.hex, tree.type, tree.filemode
923 return tree.id.hex, tree.type, tree.filemode
918 return _tree_and_type_for_path(context_uid, repo_id, commit_id, path)
924 return _tree_and_type_for_path(context_uid, repo_id, commit_id, path)
919
925
920 @reraise_safe_exceptions
926 @reraise_safe_exceptions
921 def tree_items(self, wire, tree_id):
927 def tree_items(self, wire, tree_id):
922 cache_on, context_uid, repo_id = self._cache_on(wire)
928 cache_on, context_uid, repo_id = self._cache_on(wire)
923 @self.region.conditional_cache_on_arguments(condition=cache_on)
929 @self.region.conditional_cache_on_arguments(condition=cache_on)
924 def _tree_items(_repo_id, _tree_id):
930 def _tree_items(_repo_id, _tree_id):
925
931
926 repo_init = self._factory.repo_libgit2(wire)
932 repo_init = self._factory.repo_libgit2(wire)
927 with repo_init as repo:
933 with repo_init as repo:
928 try:
934 try:
929 tree = repo[tree_id]
935 tree = repo[tree_id]
930 except KeyError:
936 except KeyError:
931 raise ObjectMissing('No tree with id: {}'.format(tree_id))
937 raise ObjectMissing('No tree with id: {}'.format(tree_id))
932
938
933 result = []
939 result = []
934 for item in tree:
940 for item in tree:
935 item_sha = item.hex
941 item_sha = item.hex
936 item_mode = item.filemode
942 item_mode = item.filemode
937 item_type = item.type
943 item_type = item.type
938
944
939 if item_type == 'commit':
945 if item_type == 'commit':
940 # NOTE(marcink): submodules we translate to 'link' for backward compat
946 # NOTE(marcink): submodules we translate to 'link' for backward compat
941 item_type = 'link'
947 item_type = 'link'
942
948
943 result.append((item.name, item_mode, item_sha, item_type))
949 result.append((item.name, item_mode, item_sha, item_type))
944 return result
950 return result
945 return _tree_items(repo_id, tree_id)
951 return _tree_items(repo_id, tree_id)
946
952
947 @reraise_safe_exceptions
953 @reraise_safe_exceptions
948 def diff_2(self, wire, commit_id_1, commit_id_2, file_filter, opt_ignorews, context):
954 def diff_2(self, wire, commit_id_1, commit_id_2, file_filter, opt_ignorews, context):
949 """
955 """
950 Old version that uses subprocess to call diff
956 Old version that uses subprocess to call diff
951 """
957 """
952
958
953 flags = [
959 flags = [
954 '-U%s' % context, '--patch',
960 '-U%s' % context, '--patch',
955 '--binary',
961 '--binary',
956 '--find-renames',
962 '--find-renames',
957 '--no-indent-heuristic',
963 '--no-indent-heuristic',
958 # '--indent-heuristic',
964 # '--indent-heuristic',
959 #'--full-index',
965 #'--full-index',
960 #'--abbrev=40'
966 #'--abbrev=40'
961 ]
967 ]
962
968
963 if opt_ignorews:
969 if opt_ignorews:
964 flags.append('--ignore-all-space')
970 flags.append('--ignore-all-space')
965
971
966 if commit_id_1 == self.EMPTY_COMMIT:
972 if commit_id_1 == self.EMPTY_COMMIT:
967 cmd = ['show'] + flags + [commit_id_2]
973 cmd = ['show'] + flags + [commit_id_2]
968 else:
974 else:
969 cmd = ['diff'] + flags + [commit_id_1, commit_id_2]
975 cmd = ['diff'] + flags + [commit_id_1, commit_id_2]
970
976
971 if file_filter:
977 if file_filter:
972 cmd.extend(['--', file_filter])
978 cmd.extend(['--', file_filter])
973
979
974 diff, __ = self.run_git_command(wire, cmd)
980 diff, __ = self.run_git_command(wire, cmd)
975 # If we used 'show' command, strip first few lines (until actual diff
981 # If we used 'show' command, strip first few lines (until actual diff
976 # starts)
982 # starts)
977 if commit_id_1 == self.EMPTY_COMMIT:
983 if commit_id_1 == self.EMPTY_COMMIT:
978 lines = diff.splitlines()
984 lines = diff.splitlines()
979 x = 0
985 x = 0
980 for line in lines:
986 for line in lines:
981 if line.startswith('diff'):
987 if line.startswith('diff'):
982 break
988 break
983 x += 1
989 x += 1
984 # Append new line just like 'diff' command do
990 # Append new line just like 'diff' command do
985 diff = '\n'.join(lines[x:]) + '\n'
991 diff = '\n'.join(lines[x:]) + '\n'
986 return diff
992 return diff
987
993
988 @reraise_safe_exceptions
994 @reraise_safe_exceptions
989 def diff(self, wire, commit_id_1, commit_id_2, file_filter, opt_ignorews, context):
995 def diff(self, wire, commit_id_1, commit_id_2, file_filter, opt_ignorews, context):
990 repo_init = self._factory.repo_libgit2(wire)
996 repo_init = self._factory.repo_libgit2(wire)
991 with repo_init as repo:
997 with repo_init as repo:
992 swap = True
998 swap = True
993 flags = 0
999 flags = 0
994 flags |= pygit2.GIT_DIFF_SHOW_BINARY
1000 flags |= pygit2.GIT_DIFF_SHOW_BINARY
995
1001
996 if opt_ignorews:
1002 if opt_ignorews:
997 flags |= pygit2.GIT_DIFF_IGNORE_WHITESPACE
1003 flags |= pygit2.GIT_DIFF_IGNORE_WHITESPACE
998
1004
999 if commit_id_1 == self.EMPTY_COMMIT:
1005 if commit_id_1 == self.EMPTY_COMMIT:
1000 comm1 = repo[commit_id_2]
1006 comm1 = repo[commit_id_2]
1001 diff_obj = comm1.tree.diff_to_tree(
1007 diff_obj = comm1.tree.diff_to_tree(
1002 flags=flags, context_lines=context, swap=swap)
1008 flags=flags, context_lines=context, swap=swap)
1003
1009
1004 else:
1010 else:
1005 comm1 = repo[commit_id_2]
1011 comm1 = repo[commit_id_2]
1006 comm2 = repo[commit_id_1]
1012 comm2 = repo[commit_id_1]
1007 diff_obj = comm1.tree.diff_to_tree(
1013 diff_obj = comm1.tree.diff_to_tree(
1008 comm2.tree, flags=flags, context_lines=context, swap=swap)
1014 comm2.tree, flags=flags, context_lines=context, swap=swap)
1009 similar_flags = 0
1015 similar_flags = 0
1010 similar_flags |= pygit2.GIT_DIFF_FIND_RENAMES
1016 similar_flags |= pygit2.GIT_DIFF_FIND_RENAMES
1011 diff_obj.find_similar(flags=similar_flags)
1017 diff_obj.find_similar(flags=similar_flags)
1012
1018
1013 if file_filter:
1019 if file_filter:
1014 for p in diff_obj:
1020 for p in diff_obj:
1015 if p.delta.old_file.path == file_filter:
1021 if p.delta.old_file.path == file_filter:
1016 return p.patch or ''
1022 return p.patch or ''
1017 # fo matching path == no diff
1023 # fo matching path == no diff
1018 return ''
1024 return ''
1019 return diff_obj.patch or ''
1025 return diff_obj.patch or ''
1020
1026
1021 @reraise_safe_exceptions
1027 @reraise_safe_exceptions
1022 def node_history(self, wire, commit_id, path, limit):
1028 def node_history(self, wire, commit_id, path, limit):
1023 cache_on, context_uid, repo_id = self._cache_on(wire)
1029 cache_on, context_uid, repo_id = self._cache_on(wire)
1024 @self.region.conditional_cache_on_arguments(condition=cache_on)
1030 @self.region.conditional_cache_on_arguments(condition=cache_on)
1025 def _node_history(_context_uid, _repo_id, _commit_id, _path, _limit):
1031 def _node_history(_context_uid, _repo_id, _commit_id, _path, _limit):
1026 # optimize for n==1, rev-list is much faster for that use-case
1032 # optimize for n==1, rev-list is much faster for that use-case
1027 if limit == 1:
1033 if limit == 1:
1028 cmd = ['rev-list', '-1', commit_id, '--', path]
1034 cmd = ['rev-list', '-1', commit_id, '--', path]
1029 else:
1035 else:
1030 cmd = ['log']
1036 cmd = ['log']
1031 if limit:
1037 if limit:
1032 cmd.extend(['-n', str(safe_int(limit, 0))])
1038 cmd.extend(['-n', str(safe_int(limit, 0))])
1033 cmd.extend(['--pretty=format: %H', '-s', commit_id, '--', path])
1039 cmd.extend(['--pretty=format: %H', '-s', commit_id, '--', path])
1034
1040
1035 output, __ = self.run_git_command(wire, cmd)
1041 output, __ = self.run_git_command(wire, cmd)
1036 commit_ids = re.findall(r'[0-9a-fA-F]{40}', output)
1042 commit_ids = re.findall(r'[0-9a-fA-F]{40}', output)
1037
1043
1038 return [x for x in commit_ids]
1044 return [x for x in commit_ids]
1039 return _node_history(context_uid, repo_id, commit_id, path, limit)
1045 return _node_history(context_uid, repo_id, commit_id, path, limit)
1040
1046
1041 @reraise_safe_exceptions
1047 @reraise_safe_exceptions
1042 def node_annotate(self, wire, commit_id, path):
1048 def node_annotate(self, wire, commit_id, path):
1043
1049
1044 cmd = ['blame', '-l', '--root', '-r', commit_id, '--', path]
1050 cmd = ['blame', '-l', '--root', '-r', commit_id, '--', path]
1045 # -l ==> outputs long shas (and we need all 40 characters)
1051 # -l ==> outputs long shas (and we need all 40 characters)
1046 # --root ==> doesn't put '^' character for boundaries
1052 # --root ==> doesn't put '^' character for boundaries
1047 # -r commit_id ==> blames for the given commit
1053 # -r commit_id ==> blames for the given commit
1048 output, __ = self.run_git_command(wire, cmd)
1054 output, __ = self.run_git_command(wire, cmd)
1049
1055
1050 result = []
1056 result = []
1051 for i, blame_line in enumerate(output.split('\n')[:-1]):
1057 for i, blame_line in enumerate(output.split('\n')[:-1]):
1052 line_no = i + 1
1058 line_no = i + 1
1053 commit_id, line = re.split(r' ', blame_line, 1)
1059 commit_id, line = re.split(r' ', blame_line, 1)
1054 result.append((line_no, commit_id, line))
1060 result.append((line_no, commit_id, line))
1055 return result
1061 return result
1056
1062
1057 @reraise_safe_exceptions
1063 @reraise_safe_exceptions
1058 def update_server_info(self, wire):
1064 def update_server_info(self, wire):
1059 repo = self._factory.repo(wire)
1065 repo = self._factory.repo(wire)
1060 update_server_info(repo)
1066 update_server_info(repo)
1061
1067
1062 @reraise_safe_exceptions
1068 @reraise_safe_exceptions
1063 def get_all_commit_ids(self, wire):
1069 def get_all_commit_ids(self, wire):
1064
1070
1065 cache_on, context_uid, repo_id = self._cache_on(wire)
1071 cache_on, context_uid, repo_id = self._cache_on(wire)
1066 @self.region.conditional_cache_on_arguments(condition=cache_on)
1072 @self.region.conditional_cache_on_arguments(condition=cache_on)
1067 def _get_all_commit_ids(_context_uid, _repo_id):
1073 def _get_all_commit_ids(_context_uid, _repo_id):
1068
1074
1069 cmd = ['rev-list', '--reverse', '--date-order', '--branches', '--tags']
1075 cmd = ['rev-list', '--reverse', '--date-order', '--branches', '--tags']
1070 try:
1076 try:
1071 output, __ = self.run_git_command(wire, cmd)
1077 output, __ = self.run_git_command(wire, cmd)
1072 return output.splitlines()
1078 return output.splitlines()
1073 except Exception:
1079 except Exception:
1074 # Can be raised for empty repositories
1080 # Can be raised for empty repositories
1075 return []
1081 return []
1076 return _get_all_commit_ids(context_uid, repo_id)
1082 return _get_all_commit_ids(context_uid, repo_id)
1077
1083
1078 @reraise_safe_exceptions
1084 @reraise_safe_exceptions
1079 def run_git_command(self, wire, cmd, **opts):
1085 def run_git_command(self, wire, cmd, **opts):
1080 path = wire.get('path', None)
1086 path = wire.get('path', None)
1081
1087
1082 if path and os.path.isdir(path):
1088 if path and os.path.isdir(path):
1083 opts['cwd'] = path
1089 opts['cwd'] = path
1084
1090
1085 if '_bare' in opts:
1091 if '_bare' in opts:
1086 _copts = []
1092 _copts = []
1087 del opts['_bare']
1093 del opts['_bare']
1088 else:
1094 else:
1089 _copts = ['-c', 'core.quotepath=false', ]
1095 _copts = ['-c', 'core.quotepath=false', ]
1090 safe_call = False
1096 safe_call = False
1091 if '_safe' in opts:
1097 if '_safe' in opts:
1092 # no exc on failure
1098 # no exc on failure
1093 del opts['_safe']
1099 del opts['_safe']
1094 safe_call = True
1100 safe_call = True
1095
1101
1096 if '_copts' in opts:
1102 if '_copts' in opts:
1097 _copts.extend(opts['_copts'] or [])
1103 _copts.extend(opts['_copts'] or [])
1098 del opts['_copts']
1104 del opts['_copts']
1099
1105
1100 gitenv = os.environ.copy()
1106 gitenv = os.environ.copy()
1101 gitenv.update(opts.pop('extra_env', {}))
1107 gitenv.update(opts.pop('extra_env', {}))
1102 # need to clean fix GIT_DIR !
1108 # need to clean fix GIT_DIR !
1103 if 'GIT_DIR' in gitenv:
1109 if 'GIT_DIR' in gitenv:
1104 del gitenv['GIT_DIR']
1110 del gitenv['GIT_DIR']
1105 gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
1111 gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
1106 gitenv['GIT_DISCOVERY_ACROSS_FILESYSTEM'] = '1'
1112 gitenv['GIT_DISCOVERY_ACROSS_FILESYSTEM'] = '1'
1107
1113
1108 cmd = [settings.GIT_EXECUTABLE] + _copts + cmd
1114 cmd = [settings.GIT_EXECUTABLE] + _copts + cmd
1109 _opts = {'env': gitenv, 'shell': False}
1115 _opts = {'env': gitenv, 'shell': False}
1110
1116
1111 try:
1117 try:
1112 _opts.update(opts)
1118 _opts.update(opts)
1113 p = subprocessio.SubprocessIOChunker(cmd, **_opts)
1119 p = subprocessio.SubprocessIOChunker(cmd, **_opts)
1114
1120
1115 return ''.join(p), ''.join(p.error)
1121 return ''.join(p), ''.join(p.error)
1116 except (EnvironmentError, OSError) as err:
1122 except (EnvironmentError, OSError) as err:
1117 cmd = ' '.join(cmd) # human friendly CMD
1123 cmd = ' '.join(cmd) # human friendly CMD
1118 tb_err = ("Couldn't run git command (%s).\n"
1124 tb_err = ("Couldn't run git command (%s).\n"
1119 "Original error was:%s\n"
1125 "Original error was:%s\n"
1120 "Call options:%s\n"
1126 "Call options:%s\n"
1121 % (cmd, err, _opts))
1127 % (cmd, err, _opts))
1122 log.exception(tb_err)
1128 log.exception(tb_err)
1123 if safe_call:
1129 if safe_call:
1124 return '', err
1130 return '', err
1125 else:
1131 else:
1126 raise exceptions.VcsException()(tb_err)
1132 raise exceptions.VcsException()(tb_err)
1127
1133
1128 @reraise_safe_exceptions
1134 @reraise_safe_exceptions
1129 def install_hooks(self, wire, force=False):
1135 def install_hooks(self, wire, force=False):
1130 from vcsserver.hook_utils import install_git_hooks
1136 from vcsserver.hook_utils import install_git_hooks
1131 bare = self.bare(wire)
1137 bare = self.bare(wire)
1132 path = wire['path']
1138 path = wire['path']
1133 return install_git_hooks(path, bare, force_create=force)
1139 return install_git_hooks(path, bare, force_create=force)
1134
1140
1135 @reraise_safe_exceptions
1141 @reraise_safe_exceptions
1136 def get_hooks_info(self, wire):
1142 def get_hooks_info(self, wire):
1137 from vcsserver.hook_utils import (
1143 from vcsserver.hook_utils import (
1138 get_git_pre_hook_version, get_git_post_hook_version)
1144 get_git_pre_hook_version, get_git_post_hook_version)
1139 bare = self.bare(wire)
1145 bare = self.bare(wire)
1140 path = wire['path']
1146 path = wire['path']
1141 return {
1147 return {
1142 'pre_version': get_git_pre_hook_version(path, bare),
1148 'pre_version': get_git_pre_hook_version(path, bare),
1143 'post_version': get_git_post_hook_version(path, bare),
1149 'post_version': get_git_post_hook_version(path, bare),
1144 }
1150 }
General Comments 0
You need to be logged in to leave comments. Login now