1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
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.
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.
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."""
18
# Please note that imports are delayed as much as possible here since
19
# if DWIM revspecs are supported this module is imported by __init__.py.
21
from bzrlib.errors import (
25
from bzrlib.revision import (
28
from bzrlib.revisionspec import (
34
def valid_git_sha1(hex):
35
"""Check if `hex` is a validly formatted Git SHA1.
37
:param hex: Hex string to validate
42
binascii.unhexlify(hex)
49
class RevisionSpec_git(RevisionSpec):
50
"""Selects a revision using a Subversion revision number."""
52
help_txt = """Selects a revision using a Git revision sha1.
56
wants_revision_history = False
58
def _lookup_git_sha1(self, branch, sha1):
59
from bzrlib.plugins.git.errors import (
60
GitSmartRemoteNotSupported,
62
from bzrlib.plugins.git.mapping import (
66
bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id",
67
default_mapping.revision_id_foreign_to_bzr)(sha1)
69
if branch.repository.has_revision(bzr_revid):
70
history = self._history(branch, bzr_revid)
71
return RevisionInfo.from_revision_id(branch, bzr_revid, history)
72
except GitSmartRemoteNotSupported:
73
return RevisionInfo(branch, None, bzr_revid)
74
raise InvalidRevisionSpec(self.user_spec, branch)
76
def _history(self, branch, revid):
79
history = list(branch.repository.iter_reverse_revision_history(
86
def __nonzero__(self):
87
# The default implementation uses branch.repository.has_revision()
88
if self.rev_id is None:
90
if self.rev_id == NULL_REVISION:
94
def _find_short_git_sha1(self, branch, sha1):
95
from bzrlib.plugins.git.mapping import (
99
parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
100
mapping_registry.parse_revision_id)
101
branch.repository.lock_read()
103
graph = branch.repository.get_graph()
104
for revid, _ in graph.iter_ancestry([branch.last_revision()]):
105
if revid == NULL_REVISION:
108
foreign_revid, mapping = parse_revid(revid)
109
except InvalidRevisionId:
111
if not isinstance(mapping.vcs, ForeignGit):
113
if foreign_revid.startswith(sha1):
114
history = self._history(branch, revid)
115
return RevisionInfo.from_revision_id(branch, revid, history)
116
raise InvalidRevisionSpec(self.user_spec, branch)
118
branch.repository.unlock()
120
def _match_on(self, branch, revs):
121
loc = self.spec.find(':')
122
git_sha1 = self.spec[loc+1:].encode("utf-8")
123
if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):
124
raise InvalidRevisionSpec(self.user_spec, branch)
125
from bzrlib.plugins.git import (
128
lazy_check_versions()
129
if len(git_sha1) == 40:
130
return self._lookup_git_sha1(branch, git_sha1)
132
return self._find_short_git_sha1(branch, git_sha1)
134
def needs_branch(self):
137
def get_branch(self):
added
removed
revspec.py
