/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-09-10 13:13:15 UTC
  • mto: (0.200.602 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090910131315-6890xg58pl2jseml
Allow serving remote URLs.

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