/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

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