bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
1 |
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
|
2 |
||
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 3 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
"""Custom revision specifier for Subversion."""
|
|
17 |
||
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
18 |
from bzrlib.errors import ( |
19 |
BzrError, |
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
20 |
InvalidRevisionId, |
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
21 |
InvalidRevisionSpec, |
22 |
NoSuchRevision, |
|
23 |
)
|
|
|
0.200.418
by Jelmer Vernooij
Override GitRevisionSpec.__nonzero__ as the default implementation uses has_revision(), which is not available on remote git repositories. |
24 |
from bzrlib.revision import ( |
25 |
NULL_REVISION, |
|
26 |
)
|
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
27 |
from bzrlib.revisionspec import ( |
28 |
RevisionInfo, |
|
29 |
RevisionSpec, |
|
30 |
)
|
|
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
31 |
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
32 |
from bzrlib.plugins.git import ( |
33 |
lazy_check_versions, |
|
34 |
)
|
|
|
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
35 |
from bzrlib.plugins.git.errors import ( |
36 |
GitSmartRemoteNotSupported, |
|
37 |
)
|
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
38 |
from bzrlib.plugins.git.mapping import ( |
39 |
mapping_registry, |
|
40 |
)
|
|
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
41 |
|
42 |
class RevisionSpec_git(RevisionSpec): |
|
43 |
"""Selects a revision using a Subversion revision number.""" |
|
44 |
||
45 |
help_txt = """Selects a revision using a Git revision sha1. |
|
46 |
"""
|
|
47 |
||
48 |
prefix = 'git:' |
|
|
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
49 |
wants_revision_history = False |
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
50 |
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
51 |
def _lookup_git_sha1(self, branch, sha1): |
|
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
52 |
bzr_revid = branch.mapping.revision_id_foreign_to_bzr(sha1) |
53 |
try: |
|
54 |
if branch.repository.has_revision(bzr_revid): |
|
55 |
history = self._history(branch, bzr_revid) |
|
56 |
return RevisionInfo.from_revision_id(branch, bzr_revid, history) |
|
57 |
except GitSmartRemoteNotSupported: |
|
58 |
return RevisionInfo(branch, None, bzr_revid) |
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
59 |
raise InvalidRevisionSpec(self.user_spec, branch) |
60 |
||
61 |
def _history(self, branch, revid): |
|
62 |
history = list(branch.repository.iter_reverse_revision_history(revid)) |
|
63 |
history.reverse() |
|
64 |
return history |
|
65 |
||
|
0.200.418
by Jelmer Vernooij
Override GitRevisionSpec.__nonzero__ as the default implementation uses has_revision(), which is not available on remote git repositories. |
66 |
def __nonzero__(self): |
67 |
# The default implementation uses branch.repository.has_revision()
|
|
68 |
if self.rev_id is None: |
|
69 |
return False |
|
70 |
if self.rev_id == NULL_REVISION: |
|
71 |
return False |
|
72 |
return True |
|
73 |
||
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
74 |
def _find_short_git_sha1(self, branch, sha1): |
75 |
parse_revid = getattr(branch.repository, "lookup_git_revid", |
|
76 |
mapping_registry.parse_revision_id) |
|
77 |
branch.repository.lock_read() |
|
78 |
try: |
|
79 |
graph = branch.repository.get_graph() |
|
80 |
for revid, _ in graph.iter_ancestry([branch.last_revision()]): |
|
81 |
try: |
|
82 |
foreign_revid, mapping = parse_revid(revid) |
|
83 |
except InvalidRevisionId: |
|
84 |
continue
|
|
85 |
if foreign_revid.startswith(sha1): |
|
86 |
history = self._history(branch, revid) |
|
87 |
return RevisionInfo.from_revision_id(branch, revid, history) |
|
88 |
raise InvalidRevisionSpec(self.user_spec, branch) |
|
89 |
finally: |
|
90 |
branch.repository.unlock() |
|
91 |
||
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
92 |
def _match_on(self, branch, revs): |
93 |
lazy_check_versions() |
|
94 |
loc = self.spec.find(':') |
|
95 |
git_sha1 = self.spec[loc+1:].encode("utf-8") |
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
96 |
if len(git_sha1) == 40: |
97 |
return self._lookup_git_sha1(branch, git_sha1) |
|
98 |
elif len(git_sha1) > 40: |
|
99 |
raise InvalidRevisionSpec(self.user_spec, branch) |
|
100 |
else: |
|
101 |
return self._find_short_git_sha1(branch, git_sha1) |
|
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
102 |
|
103 |
def needs_branch(self): |
|
104 |
return True |
|
105 |
||
106 |
def get_branch(self): |
|
107 |
return None |