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.revisionspec import (
31
def valid_git_sha1(hex):
34
binascii.unhexlify(hex)
41
class RevisionSpec_git(RevisionSpec):
42
"""Selects a revision using a Subversion revision number."""
44
help_txt = """Selects a revision using a Git revision sha1.
48
wants_revision_history = False
50
def _lookup_git_sha1(self, branch, sha1):
51
from bzrlib.plugins.git.errors import (
52
GitSmartRemoteNotSupported,
54
from bzrlib.plugins.git.mapping import (
58
bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id",
59
default_mapping.revision_id_foreign_to_bzr)(sha1)
61
if branch.repository.has_revision(bzr_revid):
62
history = self._history(branch, bzr_revid)
63
return RevisionInfo.from_revision_id(branch, bzr_revid, history)
64
except GitSmartRemoteNotSupported:
65
return RevisionInfo(branch, None, bzr_revid)
66
raise InvalidRevisionSpec(self.user_spec, branch)
68
def _history(self, branch, revid):
69
history = list(branch.repository.iter_reverse_revision_history(revid))
73
def __nonzero__(self):
74
from bzrlib.revision import (
77
# The default implementation uses branch.repository.has_revision()
78
if self.rev_id is None:
80
if self.rev_id == NULL_REVISION:
84
def _find_short_git_sha1(self, branch, sha1):
85
from bzrlib.plugins.git.mapping import (
88
parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
89
mapping_registry.parse_revision_id)
90
branch.repository.lock_read()
92
graph = branch.repository.get_graph()
93
for revid, _ in graph.iter_ancestry([branch.last_revision()]):
95
foreign_revid, mapping = parse_revid(revid)
96
except InvalidRevisionId:
98
if foreign_revid.startswith(sha1):
99
history = self._history(branch, revid)
100
return RevisionInfo.from_revision_id(branch, revid, history)
101
raise InvalidRevisionSpec(self.user_spec, branch)
103
branch.repository.unlock()
105
def _match_on(self, branch, revs):
106
loc = self.spec.find(':')
107
git_sha1 = self.spec[loc+1:].encode("utf-8")
108
if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):
109
raise InvalidRevisionSpec(self.user_spec, branch)
110
from bzrlib.plugins.git import (
113
lazy_check_versions()
114
if len(git_sha1) == 40:
115
return self._lookup_git_sha1(branch, git_sha1)
117
return self._find_short_git_sha1(branch, git_sha1)
119
def needs_branch(self):
122
def get_branch(self):
added
removed
revspec.py
