bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
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  | 
||
| 
0.200.695
by Jelmer Vernooij
 Clean up trailing whitespace.  | 
18  | 
# Please note that imports are delayed as much as possible here since
 | 
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
19  | 
# if DWIM revspecs are supported this module is imported by __init__.py.
 | 
20  | 
||
| 
0.200.292
by Jelmer Vernooij
 Fix formatting.  | 
21  | 
from bzrlib.errors import (  | 
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
22  | 
InvalidRevisionId,  | 
| 
0.200.292
by Jelmer Vernooij
 Fix formatting.  | 
23  | 
InvalidRevisionSpec,  | 
24  | 
    )
 | 
|
25  | 
from bzrlib.revisionspec import (  | 
|
26  | 
RevisionInfo,  | 
|
27  | 
RevisionSpec,  | 
|
28  | 
    )
 | 
|
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
29  | 
|
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
30  | 
|
31  | 
def valid_git_sha1(hex):  | 
|
| 
0.200.813
by Jelmer Vernooij
 Add tests for revspec.  | 
32  | 
"""Check if `hex` is a validly formatted Git SHA1.  | 
33  | 
    
 | 
|
34  | 
    :param hex: Hex string to validate
 | 
|
35  | 
    :return: Boolean
 | 
|
36  | 
    """
 | 
|
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
37  | 
import binascii  | 
38  | 
try:  | 
|
39  | 
binascii.unhexlify(hex)  | 
|
40  | 
except TypeError:  | 
|
41  | 
return False  | 
|
42  | 
else:  | 
|
43  | 
return True  | 
|
44  | 
||
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
45  | 
|
46  | 
class RevisionSpec_git(RevisionSpec):  | 
|
47  | 
"""Selects a revision using a Subversion revision number."""  | 
|
48  | 
||
49  | 
help_txt = """Selects a revision using a Git revision sha1.  | 
|
50  | 
    """
 | 
|
| 
0.200.695
by Jelmer Vernooij
 Clean up trailing whitespace.  | 
51  | 
|
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
52  | 
prefix = 'git:'  | 
| 
0.200.415
by Jelmer Vernooij
 make 'bzr pull --revision' work for remote repositories.  | 
53  | 
wants_revision_history = False  | 
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
54  | 
|
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
55  | 
def _lookup_git_sha1(self, branch, sha1):  | 
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
56  | 
from bzrlib.plugins.git.errors import (  | 
57  | 
GitSmartRemoteNotSupported,  | 
|
58  | 
            )
 | 
|
| 
0.200.716
by Jelmer Vernooij
 Fix use in non-git branches.  | 
59  | 
from bzrlib.plugins.git.mapping import (  | 
60  | 
default_mapping,  | 
|
61  | 
            )
 | 
|
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
62  | 
|
| 
0.200.716
by Jelmer Vernooij
 Fix use in non-git branches.  | 
63  | 
bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id",  | 
64  | 
default_mapping.revision_id_foreign_to_bzr)(sha1)  | 
|
| 
0.200.415
by Jelmer Vernooij
 make 'bzr pull --revision' work for remote repositories.  | 
65  | 
try:  | 
66  | 
if branch.repository.has_revision(bzr_revid):  | 
|
67  | 
history = self._history(branch, bzr_revid)  | 
|
68  | 
return RevisionInfo.from_revision_id(branch, bzr_revid, history)  | 
|
69  | 
except GitSmartRemoteNotSupported:  | 
|
70  | 
return RevisionInfo(branch, None, bzr_revid)  | 
|
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
71  | 
raise InvalidRevisionSpec(self.user_spec, branch)  | 
72  | 
||
73  | 
def _history(self, branch, revid):  | 
|
| 
0.200.893
by Jelmer Vernooij
 Fix locking.  | 
74  | 
branch.lock_read()  | 
75  | 
try:  | 
|
76  | 
history = list(branch.repository.iter_reverse_revision_history(  | 
|
77  | 
revid))  | 
|
78  | 
finally:  | 
|
79  | 
branch.unlock()  | 
|
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
80  | 
history.reverse()  | 
81  | 
return history  | 
|
82  | 
||
| 
0.200.418
by Jelmer Vernooij
 Override GitRevisionSpec.__nonzero__ as the default implementation uses has_revision(), which is not available on remote git repositories.  | 
