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 |
)
|
|
0.200.979
by Jelmer Vernooij
Special-case NULL_REVISION when looking for Git shas. |
25 |
from bzrlib.revision import ( |
26 |
NULL_REVISION, |
|
27 |
)
|
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
28 |
from bzrlib.revisionspec import ( |
29 |
RevisionInfo, |
|
30 |
RevisionSpec, |
|
31 |
)
|
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
32 |
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
33 |
|
34 |
def valid_git_sha1(hex): |
|
0.200.813
by Jelmer Vernooij
Add tests for revspec. |
35 |
"""Check if `hex` is a validly formatted Git SHA1. |
36 |
|
|
37 |
:param hex: Hex string to validate
|
|
38 |
:return: Boolean
|
|
39 |
"""
|
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
40 |
import binascii |
41 |
try: |
|
42 |
binascii.unhexlify(hex) |
|
43 |
except TypeError: |
|
44 |
return False |
|
45 |
else: |
|
46 |
return True |
|
47 |
||
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
48 |
|
49 |
class RevisionSpec_git(RevisionSpec): |
|
50 |
"""Selects a revision using a Subversion revision number.""" |
|
51 |
||
52 |
help_txt = """Selects a revision using a Git revision sha1. |
|
53 |
"""
|
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
54 |
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
55 |
prefix = 'git:' |
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
56 |
wants_revision_history = False |
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
57 |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
58 |
def _lookup_git_sha1(self, branch, sha1): |
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
59 |
from bzrlib.plugins.git.errors import ( |
60 |
GitSmartRemoteNotSupported, |
|
61 |
)
|
|
0.200.716
by Jelmer Vernooij
Fix use in non-git branches. |
62 |
from bzrlib.plugins.git.mapping import ( |
63 |
default_mapping, |
|
64 |
)
|
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
65 |
|
0.200.716
by Jelmer Vernooij
Fix use in non-git branches. |
66 |
bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id", |
67 |
default_mapping.revision_id_foreign_to_bzr)(sha1) |
|
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
68 |
try: |
69 |
if branch.repository.has_revision(bzr_revid): |
|
70 |
history = self._history(branch, bzr_revid) |
|
71 |
return RevisionInfo.from_revision_id(branch, bzr_revid, history) |
|
72 |
except GitSmartRemoteNotSupported: |
|
73 |
return RevisionInfo(branch, None, bzr_revid) |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
74 |
raise InvalidRevisionSpec(self.user_spec, branch) |
75 |
||
76 |
def _history(self, branch, revid): |
|
0.200.893
by Jelmer Vernooij
Fix locking. |
77 |
branch.lock_read() |
78 |
try: |
|
79 |
history = list(branch.repository.iter_reverse_revision_history( |
|
80 |
revid)) |
|
81 |
finally: |
|
82 |
branch.unlock() |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
83 |
history.reverse() |
84 |
return history |
|
85 |
||
0.200.418
by Jelmer Vernooij
Override GitRevisionSpec.__nonzero__ as the default implementation uses has_revision(), which is not available on remote git repositories. |
86 |
def __nonzero__(self): |
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()]): |
|
0.200.979
by Jelmer Vernooij
Special-case NULL_REVISION when looking for Git shas. |
105 |
if revid == NULL_REVISION: |
106 |
continue
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
107 |
try: |
108 |
foreign_revid, mapping = parse_revid(revid) |
|
109 |
except InvalidRevisionId: |
|
110 |
continue
|
|
0.200.908
by Jelmer Vernooij
Avoid interpreting bzr-svn revisions in git revspecs. |
111 |
if not isinstance(mapping.vcs, ForeignGit): |
112 |
continue
|
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
113 |
if foreign_revid.startswith(sha1): |
114 |
history = self._history(branch, revid) |
|
115 |
return RevisionInfo.from_revision_id(branch, revid, history) |
|
116 |
raise InvalidRevisionSpec(self.user_spec, branch) |
|
117 |
finally: |
|
118 |
branch.repository.unlock() |
|
119 |
||
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
120 |
def _match_on(self, branch, revs): |
121 |
loc = self.spec.find(':') |
|
122 |
git_sha1 = self.spec[loc+1:].encode("utf-8") |
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
123 |
if len(git_sha1) > 40 or not valid_git_sha1(git_sha1): |
124 |
raise InvalidRevisionSpec(self.user_spec, branch) |
|
125 |
from bzrlib.plugins.git import ( |
|
126 |
lazy_check_versions, |
|
127 |
)
|
|
128 |
lazy_check_versions() |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
129 |
if len(git_sha1) == 40: |
130 |
return self._lookup_git_sha1(branch, git_sha1) |
|
131 |
else: |
|
132 |
return self._find_short_git_sha1(branch, git_sha1) |
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
133 |
|
134 |
def needs_branch(self): |
|
135 |
return True |
|
136 |
||
137 |
def get_branch(self): |
|
138 |
return None |