/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: 2019-02-17 03:45:31 UTC
  • mto: (7290.1.6 work)
  • mto: This revision was merged to the branch mainline in revision 7295.
  • Revision ID: jelmer@jelmer.uk-20190217034531-vw7oc2bo5hdd41jn
Drop documentation about removed pkgimport.conf.

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 ..errors import (
 
25
    InvalidRevisionId,
 
26
    InvalidRevisionSpec,
 
27
    )
 
28
from ..revision import (
 
29
    NULL_REVISION,
 
30
)
 
31
from ..revisionspec import (
 
32
    RevisionInfo,
 
33
    RevisionSpec,
 
34
    )
 
35
 
 
36
 
 
37
def valid_git_sha1(hex):
 
38
    """Check if `hex` is a validly formatted Git SHA1.
 
39
 
 
40
    :param hex: Hex string to validate
 
41
    :return: Boolean
 
42
    """
 
43
    try:
 
44
        int(hex, 16)
 
45
    except ValueError:
 
46
        return False
 
47
    else:
 
48
        return True
 
49
 
22
50
 
23
51
class RevisionSpec_git(RevisionSpec):
24
52
    """Selects a revision using a Subversion revision number."""
25
53
 
26
54
    help_txt = """Selects a revision using a Git revision sha1.
27
55
    """
28
 
    
 
56
 
29
57
    prefix = 'git:'
 
58
    wants_revision_history = False
 
59
 
 
60
    def _lookup_git_sha1(self, branch, sha1):
 
61
        from .errors import (
 
62
            GitSmartRemoteNotSupported,
 
63
            )
 
64
        from .mapping import (
 
65
            default_mapping,
 
66
            )
 
67
 
 
68
        bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id",
 
69
                            default_mapping.revision_id_foreign_to_bzr)(sha1)
 
70
        try:
 
71
            if branch.repository.has_revision(bzr_revid):
 
72
                return RevisionInfo.from_revision_id(branch, bzr_revid)
 
73
        except GitSmartRemoteNotSupported:
 
74
            return RevisionInfo(branch, None, bzr_revid)
 
75
        raise InvalidRevisionSpec(self.user_spec, branch)
 
76
 
 
77
    def __nonzero__(self):
 
78
        # The default implementation uses branch.repository.has_revision()
 
79
        if self.rev_id is None:
 
80
            return False
 
81
        if self.rev_id == NULL_REVISION:
 
82
            return False
 
83
        return True
 
84
 
 
85
    def _find_short_git_sha1(self, branch, sha1):
 
86
        from .mapping import (
 
87
            ForeignGit,
 
88
            mapping_registry,
 
89
            )
 
90
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
 
91
                              mapping_registry.parse_revision_id)
 
92
        with branch.repository.lock_read():
 
93
            graph = branch.repository.get_graph()
 
94
            for revid, _ in graph.iter_ancestry([branch.last_revision()]):
 
95
                if revid == NULL_REVISION:
 
96
                    continue
 
97
                try:
 
98
                    foreign_revid, mapping = parse_revid(revid)
 
99
                except InvalidRevisionId:
 
100
                    continue
 
101
                if not isinstance(mapping.vcs, ForeignGit):
 
102
                    continue
 
103
                if foreign_revid.startswith(sha1):
 
104
                    return RevisionInfo.from_revision_id(branch, revid)
 
105
            raise InvalidRevisionSpec(self.user_spec, branch)
30
106
 
31
107
    def _match_on(self, branch, revs):
 
108
        loc = self.spec.find(':')
 
109
        git_sha1 = self.spec[loc + 1:].encode("utf-8")
 
110
        if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):
 
111
            raise InvalidRevisionSpec(self.user_spec, branch)
 
112
        from . import (
 
113
            lazy_check_versions,
 
114
            )
32
115
        lazy_check_versions()
33
 
        loc = self.spec.find(':')
34
 
        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)
 
116
        if len(git_sha1) == 40:
 
117
            return self._lookup_git_sha1(branch, git_sha1)
 
118
        else:
 
119
            return self._find_short_git_sha1(branch, git_sha1)
41
120
 
42
121
    def needs_branch(self):
43
122
        return True