/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

Add basic infrastructure for dpush.

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