/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

Clean up trailing whitespace.

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
 
from bzrlib.errors import BzrError, InvalidRevisionSpec, NoSuchRevision
19
 
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
20
 
 
21
 
from bzrlib.plugins.git import lazy_check_versions
 
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
    import binascii
 
33
    try:
 
34
        binascii.unhexlify(hex)
 
35
    except TypeError:
 
36
        return False
 
37
    else:
 
38
        return True
 
39
 
22
40
 
23
41
class RevisionSpec_git(RevisionSpec):
24
42
    """Selects a revision using a Subversion revision number."""
25
43
 
26
44
    help_txt = """Selects a revision using a Git revision sha1.
27
45
    """
28
 
    
 
46
 
29
47
    prefix = 'git:'
 
48
    wants_revision_history = False
 
49
 
 
50
    def _lookup_git_sha1(self, branch, sha1):
 
51
        from bzrlib.plugins.git.errors import (
 
52
            GitSmartRemoteNotSupported,
 
53
            )
 
54
 
 
55
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(sha1)
 
56
        try:
 
57
            if branch.repository.has_revision(bzr_revid):
 
58
                history = self._history(branch, bzr_revid)
 
59
                return RevisionInfo.from_revision_id(branch, bzr_revid, history)
 
60
        except GitSmartRemoteNotSupported:
 
61
            return RevisionInfo(branch, None, bzr_revid)
 
62
        raise InvalidRevisionSpec(self.user_spec, branch)
 
63
 
 
64
    def _history(self, branch, revid):
 
65
        history = list(branch.repository.iter_reverse_revision_history(revid))
 
66
        history.reverse()
 
67
        return history
 
68
 
 
69
    def __nonzero__(self):
 
70
        from bzrlib.revision import (
 
71
            NULL_REVISION,
 
72
            )
 
73
        # The default implementation uses branch.repository.has_revision()
 
74
        if self.rev_id is None:
 
75
            return False
 
76
        if self.rev_id == NULL_REVISION:
 
77
            return False
 
78
        return True
 
79
 
 
80
    def _find_short_git_sha1(self, branch, sha1):
 
81
        from bzrlib.plugins.git.mapping import (
 
82
            mapping_registry,
 
83
            )
 
84
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
 
85
                              mapping_registry.parse_revision_id)
 
86
        branch.repository.lock_read()
 
87
        try:
 
88
            graph = branch.repository.get_graph()
 
89
            for revid, _ in graph.iter_ancestry([branch.last_revision()]):
 
90
                try:
 
91
                    foreign_revid, mapping = parse_revid(revid)
 
92
                except InvalidRevisionId:
 
93
                    continue
 
94
                if foreign_revid.startswith(sha1):
 
95
                    history = self._history(branch, revid)
 
96
                    return RevisionInfo.from_revision_id(branch, revid, history)
 
97
            raise InvalidRevisionSpec(self.user_spec, branch)
 
98
        finally:
 
99
            branch.repository.unlock()
30
100
 
31
101
    def _match_on(self, branch, revs):
32
 
        lazy_check_versions()
33
102
        loc = self.spec.find(':')
34
103
        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)
 
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()
 
110
        if len(git_sha1) == 40:
 
111
            return self._lookup_git_sha1(branch, git_sha1)
 
112
        else:
 
113
            return self._find_short_git_sha1(branch, git_sha1)
41
114
 
42
115
    def needs_branch(self):
43
116
        return True