/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

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revspec.py
1
 
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
 
 
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 3 of the License, or
6
 
# (at your option) any later version.
7
 
 
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
 
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
"""Custom revision specifier for Subversion."""
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
 
    )
28
 
 
29
 
from bzrlib.plugins.git import (
30
 
    lazy_check_versions,
31
 
    )
32
 
from bzrlib.plugins.git.mapping import (
33
 
    mapping_registry,
34
 
    )
35
 
 
36
 
class RevisionSpec_git(RevisionSpec):
37
 
    """Selects a revision using a Subversion revision number."""
38
 
 
39
 
    help_txt = """Selects a revision using a Git revision sha1.
40
 
    """
41
 
    
42
 
    prefix = 'git:'
43
 
 
44
 
    def _lookup_git_sha1(self, branch, sha1):
45
 
        bzr_revid = branch.mapping.revision_id_foreign_to_bzr(git_sha1)
46
 
        if branch.repository.has_revision(bzr_revid):
47
 
            history = self._history(branch, bzr_revid)
48
 
            return RevisionInfo.from_revision_id(branch, bzr_revid, history)
49
 
        raise InvalidRevisionSpec(self.user_spec, branch)
50
 
 
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
 
    def needs_branch(self):
86
 
        return True
87
 
 
88
 
    def get_branch(self):
89
 
        return None