/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

Use public properties to set git objects values.

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