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