/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: 2020-07-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

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