/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

More work on roundtrip push support.

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
    )
 
25
from bzrlib.revision import (
 
26
    NULL_REVISION,
 
27
)
24
28
from bzrlib.revisionspec import (
25
29
    RevisionInfo,
26
30
    RevisionSpec,
27
31
    )
28
32
 
29
 
from bzrlib.plugins.git import (
30
 
    lazy_check_versions,
31
 
    )
32
 
from bzrlib.plugins.git.mapping import (
33
 
    mapping_registry,
34
 
    )
 
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
 
35
48
 
36
49
class RevisionSpec_git(RevisionSpec):
37
50
    """Selects a revision using a Subversion revision number."""
38
51
 
39
52
    help_txt = """Selects a revision using a Git revision sha1.
40
53
    """
41
 
    
 
54
 
42
55
    prefix = 'git:'
 
56
    wants_revision_history = False
43
57
 
44
58
    def _lookup_git_sha1(self, branch, sha1):
45
 
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(git_sha1)
46
 
        if branch.repository.has_revision(bzr_revid):
47
 
            history = self._history(branch, bzr_revid)
48
 
            return RevisionInfo.from_revision_id(branch, bzr_revid, history)
 
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)
49
74
        raise InvalidRevisionSpec(self.user_spec, branch)
50
75
 
51
76
    def _history(self, branch, revid):
52
 
        history = list(branch.repository.iter_reverse_revision_history(revid))
 
77
        branch.lock_read()
 
78
        try:
 
79
            history = list(branch.repository.iter_reverse_revision_history(
 
80
                revid))
 
81
        finally:
 
82
            branch.unlock()
53
83
        history.reverse()
54
84
        return history
55
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
 
56
94
    def _find_short_git_sha1(self, branch, sha1):
57
 
        parse_revid = getattr(branch.repository, "lookup_git_revid",
 
95
        from bzrlib.plugins.git.mapping import (
 
96
            ForeignGit,
 
97
            mapping_registry,
 
98
            )
 
99
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
58
100
                              mapping_registry.parse_revision_id)
59
101
        branch.repository.lock_read()
60
102
        try:
61
103
            graph = branch.repository.get_graph()
62
104
            for revid, _ in graph.iter_ancestry([branch.last_revision()]):
 
105
                if revid == NULL_REVISION:
 
106
                    continue
63
107
                try:
64
108
                    foreign_revid, mapping = parse_revid(revid)
65
109
                except InvalidRevisionId:
66
110
                    continue
 
111
                if not isinstance(mapping.vcs, ForeignGit):
 
112
                    continue
67
113
                if foreign_revid.startswith(sha1):
68
114
                    history = self._history(branch, revid)
69
115
                    return RevisionInfo.from_revision_id(branch, revid, history)
72
118
            branch.repository.unlock()
73
119
 
74
120
    def _match_on(self, branch, revs):
75
 
        lazy_check_versions()
76
121
        loc = self.spec.find(':')
77
122
        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()
78
129
        if len(git_sha1) == 40:
79
130
            return self._lookup_git_sha1(branch, git_sha1)
80
 
        elif len(git_sha1) > 40:
81
 
            raise InvalidRevisionSpec(self.user_spec, branch)
82
131
        else:
83
132
            return self._find_short_git_sha1(branch, git_sha1)
84
133