83  | 
def __nonzero__(self):  | 
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
84  | 
from bzrlib.revision import (  | 
85  | 
NULL_REVISION,  | 
|
86  | 
            )
 | 
|
| 
0.200.418
by Jelmer Vernooij
 Override GitRevisionSpec.__nonzero__ as the default implementation uses has_revision(), which is not available on remote git repositories.  | 
87  | 
        # The default implementation uses branch.repository.has_revision()
 | 
88  | 
if self.rev_id is None:  | 
|
89  | 
return False  | 
|
90  | 
if self.rev_id == NULL_REVISION:  | 
|
91  | 
return False  | 
|
92  | 
return True  | 
|
93  | 
||
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
94  | 
def _find_short_git_sha1(self, branch, sha1):  | 
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
95  | 
from bzrlib.plugins.git.mapping import (  | 
| 
0.200.908
by Jelmer Vernooij
 Avoid interpreting bzr-svn revisions in git revspecs.  | 
96  | 
ForeignGit,  | 
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
97  | 
mapping_registry,  | 
98  | 
            )
 | 
|
| 
0.200.650
by Jelmer Vernooij
 Use standard names for lookup functions.  | 
99  | 
parse_revid = getattr(branch.repository, "lookup_bzr_revision_id",  | 
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
100  | 
mapping_registry.parse_revision_id)  | 
101  | 
branch.repository.lock_read()  | 
|
102  | 
try:  | 
|
103  | 
graph = branch.repository.get_graph()  | 
|
104  | 
for revid, _ in graph.iter_ancestry([branch.last_revision()]):  | 
|
105  | 
try:  | 
|
106  | 
foreign_revid, mapping = parse_revid(revid)  | 
|
107  | 
except InvalidRevisionId:  | 
|
108  | 
                    continue
 | 
|
| 
0.200.908
by Jelmer Vernooij
 Avoid interpreting bzr-svn revisions in git revspecs.  | 
109  | 
if not isinstance(mapping.vcs, ForeignGit):  | 
110  | 
                    continue
 | 
|
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
111  | 
if foreign_revid.startswith(sha1):  | 
112  | 
history = self._history(branch, revid)  | 
|
113  | 
return RevisionInfo.from_revision_id(branch, revid, history)  | 
|
114  | 
raise InvalidRevisionSpec(self.user_spec, branch)  | 
|
115  | 
finally:  | 
|
116  | 
branch.repository.unlock()  | 
|
117  | 
||
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
118  | 
def _match_on(self, branch, revs):  | 
119  | 
loc = self.spec.find(':')  | 
|
120  | 
git_sha1 = self.spec[loc+1:].encode("utf-8")  | 
|
| 
0.200.645
by Jelmer Vernooij
 Support DWIM git: revspecs.  | 
121  | 
if len(git_sha1) > 40 or not valid_git_sha1(git_sha1):  | 
122  | 
raise InvalidRevisionSpec(self.user_spec, branch)  | 
|
123  | 
from bzrlib.plugins.git import (  | 
|
124  | 
lazy_check_versions,  | 
|
125  | 
            )
 | 
|
126  | 
lazy_check_versions()  | 
|
| 
0.200.322
by Jelmer Vernooij
 Support short git revision specifiers.  | 
127  | 
if len(git_sha1) == 40:  | 
128  | 
return self._lookup_git_sha1(branch, git_sha1)  | 
|
129  | 
else:  | 
|
130  | 
return self._find_short_git_sha1(branch, git_sha1)  | 
|
| 
0.200.202
by Jelmer Vernooij
 Add git: revision specifier.  | 
131  | 
|
132  | 
def needs_branch(self):  | 
|
133  | 
return True  | 
|
134  | 
||
135  | 
def get_branch(self):  | 
|
136  | 
return None  |