/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/revspec.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-14 17:59:16 UTC
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180614175916-a2e2xh5k533guq1x
Move breezy.plugins.git to breezy.git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/revspec.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
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
 
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
16
17
"""Custom revision specifier for Subversion."""
17
18
 
18
 
from bzrlib.errors import BzrError, InvalidRevisionSpec, NoSuchRevision
19
 
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
20
 
 
21
 
from bzrlib.plugins.git import lazy_check_versions
 
19
from __future__ import absolute_import
 
20
 
 
21
# Please note that imports are delayed as much as possible here since
 
22
# if DWIM revspecs are supported this module is imported by __init__.py.
 
23
 
 
24
from .. import version_info as breezy_version
 
25
from ..errors import (
 
26
    InvalidRevisionId,
 
27
    InvalidRevisionSpec,
 
28
    )
 
29
from ..revision import (
 
30
    NULL_REVISION,
 
31
)
 
32
from ..revisionspec import (
 
33
    RevisionInfo,
 
34
    RevisionSpec,
 
35
    )
 
36
 
 
37
 
 
38
def valid_git_sha1(hex):
 
39
    """Check if `hex` is a validly formatted Git SHA1.
 
40
 
 
41
    :param hex: Hex string to validate
 
42
    :return: Boolean
 
43
    """
 
44
    import binascii
 
45
    try:
 
46
        binascii.unhexlify(hex)
 
47
    except TypeError:
 
48
        return False
 
49
    except binascii.Error:
 
50
        return False
 
51
    else:
 
52
        return True
 
53
 
22
54
 
23
55
class RevisionSpec_git(RevisionSpec):
24
56
    """Selects a revision using a Subversion revision number."""
25
57
 
26
58
    help_txt = """Selects a revision using a Git revision sha1.
27
59
    """
28
 
    
 
60
 
29
61
    prefix = 'git:'
 
62
    wants_revision_history = False
 
63
 
 
64
    def _lookup_git_sha1(self, branch, sha1):
 
65
        from .errors import (
 
66
            GitSmartRemoteNotSupported,
 
67
            )
 
68
        from .mapping import (
 
69
            default_mapping,
 
70
            )
 
71
 
 
72
        bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id",
 
73
                              default_mapping.revision_id_foreign_to_bzr)(sha1)
 
74
        try:
 
75
            if branch.repository.has_revision(bzr_revid):
 
76
                return RevisionInfo.from_revision_id(branch, bzr_revid)
 
77
        except GitSmartRemoteNotSupported:
 
78
            return RevisionInfo(branch, None, bzr_revid)
 
79
        raise InvalidRevisionSpec(self.user_spec, branch)
 
80
 
 
81
    def __nonzero__(self):
 
82
        # The default implementation uses branch.repository.has_revision()
 
83
        if self.rev_id is None:
 
84
            return False
 
85
        if self.rev_id == NULL_REVISION:
 
86
            return False
 
87
        return True
 
88
 
 
89
    def _find_short_git_sha1(self, branch, sha1):
 
90
        from .mapping import (
 
91
            ForeignGit,
 
92
            mapping_registry,
 
93
            )
 
94
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
 
95
                              mapping_registry.parse_revision_id)
 
96
        with branch.repository.lock_read():
 
97
            graph = branch.repository.get_graph()
 
98
            for revid, _ in graph.iter_ancestry([branch.last_revision()]):
 
99
                if revid == NULL_REVISION:
 
100
                    continue
 
101
                try:
 
102
                    foreign_revid, mapping = parse_revid(revid)
 
103
                except InvalidRevisionId:
 
104
                    continue
 
105
                if not isinstance(mapping.vcs, ForeignGit):
 
106
                    continue
 
107
                if foreign_revid.startswith(sha1):
 
108
                    return RevisionInfo.from_revision_id(branch, revid)
 
109
            raise InvalidRevisionSpec(self.user_spec, branch)
30
110
 
31
111
    def _match_on(self, branch, revs):
32
 
        lazy_check_versions()
33
112
        loc = self.spec.find(':')
34
113
        git_sha1 = self.spec[loc+1:].encode("utf-8")
35
 
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(git_sha1)
36
 
        if branch.repository.has_revision(bzr_revid):
37
 
            history = list(branch.repository.iter_reverse_revision_history(bzr_revid))
38
 
            history.reverse()
39
 
            return RevisionInfo.from_revision_id(branch, bzr_revid, history)
40
 
        raise InvalidRevisionSpec(self.user_spec, branch)
 
114
        if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):
 
115
            raise InvalidRevisionSpec(self.user_spec, branch)
 
116
        from . import (
 
117
            lazy_check_versions,
 
118
            )
 
119
        lazy_check_versions()
 
120
        if len(git_sha1) == 40:
 
121
            return self._lookup_git_sha1(branch, git_sha1)
 
122
        else:
 
123
            return self._find_short_git_sha1(branch, git_sha1)
41
124
 
42
125
    def needs_branch(self):
43
126
        return True