bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2
by Jelmer Vernooij
Refresh copyright headers, add my email. |
1 |
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
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
|
|
0.200.1635
by Jelmer Vernooij
Change revspec.py license back to GPLv2+. |
5 |
# the Free Software Foundation; either version 2 of the License, or
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
6 |
# (at your option) any later version.
|
0.359.1
by Jelmer Vernooij
Fix headers to make brz GPL checker happy. |
7 |
#
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
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.
|
|
0.359.1
by Jelmer Vernooij
Fix headers to make brz GPL checker happy. |
12 |
#
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
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
|
|
0.358.1
by Jelmer Vernooij
Fix FSF address. |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
0.359.1
by Jelmer Vernooij
Fix headers to make brz GPL checker happy. |
16 |
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
17 |
"""Custom revision specifier for Subversion."""
|
18 |
||
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
19 |
# Please note that imports are delayed as much as possible here since
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
20 |
# if DWIM revspecs are supported this module is imported by __init__.py.
|
21 |
||
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
22 |
from ..errors import ( |
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
23 |
InvalidRevisionId, |
0.200.292
by Jelmer Vernooij
Fix formatting. |
24 |
)
|
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
25 |
from ..revision import ( |
0.200.979
by Jelmer Vernooij
Special-case NULL_REVISION when looking for Git shas. |
26 |
NULL_REVISION, |
27 |
)
|
|
6986.2.1
by Jelmer Vernooij
Move breezy.plugins.git to breezy.git. |
28 |
from ..revisionspec import ( |
7499.1.1
by Jelmer Vernooij
Move InvalidRevisionSpec to breezy.revisionspec. |
29 |
InvalidRevisionSpec, |
0.200.292
by Jelmer Vernooij
Fix formatting. |
30 |
RevisionInfo, |
31 |
RevisionSpec, |
|
32 |
)
|
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
33 |
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
34 |
|
35 |
def valid_git_sha1(hex): |
|
0.200.813
by Jelmer Vernooij
Add tests for revspec. |
36 |
"""Check if `hex` is a validly formatted Git SHA1. |
0.200.1636
by Jelmer Vernooij
Some formatting fixes. |
37 |
|
0.200.813
by Jelmer Vernooij
Add tests for revspec. |
38 |
:param hex: Hex string to validate
|
39 |
:return: Boolean
|
|
40 |
"""
|
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
41 |
try: |
7265.2.1
by Jelmer Vernooij
Don't require that short git shas have an even number of characters. |
42 |
int(hex, 16) |
43 |
except ValueError: |
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
44 |
return False |
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
45 |
else: |
46 |
return True |
|
47 |
||
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
48 |
|
49 |
class RevisionSpec_git(RevisionSpec): |
|
7296.3.1
by Jelmer Vernooij
Add help. |
50 |
"""Selects a revision using a Git commit SHA1.""" |
51 |
||
52 |
help_txt = """Selects a revision using a Git commit SHA1. |
|
53 |
||
54 |
Selects a revision using a Git commit SHA1, short or long.
|
|
55 |
||
56 |
This works for both native Git repositories and Git revisions
|
|
57 |
imported into Bazaar repositories.
|
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
58 |
"""
|
0.200.695
by Jelmer Vernooij
Clean up trailing whitespace. |
59 |
|
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
60 |
prefix = 'git:' |
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
61 |
wants_revision_history = False |
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
62 |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
63 |
def _lookup_git_sha1(self, branch, sha1): |
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
64 |
from .errors import ( |
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
65 |
GitSmartRemoteNotSupported, |
66 |
)
|
|
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
67 |
from .mapping import ( |
0.200.716
by Jelmer Vernooij
Fix use in non-git branches. |
68 |
default_mapping, |
69 |
)
|
|
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
70 |
|
0.200.716
by Jelmer Vernooij
Fix use in non-git branches. |
71 |
bzr_revid = getattr(branch.repository, "lookup_foreign_revision_id", |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
72 |
default_mapping.revision_id_foreign_to_bzr)(sha1) |
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
73 |
try: |
74 |
if branch.repository.has_revision(bzr_revid): |
|
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
75 |
return bzr_revid |
0.200.415
by Jelmer Vernooij
make 'bzr pull --revision' work for remote repositories. |
76 |
except GitSmartRemoteNotSupported: |
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
77 |
return bzr_revid |
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
78 |
raise InvalidRevisionSpec(self.user_spec, branch) |
79 |
||
0.200.418
by Jelmer Vernooij
Override GitRevisionSpec.__nonzero__ as the default implementation uses has_revision(), which is not available on remote git repositories. |
80 |
def __nonzero__(self): |
81 |
# The default implementation uses branch.repository.has_revision()
|
|
82 |
if self.rev_id is None: |
|
83 |
return False |
|
84 |
if self.rev_id == NULL_REVISION: |
|
85 |
return False |
|
86 |
return True |
|
87 |
||
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
88 |
def _find_short_git_sha1(self, branch, sha1): |
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
89 |
from .mapping import ( |
0.200.908
by Jelmer Vernooij
Avoid interpreting bzr-svn revisions in git revspecs. |
90 |
ForeignGit, |
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
91 |
mapping_registry, |
92 |
)
|
|
0.200.650
by Jelmer Vernooij
Use standard names for lookup functions. |
93 |
parse_revid = getattr(branch.repository, "lookup_bzr_revision_id", |
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
94 |
mapping_registry.parse_revision_id) |
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
95 |
def matches_revid(revid): |
96 |
if revid == NULL_REVISION: |
|
97 |
return False |
|
98 |
try: |
|
99 |
foreign_revid, mapping = parse_revid(revid) |
|
100 |
except InvalidRevisionId: |
|
101 |
return False |
|
102 |
if not isinstance(mapping.vcs, ForeignGit): |
|
103 |
return False |
|
104 |
return foreign_revid.startswith(sha1) |
|
0.200.1788
by Jelmer Vernooij
Use context managers. |
105 |
with branch.repository.lock_read(): |
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
106 |
graph = branch.repository.get_graph() |
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
107 |
last_revid = branch.last_revision() |
108 |
if matches_revid(last_revid): |
|
109 |
return last_revid |
|
110 |
for revid, _ in graph.iter_ancestry([last_revid]): |
|
111 |
if matches_revid(revid): |
|
112 |
return revid |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
113 |
raise InvalidRevisionSpec(self.user_spec, branch) |
114 |
||
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
115 |
def _as_revision_id(self, context_branch): |
0.200.202
by Jelmer Vernooij
Add git: revision specifier. |
116 |
loc = self.spec.find(':') |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
117 |
git_sha1 = self.spec[loc + 1:].encode("utf-8") |
7290.19.3
by Jelmer Vernooij
More tests. |
118 |
if (len(git_sha1) > 40 or len(git_sha1) < 4 or |
119 |
not valid_git_sha1(git_sha1)): |
|
7490.108.2
by Jelmer Vernooij
Fix NameError. |
120 |
raise InvalidRevisionSpec(self.user_spec, context_branch) |
0.200.1641
by Jelmer Vernooij
Use relative imports where possible. |
121 |
from . import ( |
0.200.645
by Jelmer Vernooij
Support DWIM git: revspecs. |
122 |
lazy_check_versions, |
123 |
)
|
|
124 |
lazy_check_versions() |
|
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
125 |
if len(git_sha1) == 40: |
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
126 |
return self._lookup_git_sha1(context_branch, git_sha1) |
0.200.322
by Jelmer Vernooij
Support short git revision specifiers. |
127 |
else: |
7490.108.1
by Jelmer Vernooij
Make git revisionspec more efficient. |
128 |
return self._find_short_git_sha1(context_branch, git_sha1) |
129 |
||
130 |
def _match_on(self, branch, revs): |
|
131 |
revid = self._as_revision_id(branch) |
|
132 |
return RevisionInfo.from_revision_id(branch, revid) |
|
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 |