/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revspec.py
22
22
    InvalidRevisionId,
23
23
    InvalidRevisionSpec,
24
24
    )
 
25
from bzrlib.revision import (
 
26
    NULL_REVISION,
 
27
)
25
28
from bzrlib.revisionspec import (
26
29
    RevisionInfo,
27
30
    RevisionSpec,
81
84
        return history
82
85
 
83
86
    def __nonzero__(self):
84
 
        from bzrlib.revision import (
85
 
            NULL_REVISION,
86
 
            )
87
87
        # The default implementation uses branch.repository.has_revision()
88
88
        if self.rev_id is None:
89
89
            return False
93
93
 
94
94
    def _find_short_git_sha1(self, branch, sha1):
95
95
        from bzrlib.plugins.git.mapping import (
 
96
            ForeignGit,
96
97
            mapping_registry,
97
98
            )
98
99
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
101
102
        try:
102
103
            graph = branch.repository.get_graph()
103
104
            for revid, _ in graph.iter_ancestry([branch.last_revision()]):
 
105
                if revid == NULL_REVISION:
 
106
                    continue
104
107
                try:
105
108
                    foreign_revid, mapping = parse_revid(revid)
106
109
                except InvalidRevisionId:
107
110
                    continue
 
111
                if not isinstance(mapping.vcs, ForeignGit):
 
112
                    continue
108
113
                if foreign_revid.startswith(sha1):
109
114
                    history = self._history(branch, revid)
110
115
                    return RevisionInfo.from_revision_id(branch, revid, history)