/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: 2009-10-18 15:44:38 UTC
  • mto: (0.200.636 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20091018154438-l53yy8s00eomwc9v
Add support for parsing hg-git metadata in the experimental mappings.

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