/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

Add FOSDEM roundtripping notes.

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.revision import (
26
 
    NULL_REVISION,
27
 
)
28
 
from bzrlib.revisionspec import (
29
 
    RevisionInfo,
30
 
    RevisionSpec,
31
 
    )
32
 
 
33
 
 
34
 
def valid_git_sha1(hex):
35
 
    """Check if `hex` is a validly formatted Git SHA1.
36
 
    
37
 
    :param hex: Hex string to validate
38
 
    :return: Boolean
39
 
    """
40
 
    import binascii
41
 
    try:
42
 
        binascii.unhexlify(hex)
43
 
    except TypeError:
44
 
        return False
45
 
    else:
46
 
        return True
47
 
 
 
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
48
22
 
49
23
class RevisionSpec_git(RevisionSpec):
50
24
    """Selects a revision using a Subversion revision number."""
51
25
 
52
26
    help_txt = """Selects a revision using a Git revision sha1.
53
27
    """
54
 
 
 
28
    
55
29
    prefix = 'git:'
56
 
    wants_revision_history = False
57
 
 
58
 
    def _lookup_git_sha1(self, branch, sha1):
59
 
        from bzrlib.plugins.git.errors import (
60
 
            GitSmartRemoteNotSupported,
61
 
            )
62
 
        from bzrlib.plugins.git.mapping import (
63
 
            default_mapping,
64
 
            )
65
 
 
66
 
        bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id",
67
 
                              default_mapping.revision_id_foreign_to_bzr)(sha1)
68
 
        try:
69
 
            if branch.repository.has_revision(bzr_revid):
70
 
                history = self._history(branch, bzr_revid)
71
 
                return RevisionInfo.from_revision_id(branch, bzr_revid, history)
72
 
        except GitSmartRemoteNotSupported:
73
 
            return RevisionInfo(branch, None, bzr_revid)
74
 
        raise InvalidRevisionSpec(self.user_spec, branch)
75
 
 
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
 
    def __nonzero__(self):
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
 
                if revid == NULL_REVISION:
106
 
                    continue
107
 
                try:
108
 
                    foreign_revid, mapping = parse_revid(revid)
109
 
                except InvalidRevisionId:
110
 
                    continue
111
 
                if not isinstance(mapping.vcs, ForeignGit):
112
 
                    continue
113
 
                if foreign_revid.startswith(sha1):
114
 
                    history = self._history(branch, revid)
115
 
                    return RevisionInfo.from_revision_id(branch, revid, history)
116
 
            raise InvalidRevisionSpec(self.user_spec, branch)
117
 
        finally:
118
 
            branch.repository.unlock()
119
30
 
120
31
    def _match_on(self, branch, revs):
 
32
        lazy_check_versions()
121
33
        loc = self.spec.find(':')
122
34
        git_sha1 = self.spec[loc+1:].encode("utf-8")
123
 
        if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):
124
 
            raise InvalidRevisionSpec(self.user_spec, branch)
125
 
        from bzrlib.plugins.git import (
126
 
            lazy_check_versions,
127
 
            )
128
 
        lazy_check_versions()
129
 
        if len(git_sha1) == 40:
130
 
            return self._lookup_git_sha1(branch, git_sha1)
131
 
        else:
132
 
            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)
133
41
 
134
42
    def needs_branch(self):
135
43
        return True