/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 revspec.py

Fix support for older versions of Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revspec.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
"""Custom revision specifier for Subversion."""
17
17
 
 
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.
 
20
 
18
21
from bzrlib.errors import (
19
 
    BzrError,
20
22
    InvalidRevisionId,
21
23
    InvalidRevisionSpec,
22
 
    NoSuchRevision,
23
 
    )
24
 
from bzrlib.revision import (
25
 
    NULL_REVISION,
26
24
    )
27
25
from bzrlib.revisionspec import (
28
26
    RevisionInfo,
29
27
    RevisionSpec,
30
28
    )
31
29
 
32
 
from bzrlib.plugins.git import (
33
 
    lazy_check_versions,
34
 
    )
35
 
from bzrlib.plugins.git.errors import (
36
 
    GitSmartRemoteNotSupported,
37
 
    )
38
 
from bzrlib.plugins.git.mapping import (
39
 
    mapping_registry,
40
 
    )
 
30
 
 
31
def valid_git_sha1(hex):
 
32
    import binascii
 
33
    try:
 
34
        binascii.unhexlify(hex)
 
35
    except TypeError:
 
36
        return False
 
37
    else:
 
38
        return True
 
39
 
41
40
 
42
41
class RevisionSpec_git(RevisionSpec):
43
42
    """Selects a revision using a Subversion revision number."""
49
48
    wants_revision_history = False
50
49
 
51
50
    def _lookup_git_sha1(self, branch, sha1):
 
51
        from bzrlib.plugins.git.errors import (
 
52
            GitSmartRemoteNotSupported,
 
53
            )
 
54
 
52
55
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(sha1)
53
56
        try:
54
57
            if branch.repository.has_revision(bzr_revid):
64
67
        return history
65
68
 
66
69
    def __nonzero__(self):
 
70
        from bzrlib.revision import (
 
71
            NULL_REVISION,
 
72
            )
67
73
        # The default implementation uses branch.repository.has_revision()
68
74
        if self.rev_id is None:
69
75
            return False
72
78
        return True
73
79
 
74
80
    def _find_short_git_sha1(self, branch, sha1):
75
 
        parse_revid = getattr(branch.repository, "lookup_git_revid",
 
81
        from bzrlib.plugins.git.mapping import (
 
82
            mapping_registry,
 
83
            )
 
84
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
76
85
                              mapping_registry.parse_revision_id)
77
86
        branch.repository.lock_read()
78
87
        try:
90
99
            branch.repository.unlock()
91
100
 
92
101
    def _match_on(self, branch, revs):
93
 
        lazy_check_versions()
94
102
        loc = self.spec.find(':')
95
103
        git_sha1 = self.spec[loc+1:].encode("utf-8")
 
104
        if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):
 
105
            raise InvalidRevisionSpec(self.user_spec, branch)
 
106
        from bzrlib.plugins.git import (
 
107
            lazy_check_versions,
 
108
            )
 
109
        lazy_check_versions()
96
110
        if len(git_sha1) == 40:
97
111
            return self._lookup_git_sha1(branch, git_sha1)
98
 
        elif len(git_sha1) > 40:
99
 
            raise InvalidRevisionSpec(self.user_spec, branch)
100
112
        else:
101
113
            return self._find_short_git_sha1(branch, git_sha1)
102
114