/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 breezy/git/revspec.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-28 00:32:38 UTC
  • mfrom: (7490.40.77 work)
  • mto: (7490.40.79 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200728003238-vx5u412hn72f18lr
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/revspec.py
23
23
 
24
24
from ..errors import (
25
25
    InvalidRevisionId,
26
 
    InvalidRevisionSpec,
27
26
    )
28
27
from ..revision import (
29
28
    NULL_REVISION,
30
29
)
31
30
from ..revisionspec import (
 
31
    InvalidRevisionSpec,
32
32
    RevisionInfo,
33
33
    RevisionSpec,
34
34
    )
74
74
                            default_mapping.revision_id_foreign_to_bzr)(sha1)
75
75
        try:
76
76
            if branch.repository.has_revision(bzr_revid):
77
 
                return RevisionInfo.from_revision_id(branch, bzr_revid)
 
77
                return bzr_revid
78
78
        except GitSmartRemoteNotSupported:
79
 
            return RevisionInfo(branch, None, bzr_revid)
 
79
            return bzr_revid
80
80
        raise InvalidRevisionSpec(self.user_spec, branch)
81
81
 
82
82
    def __nonzero__(self):
94
94
            )
95
95
        parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",
96
96
                              mapping_registry.parse_revision_id)
 
97
        def matches_revid(revid):
 
98
            if revid == NULL_REVISION:
 
99
                return False
 
100
            try:
 
101
                foreign_revid, mapping = parse_revid(revid)
 
102
            except InvalidRevisionId:
 
103
                return False
 
104
            if not isinstance(mapping.vcs, ForeignGit):
 
105
                return False
 
106
            return foreign_revid.startswith(sha1)
97
107
        with branch.repository.lock_read():
98
108
            graph = branch.repository.get_graph()
99
 
            for revid, _ in graph.iter_ancestry([branch.last_revision()]):
100
 
                if revid == NULL_REVISION:
101
 
                    continue
102
 
                try:
103
 
                    foreign_revid, mapping = parse_revid(revid)
104
 
                except InvalidRevisionId:
105
 
                    continue
106
 
                if not isinstance(mapping.vcs, ForeignGit):
107
 
                    continue
108
 
                if foreign_revid.startswith(sha1):
109
 
                    return RevisionInfo.from_revision_id(branch, revid)
 
109
            last_revid = branch.last_revision()
 
110
            if matches_revid(last_revid):
 
111
                return last_revid
 
112
            for revid, _ in graph.iter_ancestry([last_revid]):
 
113
                if matches_revid(revid):
 
114
                    return revid
110
115
            raise InvalidRevisionSpec(self.user_spec, branch)
111
116
 
112
 
    def _match_on(self, branch, revs):
 
117
    def _as_revision_id(self, context_branch):
113
118
        loc = self.spec.find(':')
114
119
        git_sha1 = self.spec[loc + 1:].encode("utf-8")
115
120
        if (len(git_sha1) > 40 or len(git_sha1) < 4 or
116
121
                not valid_git_sha1(git_sha1)):
117
 
            raise InvalidRevisionSpec(self.user_spec, branch)
 
122
            raise InvalidRevisionSpec(self.user_spec, context_branch)
118
123
        from . import (
119
124
            lazy_check_versions,
120
125
            )
121
126
        lazy_check_versions()
122
127
        if len(git_sha1) == 40:
123
 
            return self._lookup_git_sha1(branch, git_sha1)
 
128
            return self._lookup_git_sha1(context_branch, git_sha1)
124
129
        else:
125
 
            return self._find_short_git_sha1(branch, git_sha1)
 
130
            return self._find_short_git_sha1(context_branch, git_sha1)
 
131
 
 
132
    def _match_on(self, branch, revs):
 
133
        revid = self._as_revision_id(branch)
 
134
        return RevisionInfo.from_revision_id(branch, revid)
126
135
 
127
136
    def needs_branch(self):
128
137
        return True