/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

  • Committer: Jelmer Vernooij
  • Date: 2010-05-13 08:40:18 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100513084018-xp9tbrasde6gih3o
Checks for roundtripping.

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
    """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
 
41
45
 
42
46
class RevisionSpec_git(RevisionSpec):
43
47
    """Selects a revision using a Subversion revision number."""
44
48
 
45
49
    help_txt = """Selects a revision using a Git revision sha1.
46
50
    """
47
 
    
 
51
 
48
52
    prefix = 'git:'
49
53
    wants_revision_history = False
50
54
 
51
55
    def _lookup_git_sha1(self, branch, sha1):
52
 
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(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)
53
65
        try:
54
66
            if branch.repository.has_revision(bzr_revid):
55
67
                history = self._history(branch, bzr_revid)
59
71
        raise InvalidRevisionSpec(self.user_spec, branch)
60
72
 
61
73
    def _history(self, branch, revid):
62
 
        history = list(branch.repository.iter_reverse_revision_history(revid))
 
74
        branch.lock_read()
 
75
        try:
 
76
            history = list(branch.repository.iter_reverse_revision_history(
 
77
                revid))
 
78
        finally:
 
79
            branch.unlock()
63
80
        history.reverse()
64
81
        return history
65
82
 
66
83
    def __nonzero__(self):
 
84
        from bzrlib.revision import (
 
85
            NULL_REVISION,
 
86
            )
67
87
        # The default implementation uses branch.repository.has_revision()
68
88
        if self.rev_id is None:
69
89
            return False
72
92
        return True
73
93
 
74
94
    def _find_short_git_sha1(self, branch, sha1):
75
 
        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",
76
100
                              mapping_registry.parse_revision_id)
77
101
        branch.repository.lock_read()
78
102
        try:
82
106
                    foreign_revid, mapping = parse_revid(revid)
83
107
                except InvalidRevisionId:
84
108
                    continue
 
109
                if not isinstance(mapping.vcs, ForeignGit):
 
110
                    continue
85
111
                if foreign_revid.startswith(sha1):
86
112
                    history = self._history(branch, revid)
87
113
                    return RevisionInfo.from_revision_id(branch, revid, history)
90
116
            branch.repository.unlock()
91
117
 
92
118
    def _match_on(self, branch, revs):
93
 
        lazy_check_versions()
94
119
        loc = self.spec.find(':')
95
120
        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()
96
127
        if len(git_sha1) == 40:
97
128
            return self._lookup_git_sha1(branch, git_sha1)
98
 
        elif len(git_sha1) > 40:
99
 
            raise InvalidRevisionSpec(self.user_spec, branch)
100
129
        else:
101
130
            return self._find_short_git_sha1(branch, git_sha1)
102
131