2220.2.3
by Martin Pool
Add tag: revision namespace. |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
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 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
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 |
||
17 |
||
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
18 |
import bisect |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
19 |
import datetime |
20 |
import re |
|
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
21 |
|
22 |
from bzrlib import ( |
|
23 |
errors, |
|
2325.2.5
by Marien Zwart
Call osutils.safe_revision_id instead of duplicating it. |
24 |
osutils, |
1948.4.18
by John Arbash Meinel
Update branch: spec and tests |
25 |
revision, |
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
26 |
symbol_versioning, |
27 |
trace, |
|
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
28 |
tsort, |
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
29 |
)
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
30 |
|
1948.4.16
by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes |
31 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
32 |
_marker = [] |
33 |
||
1948.4.16
by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes |
34 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
35 |
class RevisionInfo(object): |
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
36 |
"""The results of applying a revision specification to a branch."""
|
37 |
||
38 |
help_txt = """The results of applying a revision specification to a branch. |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
39 |
|
40 |
An instance has two useful attributes: revno, and rev_id.
|
|
41 |
||
42 |
They can also be accessed as spec[0] and spec[1] respectively,
|
|
43 |
so that you can write code like:
|
|
44 |
revno, rev_id = RevisionSpec(branch, spec)
|
|
45 |
although this is probably going to be deprecated later.
|
|
46 |
||
47 |
This class exists mostly to be the return value of a RevisionSpec,
|
|
48 |
so that you can access the member you're interested in (number or id)
|
|
49 |
or treat the result as a tuple.
|
|
50 |
"""
|
|
51 |
||
52 |
def __init__(self, branch, revno, rev_id=_marker): |
|
53 |
self.branch = branch |
|
54 |
self.revno = revno |
|
55 |
if rev_id is _marker: |
|
56 |
# allow caller to be lazy
|
|
57 |
if self.revno is None: |
|
58 |
self.rev_id = None |
|
59 |
else: |
|
60 |
self.rev_id = branch.get_rev_id(self.revno) |
|
61 |
else: |
|
62 |
self.rev_id = rev_id |
|
63 |
||
64 |
def __nonzero__(self): |
|
65 |
# first the easy ones...
|
|
66 |
if self.rev_id is None: |
|
67 |
return False |
|
68 |
if self.revno is not None: |
|
69 |
return True |
|
70 |
# TODO: otherwise, it should depend on how I was built -
|
|
71 |
# if it's in_history(branch), then check revision_history(),
|
|
72 |
# if it's in_store(branch), do the check below
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
73 |
return self.branch.repository.has_revision(self.rev_id) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
74 |
|
75 |
def __len__(self): |
|
76 |
return 2 |
|
77 |
||
78 |
def __getitem__(self, index): |
|
79 |
if index == 0: return self.revno |
|
80 |
if index == 1: return self.rev_id |
|
81 |
raise IndexError(index) |
|
82 |
||
83 |
def get(self): |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
84 |
return self.branch.repository.get_revision(self.rev_id) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
85 |
|
86 |
def __eq__(self, other): |
|
87 |
if type(other) not in (tuple, list, type(self)): |
|
88 |
return False |
|
89 |
if type(other) is type(self) and self.branch is not other.branch: |
|
90 |
return False |
|
91 |
return tuple(self) == tuple(other) |
|
92 |
||
93 |
def __repr__(self): |
|
94 |
return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % ( |
|
95 |
self.revno, self.rev_id, self.branch) |
|
96 |
||
2220.2.3
by Martin Pool
Add tag: revision namespace. |
97 |
@staticmethod
|
98 |
def from_revision_id(branch, revision_id, revs): |
|
99 |
"""Construct a RevisionInfo given just the id.
|
|
100 |
||
101 |
Use this if you don't know or care what the revno is.
|
|
102 |
"""
|
|
3298.2.11
by Aaron Bentley
Update tests for null:, clea up slightly |
103 |
if revision_id == revision.NULL_REVISION: |
104 |
return RevisionInfo(branch, 0, revision_id) |
|
2220.2.3
by Martin Pool
Add tag: revision namespace. |
105 |
try: |
106 |
revno = revs.index(revision_id) + 1 |
|
107 |
except ValueError: |
|
108 |
revno = None |
|
109 |
return RevisionInfo(branch, revno, revision_id) |
|
110 |
||
1948.4.16
by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes |
111 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
112 |
# classes in this list should have a "prefix" attribute, against which
|
113 |
# string specs are matched
|
|
114 |
SPEC_TYPES = [] |
|
1948.4.35
by John Arbash Meinel
Move the _revno_regex to a more logical location |
115 |
_revno_regex = None |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
116 |
|
1948.4.16
by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes |
117 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
118 |
class RevisionSpec(object): |
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
119 |
"""A parsed revision specification."""
|
120 |
||
121 |
help_txt = """A parsed revision specification. |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
122 |
|
123 |
A revision specification can be an integer, in which case it is
|
|
124 |
assumed to be a revno (though this will translate negative values
|
|
125 |
into positive ones); or it can be a string, in which case it is
|
|
126 |
parsed for something like 'date:' or 'revid:' etc.
|
|
127 |
||
128 |
Revision specs are an UI element, and they have been moved out
|
|
129 |
of the branch class to leave "back-end" classes unaware of such
|
|
130 |
details. Code that gets a revno or rev_id from other code should
|
|
131 |
not be using revision specs - revnos and revision ids are the
|
|
132 |
accepted ways to refer to revisions internally.
|
|
133 |
||
134 |
(Equivalent to the old Branch method get_revision_info())
|
|
135 |
"""
|
|
136 |
||
137 |
prefix = None |
|
3460.1.1
by John Arbash Meinel
Change the RevisionSpec_revno so that it doesn't need to grab the revision_history first. |
138 |
wants_revision_history = True |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
139 |
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
140 |
def __new__(cls, spec, _internal=False): |
141 |
if _internal: |
|
142 |
return object.__new__(cls, spec, _internal=_internal) |
|
143 |
||
144 |
symbol_versioning.warn('Creating a RevisionSpec directly has' |
|
145 |
' been deprecated in version 0.11. Use'
|
|
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
146 |
' RevisionSpec.from_string()'
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
147 |
' instead.', |
148 |
DeprecationWarning, stacklevel=2) |
|
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
149 |
return RevisionSpec.from_string(spec) |
150 |
||
151 |
@staticmethod
|
|
152 |
def from_string(spec): |
|
153 |
"""Parse a revision spec string into a RevisionSpec object.
|
|
154 |
||
155 |
:param spec: A string specified by the user
|
|
156 |
:return: A RevisionSpec object that understands how to parse the
|
|
157 |
supplied notation.
|
|
158 |
"""
|
|
159 |
if not isinstance(spec, (type(None), basestring)): |
|
160 |
raise TypeError('error') |
|
161 |
||
162 |
if spec is None: |
|
163 |
return RevisionSpec(None, _internal=True) |
|
164 |
for spectype in SPEC_TYPES: |
|
165 |
if spec.startswith(spectype.prefix): |
|
166 |
trace.mutter('Returning RevisionSpec %s for %s', |
|
167 |
spectype.__name__, spec) |
|
168 |
return spectype(spec, _internal=True) |
|
169 |
else: |
|
170 |
# RevisionSpec_revno is special cased, because it is the only
|
|
171 |
# one that directly handles plain integers
|
|
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
172 |
# TODO: This should not be special cased rather it should be
|
173 |
# a method invocation on spectype.canparse()
|
|
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
174 |
global _revno_regex |
175 |
if _revno_regex is None: |
|
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
176 |
_revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$') |
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
177 |
if _revno_regex.match(spec) is not None: |
178 |
return RevisionSpec_revno(spec, _internal=True) |
|
179 |
||
180 |
raise errors.NoSuchRevisionSpec(spec) |
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
181 |
|
182 |
def __init__(self, spec, _internal=False): |
|
183 |
"""Create a RevisionSpec referring to the Null revision.
|
|
184 |
||
185 |
:param spec: The original spec supplied by the user
|
|
186 |
:param _internal: Used to ensure that RevisionSpec is not being
|
|
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
187 |
called directly. Only from RevisionSpec.from_string()
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
188 |
"""
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
189 |
if not _internal: |
190 |
# XXX: Update this after 0.10 is released
|
|
191 |
symbol_versioning.warn('Creating a RevisionSpec directly has' |
|
192 |
' been deprecated in version 0.11. Use'
|
|
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
193 |
' RevisionSpec.from_string()'
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
194 |
' instead.', |
195 |
DeprecationWarning, stacklevel=2) |
|
196 |
self.user_spec = spec |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
197 |
if self.prefix and spec.startswith(self.prefix): |
198 |
spec = spec[len(self.prefix):] |
|
199 |
self.spec = spec |
|
200 |
||
201 |
def _match_on(self, branch, revs): |
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
202 |
trace.mutter('Returning RevisionSpec._match_on: None') |
3298.2.11
by Aaron Bentley
Update tests for null:, clea up slightly |
203 |
return RevisionInfo(branch, None, None) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
204 |
|
205 |
def _match_on_and_check(self, branch, revs): |
|
206 |
info = self._match_on(branch, revs) |
|
207 |
if info: |
|
208 |
return info |
|
3298.2.11
by Aaron Bentley
Update tests for null:, clea up slightly |
209 |
elif info == (None, None): |
210 |
# special case - nothing supplied
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
211 |
return info |
212 |
elif self.prefix: |
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
213 |
raise errors.InvalidRevisionSpec(self.user_spec, branch) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
214 |
else: |
1948.4.2
by John Arbash Meinel
Update _match_on_and_check to raise the right error |
215 |
raise errors.InvalidRevisionSpec(self.spec, branch) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
216 |
|
217 |
def in_history(self, branch): |
|
1732.3.1
by Matthieu Moy
Implementation of -r revno:N:/path/to/branch |
218 |
if branch: |
3460.1.1
by John Arbash Meinel
Change the RevisionSpec_revno so that it doesn't need to grab the revision_history first. |
219 |
if self.wants_revision_history: |
220 |
revs = branch.revision_history() |
|
221 |
else: |
|
222 |
revs = None |
|
1732.3.1
by Matthieu Moy
Implementation of -r revno:N:/path/to/branch |
223 |
else: |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
224 |
# this should never trigger.
|
225 |
# TODO: make it a deprecated code path. RBC 20060928
|
|
1732.3.1
by Matthieu Moy
Implementation of -r revno:N:/path/to/branch |
226 |
revs = None |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
227 |
return self._match_on_and_check(branch, revs) |
228 |
||
1432
by Robert Collins
branch: namespace |
229 |
# FIXME: in_history is somewhat broken,
|
230 |
# it will return non-history revisions in many
|
|
231 |
# circumstances. The expected facility is that
|
|
232 |
# in_history only returns revision-history revs,
|
|
233 |
# in_store returns any rev. RBC 20051010
|
|
234 |
# aliases for now, when we fix the core logic, then they
|
|
235 |
# will do what you expect.
|
|
236 |
in_store = in_history |
|
3298.2.8
by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id() |
237 |
in_branch = in_store |
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
238 |
|
3298.2.4
by John Arbash Meinel
Introduce as_revision_id() as a function instead of in_branch(need_revno=False) |
239 |
def as_revision_id(self, context_branch): |
240 |
"""Return just the revision_id for this revisions spec.
|
|
241 |
||
242 |
Some revision specs require a context_branch to be able to determine
|
|
243 |
their value. Not all specs will make use of it.
|
|
244 |
"""
|
|
245 |
return self._as_revision_id(context_branch) |
|
246 |
||
247 |
def _as_revision_id(self, context_branch): |
|
248 |
"""Implementation of as_revision_id()
|
|
249 |
||
250 |
Classes should override this function to provide appropriate
|
|
251 |
functionality. The default is to just call '.in_history().rev_id'
|
|
252 |
"""
|
|
253 |
return self.in_history(context_branch).rev_id |
|
254 |
||
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
255 |
def __repr__(self): |
256 |
# this is mostly for helping with testing
|
|
1948.4.32
by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/ |
257 |
return '<%s %s>' % (self.__class__.__name__, |
258 |
self.user_spec) |
|
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
259 |
|
1881.1.4
by Matthieu Moy
needs_tree -> needs_branch |
260 |
def needs_branch(self): |
261 |
"""Whether this revision spec needs a branch.
|
|
262 |
||
1711.2.99
by John Arbash Meinel
minor typo fix |
263 |
Set this to False the branch argument of _match_on is not used.
|
264 |
"""
|
|
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
265 |
return True |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
266 |
|
1907.4.1
by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path |
267 |
def get_branch(self): |
268 |
"""When the revision specifier contains a branch location, return it.
|
|
269 |
|
|
270 |
Otherwise, return None.
|
|
271 |
"""
|
|
272 |
return None |
|
273 |
||
1907.4.9
by Matthieu Moy
missing newline |
274 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
275 |
# private API
|
276 |
||
277 |
class RevisionSpec_revno(RevisionSpec): |
|
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
278 |
"""Selects a revision using a number."""
|
279 |
||
280 |
help_txt = """Selects a revision using a number. |
|
2023.1.1
by ghigo
add topics help |
281 |
|
282 |
Use an integer to specify a revision in the history of the branch.
|
|
283 |
Optionally a branch can be specified. The 'revno:' prefix is optional.
|
|
284 |
A negative number will count from the end of the branch (-1 is the
|
|
285 |
last revision, -2 the previous one). If the negative number is larger
|
|
286 |
than the branch's history, the first revision is returned.
|
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
287 |
Examples::
|
288 |
||
2023.1.1
by ghigo
add topics help |
289 |
revno:1 -> return the first revision
|
290 |
revno:3:/path/to/branch -> return the 3rd revision of
|
|
291 |
the branch '/path/to/branch'
|
|
292 |
revno:-1 -> The last revision in a branch.
|
|
293 |
-2:http://other/branch -> The second to last revision in the
|
|
294 |
remote branch.
|
|
295 |
-1000000 -> Most likely the first revision, unless
|
|
296 |
your history is very long.
|
|
297 |
"""
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
298 |
prefix = 'revno:' |
3460.1.1
by John Arbash Meinel
Change the RevisionSpec_revno so that it doesn't need to grab the revision_history first. |
299 |
wants_revision_history = False |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
300 |
|
301 |
def _match_on(self, branch, revs): |
|
302 |
"""Lookup a revision by revision number"""
|
|
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
303 |
branch, revno, revision_id = self._lookup(branch, revs) |
304 |
return RevisionInfo(branch, revno, revision_id) |
|
305 |
||
306 |
def _lookup(self, branch, revs_or_none): |
|
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
307 |
loc = self.spec.find(':') |
308 |
if loc == -1: |
|
309 |
revno_spec = self.spec |
|
310 |
branch_spec = None |
|
311 |
else: |
|
312 |
revno_spec = self.spec[:loc] |
|
313 |
branch_spec = self.spec[loc+1:] |
|
314 |
||
315 |
if revno_spec == '': |
|
1948.4.6
by John Arbash Meinel
A small bugfix, and more tests for revno: |
316 |
if not branch_spec: |
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
317 |
raise errors.InvalidRevisionSpec(self.user_spec, |
1948.4.5
by John Arbash Meinel
Fix tests for negative entries, and add tests for revno: |
318 |
branch, 'cannot have an empty revno and no branch') |
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
319 |
revno = None |
320 |
else: |
|
321 |
try: |
|
322 |
revno = int(revno_spec) |
|
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
323 |
dotted = False |
324 |
except ValueError: |
|
325 |
# dotted decimal. This arguably should not be here
|
|
326 |
# but the from_string method is a little primitive
|
|
327 |
# right now - RBC 20060928
|
|
328 |
try: |
|
329 |
match_revno = tuple((int(number) for number in revno_spec.split('.'))) |
|
330 |
except ValueError, e: |
|
331 |
raise errors.InvalidRevisionSpec(self.user_spec, branch, e) |
|
332 |
||
333 |
dotted = True |
|
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
334 |
|
1948.4.6
by John Arbash Meinel
A small bugfix, and more tests for revno: |
335 |
if branch_spec: |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
336 |
# the user has override the branch to look in.
|
337 |
# we need to refresh the revision_history map and
|
|
338 |
# the branch object.
|
|
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
339 |
from bzrlib.branch import Branch |
340 |
branch = Branch.open(branch_spec) |
|
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
341 |
revs_or_none = None |
1948.4.22
by John Arbash Meinel
Refactor common code from integer revno handlers |
342 |
|
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
343 |
if dotted: |
344 |
branch.lock_read() |
|
345 |
try: |
|
2418.5.9
by John Arbash Meinel
Have RevisionSpec_revno() also use the new helper |
346 |
revision_id_to_revno = branch.get_revision_id_to_revno_map() |
347 |
revisions = [revision_id for revision_id, revno |
|
348 |
in revision_id_to_revno.iteritems() |
|
349 |
if revno == match_revno] |
|
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
350 |
finally: |
351 |
branch.unlock() |
|
352 |
if len(revisions) != 1: |
|
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
353 |
return branch, None, None |
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
354 |
else: |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
355 |
# there is no traditional 'revno' for dotted-decimal revnos.
|
356 |
# so for API compatability we return None.
|
|
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
357 |
return branch, None, revisions[0] |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
358 |
else: |
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
359 |
last_revno, last_revision_id = branch.last_revision_info() |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
360 |
if revno < 0: |
2249.4.2
by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible. |
361 |
# if get_rev_id supported negative revnos, there would not be a
|
362 |
# need for this special case.
|
|
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
363 |
if (-revno) >= last_revno: |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
364 |
revno = 1 |
365 |
else: |
|
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
366 |
revno = last_revno + revno + 1 |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
367 |
try: |
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
368 |
revision_id = branch.get_rev_id(revno, revs_or_none) |
1988.4.5
by Robert Collins
revisions can now be specified using dotted-decimal revision numbers. |
369 |
except errors.NoSuchRevision: |
370 |
raise errors.InvalidRevisionSpec(self.user_spec, branch) |
|
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
371 |
return branch, revno, revision_id |
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
372 |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
373 |
def _as_revision_id(self, context_branch): |
374 |
# We would have the revno here, but we don't really care
|
|
3298.2.6
by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id() |
375 |
branch, revno, revision_id = self._lookup(context_branch, None) |
376 |
return revision_id |
|
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
377 |
|
1881.1.4
by Matthieu Moy
needs_tree -> needs_branch |
378 |
def needs_branch(self): |
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
379 |
return self.spec.find(':') == -1 |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
380 |
|
1907.4.1
by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path |
381 |
def get_branch(self): |
382 |
if self.spec.find(':') == -1: |
|
383 |
return None |
|
384 |
else: |
|
385 |
return self.spec[self.spec.find(':')+1:] |
|
386 |
||
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
387 |
# Old compatibility
|
388 |
RevisionSpec_int = RevisionSpec_revno |
|
389 |
||
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
390 |
SPEC_TYPES.append(RevisionSpec_revno) |
391 |
||
392 |
||
393 |
class RevisionSpec_revid(RevisionSpec): |
|
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
394 |
"""Selects a revision using the revision id."""
|
395 |
||
396 |
help_txt = """Selects a revision using the revision id. |
|
2023.1.1
by ghigo
add topics help |
397 |
|
398 |
Supply a specific revision id, that can be used to specify any
|
|
399 |
revision id in the ancestry of the branch.
|
|
400 |
Including merges, and pending merges.
|
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
401 |
Examples::
|
402 |
||
2070.4.7
by ghigo
Updates on the basis of the Richard Wilbur suggestions |
403 |
revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'
|
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
404 |
"""
|
405 |
||
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
406 |
prefix = 'revid:' |
407 |
||
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
408 |
def _match_on(self, branch, revs): |
2325.2.5
by Marien Zwart
Call osutils.safe_revision_id instead of duplicating it. |
409 |
# self.spec comes straight from parsing the command line arguments,
|
410 |
# so we expect it to be a Unicode string. Switch it to the internal
|
|
411 |
# representation.
|
|
412 |
revision_id = osutils.safe_revision_id(self.spec, warn=False) |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
413 |
return RevisionInfo.from_revision_id(branch, revision_id, revs) |
3060.3.3
by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history. |
414 |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
415 |
def _as_revision_id(self, context_branch): |
416 |
return osutils.safe_revision_id(self.spec, warn=False) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
417 |
|
418 |
SPEC_TYPES.append(RevisionSpec_revid) |
|
419 |
||
420 |
||
421 |
class RevisionSpec_last(RevisionSpec): |
|
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
422 |
"""Selects the nth revision from the end."""
|
423 |
||
424 |
help_txt = """Selects the nth revision from the end. |
|
2023.1.1
by ghigo
add topics help |
425 |
|
426 |
Supply a positive number to get the nth revision from the end.
|
|
2070.4.7
by ghigo
Updates on the basis of the Richard Wilbur suggestions |
427 |
This is the same as supplying negative numbers to the 'revno:' spec.
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
428 |
Examples::
|
429 |
||
2023.1.1
by ghigo
add topics help |
430 |
last:1 -> return the last revision
|
431 |
last:3 -> return the revision 2 before the end.
|
|
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
432 |
"""
|
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
433 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
434 |
prefix = 'last:' |
435 |
||
436 |
def _match_on(self, branch, revs): |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
437 |
revno, revision_id = self._revno_and_revision_id(branch, revs) |
438 |
return RevisionInfo(branch, revno, revision_id) |
|
439 |
||
440 |
def _revno_and_revision_id(self, context_branch, revs_or_none): |
|
441 |
last_revno, last_revision_id = context_branch.last_revision_info() |
|
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
442 |
|
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
443 |
if self.spec == '': |
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
444 |
if not last_revno: |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
445 |
raise errors.NoCommits(context_branch) |
446 |
return last_revno, last_revision_id |
|
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
447 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
448 |
try: |
449 |
offset = int(self.spec) |
|
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
450 |
except ValueError, e: |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
451 |
raise errors.InvalidRevisionSpec(self.user_spec, context_branch, e) |
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
452 |
|
453 |
if offset <= 0: |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
454 |
raise errors.InvalidRevisionSpec(self.user_spec, context_branch, |
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
455 |
'you must supply a positive value') |
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
456 |
|
457 |
revno = last_revno - offset + 1 |
|
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
458 |
try: |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
459 |
revision_id = context_branch.get_rev_id(revno, revs_or_none) |
1948.4.9
by John Arbash Meinel
Cleanup and test last: |
460 |
except errors.NoSuchRevision: |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
461 |
raise errors.InvalidRevisionSpec(self.user_spec, context_branch) |
462 |
return revno, revision_id |
|
463 |
||
464 |
def _as_revision_id(self, context_branch): |
|
465 |
# We compute the revno as part of the process, but we don't really care
|
|
466 |
# about it.
|
|
467 |
revno, revision_id = self._revno_and_revision_id(context_branch, None) |
|
468 |
return revision_id |
|
3060.3.2
by Lukáš Lalinský
Make RevisionSpec_last not load the whole history. |
469 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
470 |
SPEC_TYPES.append(RevisionSpec_last) |
471 |
||
472 |
||
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
473 |
class RevisionSpec_before(RevisionSpec): |
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
474 |
"""Selects the parent of the revision specified."""
|
475 |
||
476 |
help_txt = """Selects the parent of the revision specified. |
|
2023.1.1
by ghigo
add topics help |
477 |
|
478 |
Supply any revision spec to return the parent of that revision.
|
|
479 |
It is an error to request the parent of the null revision (before:0).
|
|
480 |
This is mostly useful when inspecting revisions that are not in the
|
|
481 |
revision history of a branch.
|
|
482 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
483 |
Examples::
|
484 |
||
2023.1.1
by ghigo
add topics help |
485 |
before:1913 -> Return the parent of revno 1913 (revno 1912)
|
486 |
before:revid:aaaa@bbbb-1234567890 -> return the parent of revision
|
|
2070.4.7
by ghigo
Updates on the basis of the Richard Wilbur suggestions |
487 |
aaaa@bbbb-1234567890
|
2023.1.1
by ghigo
add topics help |
488 |
bzr diff -r before:revid:aaaa..revid:aaaa
|
489 |
-> Find the changes between revision 'aaaa' and its parent.
|
|
490 |
(what changes did 'aaaa' introduce)
|
|
491 |
"""
|
|
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
492 |
|
493 |
prefix = 'before:' |
|
494 |
||
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
495 |
def _match_on(self, branch, revs): |
496 |
r = RevisionSpec.from_string(self.spec)._match_on(branch, revs) |
|
1948.4.13
by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent |
497 |
if r.revno == 0: |
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
498 |
raise errors.InvalidRevisionSpec(self.user_spec, branch, |
1948.4.13
by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent |
499 |
'cannot go before the null: revision') |
500 |
if r.revno is None: |
|
501 |
# We need to use the repository history here
|
|
502 |
rev = branch.repository.get_revision(r.rev_id) |
|
503 |
if not rev.parent_ids: |
|
504 |
revno = 0 |
|
2598.5.10
by Aaron Bentley
Return NULL_REVISION instead of None for the null revision |
505 |
revision_id = revision.NULL_REVISION |
1948.4.13
by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent |
506 |
else: |
507 |
revision_id = rev.parent_ids[0] |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
508 |
try: |
509 |
revno = revs.index(revision_id) + 1 |
|
510 |
except ValueError: |
|
1948.4.13
by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent |
511 |
revno = None |
512 |
else: |
|
513 |
revno = r.revno - 1 |
|
514 |
try: |
|
515 |
revision_id = branch.get_rev_id(revno, revs) |
|
1948.4.26
by John Arbash Meinel
Get rid of direct imports of exceptions |
516 |
except errors.NoSuchRevision: |
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
517 |
raise errors.InvalidRevisionSpec(self.user_spec, |
1948.4.13
by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent |
518 |
branch) |
519 |
return RevisionInfo(branch, revno, revision_id) |
|
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
520 |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
521 |
def _as_revision_id(self, context_branch): |
522 |
base_revspec = RevisionSpec.from_string(self.spec) |
|
523 |
base_revision_id = base_revspec.as_revision_id(context_branch) |
|
524 |
if base_revision_id == revision.NULL_REVISION: |
|
3495.1.1
by John Arbash Meinel
Fix bug #239933, use the right exception for -c0 |
525 |
raise errors.InvalidRevisionSpec(self.user_spec, context_branch, |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
526 |
'cannot go before the null: revision') |
3298.2.10
by Aaron Bentley
Refactor partial history code |
527 |
context_repo = context_branch.repository |
528 |
context_repo.lock_read() |
|
529 |
try: |
|
530 |
parent_map = context_repo.get_parent_map([base_revision_id]) |
|
531 |
finally: |
|
532 |
context_repo.unlock() |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
533 |
if base_revision_id not in parent_map: |
534 |
# Ghost, or unknown revision id
|
|
535 |
raise errors.InvalidRevisionSpec(self.user_spec, context_branch, |
|
536 |
'cannot find the matching revision') |
|
537 |
parents = parent_map[base_revision_id] |
|
538 |
if len(parents) < 1: |
|
539 |
raise errors.InvalidRevisionSpec(self.user_spec, context_branch, |
|
540 |
'No parents for revision.') |
|
541 |
return parents[0] |
|
3060.3.5
by Lukáš Lalinský
Add support for in_branch for the remaining RevisionSpec subclasses. |
542 |
|
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
543 |
SPEC_TYPES.append(RevisionSpec_before) |
544 |
||
545 |
||
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
546 |
class RevisionSpec_tag(RevisionSpec): |
2220.2.3
by Martin Pool
Add tag: revision namespace. |
547 |
"""Select a revision identified by tag name"""
|
548 |
||
549 |
help_txt = """Selects a revision identified by a tag name. |
|
550 |
||
1551.10.34
by Aaron Bentley
Fix tag: help |
551 |
Tags are stored in the branch and created by the 'tag' command.
|
2220.2.3
by Martin Pool
Add tag: revision namespace. |
552 |
"""
|
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
553 |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
554 |
prefix = 'tag:' |
555 |
||
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
556 |
def _match_on(self, branch, revs): |
2220.2.3
by Martin Pool
Add tag: revision namespace. |
557 |
# Can raise tags not supported, NoSuchTag, etc
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
558 |
return RevisionInfo.from_revision_id(branch, |
559 |
branch.tags.lookup_tag(self.spec), |
|
560 |
revs) |
|
3060.3.5
by Lukáš Lalinský
Add support for in_branch for the remaining RevisionSpec subclasses. |
561 |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
562 |
def _as_revision_id(self, context_branch): |
563 |
return context_branch.tags.lookup_tag(self.spec) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
564 |
|
565 |
SPEC_TYPES.append(RevisionSpec_tag) |
|
566 |
||
567 |
||
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
568 |
class _RevListToTimestamps(object): |
569 |
"""This takes a list of revisions, and allows you to bisect by date"""
|
|
570 |
||
571 |
__slots__ = ['revs', 'branch'] |
|
572 |
||
1688.2.2
by Guillaume Pinot
Binary search for 'date:' revision. |
573 |
def __init__(self, revs, branch): |
574 |
self.revs = revs |
|
575 |
self.branch = branch |
|
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
576 |
|
1688.2.2
by Guillaume Pinot
Binary search for 'date:' revision. |
577 |
def __getitem__(self, index): |
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
578 |
"""Get the date of the index'd item"""
|
1688.2.2
by Guillaume Pinot
Binary search for 'date:' revision. |
579 |
r = self.branch.repository.get_revision(self.revs[index]) |
580 |
# TODO: Handle timezone.
|
|
581 |
return datetime.datetime.fromtimestamp(r.timestamp) |
|
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
582 |
|
1688.2.2
by Guillaume Pinot
Binary search for 'date:' revision. |
583 |
def __len__(self): |
584 |
return len(self.revs) |
|
585 |
||
586 |
||
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
587 |
class RevisionSpec_date(RevisionSpec): |
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
588 |
"""Selects a revision on the basis of a datestamp."""
|
589 |
||
590 |
help_txt = """Selects a revision on the basis of a datestamp. |
|
2023.1.1
by ghigo
add topics help |
591 |
|
592 |
Supply a datestamp to select the first revision that matches the date.
|
|
593 |
Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
|
|
594 |
Matches the first entry after a given date (either at midnight or
|
|
595 |
at a specified time).
|
|
596 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
597 |
One way to display all the changes since yesterday would be::
|
2666.1.5
by Ian Clatworthy
Incorporate feedback from Alex B. & James W. |
598 |
|
2023.1.1
by ghigo
add topics help |
599 |
bzr log -r date:yesterday..-1
|
600 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
601 |
Examples::
|
602 |
||
2023.1.1
by ghigo
add topics help |
603 |
date:yesterday -> select the first revision since yesterday
|
604 |
date:2006-08-14,17:10:14 -> select the first revision after
|
|
605 |
August 14th, 2006 at 5:10pm.
|
|
606 |
"""
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
607 |
prefix = 'date:' |
608 |
_date_re = re.compile( |
|
609 |
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?' |
|
610 |
r'(,|T)?\s*' |
|
611 |
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?' |
|
612 |
)
|
|
613 |
||
614 |
def _match_on(self, branch, revs): |
|
2023.1.1
by ghigo
add topics help |
615 |
"""Spec for date revisions:
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
616 |
date:value
|
617 |
value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
|
|
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
618 |
matches the first entry after a given date (either at midnight or
|
619 |
at a specified time).
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
620 |
"""
|
2070.4.3
by John Arbash Meinel
code and doc cleanup |
621 |
# XXX: This doesn't actually work
|
622 |
# So the proper way of saying 'give me all entries for today' is:
|
|
623 |
# -r date:yesterday..date:today
|
|
1185.1.39
by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters |
624 |
today = datetime.datetime.fromordinal(datetime.date.today().toordinal()) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
625 |
if self.spec.lower() == 'yesterday': |
626 |
dt = today - datetime.timedelta(days=1) |
|
627 |
elif self.spec.lower() == 'today': |
|
628 |
dt = today |
|
629 |
elif self.spec.lower() == 'tomorrow': |
|
630 |
dt = today + datetime.timedelta(days=1) |
|
631 |
else: |
|
632 |
m = self._date_re.match(self.spec) |
|
633 |
if not m or (not m.group('date') and not m.group('time')): |
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
634 |
raise errors.InvalidRevisionSpec(self.user_spec, |
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
635 |
branch, 'invalid date') |
636 |
||
637 |
try: |
|
638 |
if m.group('date'): |
|
639 |
year = int(m.group('year')) |
|
640 |
month = int(m.group('month')) |
|
641 |
day = int(m.group('day')) |
|
642 |
else: |
|
643 |
year = today.year |
|
644 |
month = today.month |
|
645 |
day = today.day |
|
646 |
||
647 |
if m.group('time'): |
|
648 |
hour = int(m.group('hour')) |
|
649 |
minute = int(m.group('minute')) |
|
650 |
if m.group('second'): |
|
651 |
second = int(m.group('second')) |
|
652 |
else: |
|
653 |
second = 0 |
|
654 |
else: |
|
655 |
hour, minute, second = 0,0,0 |
|
656 |
except ValueError: |
|
1948.4.27
by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno |
657 |
raise errors.InvalidRevisionSpec(self.user_spec, |
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
658 |
branch, 'invalid date') |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
659 |
|
660 |
dt = datetime.datetime(year=year, month=month, day=day, |
|
661 |
hour=hour, minute=minute, second=second) |
|
1704.2.27
by Martin Pool
Run bisection search for revision date with lock held. (Robert Widhopf-Frenk) |
662 |
branch.lock_read() |
663 |
try: |
|
1948.4.12
by John Arbash Meinel
Some tests for the date: spec |
664 |
rev = bisect.bisect(_RevListToTimestamps(revs, branch), dt) |
1704.2.27
by Martin Pool
Run bisection search for revision date with lock held. (Robert Widhopf-Frenk) |
665 |
finally: |
666 |
branch.unlock() |
|
1688.2.2
by Guillaume Pinot
Binary search for 'date:' revision. |
667 |
if rev == len(revs): |
3298.2.11
by Aaron Bentley
Update tests for null:, clea up slightly |
668 |
raise errors.InvalidRevisionSpec(self.user_spec, branch) |
1688.2.2
by Guillaume Pinot
Binary search for 'date:' revision. |
669 |
else: |
670 |
return RevisionInfo(branch, rev + 1) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
671 |
|
672 |
SPEC_TYPES.append(RevisionSpec_date) |
|
673 |
||
674 |
||
675 |
class RevisionSpec_ancestor(RevisionSpec): |
|
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
676 |
"""Selects a common ancestor with a second branch."""
|
677 |
||
678 |
help_txt = """Selects a common ancestor with a second branch. |
|
2023.1.1
by ghigo
add topics help |
679 |
|
680 |
Supply the path to a branch to select the common ancestor.
|
|
681 |
||
682 |
The common ancestor is the last revision that existed in both
|
|
683 |
branches. Usually this is the branch point, but it could also be
|
|
684 |
a revision that was merged.
|
|
685 |
||
686 |
This is frequently used with 'diff' to return all of the changes
|
|
687 |
that your branch introduces, while excluding the changes that you
|
|
688 |
have not merged from the remote branch.
|
|
689 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
690 |
Examples::
|
691 |
||
2023.1.1
by ghigo
add topics help |
692 |
ancestor:/path/to/branch
|
2070.4.7
by ghigo
Updates on the basis of the Richard Wilbur suggestions |
693 |
$ bzr diff -r ancestor:../../mainline/branch
|
2023.1.1
by ghigo
add topics help |
694 |
"""
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
695 |
prefix = 'ancestor:' |
696 |
||
697 |
def _match_on(self, branch, revs): |
|
1551.10.33
by Aaron Bentley
Updates from review |
698 |
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch) |
699 |
return self._find_revision_info(branch, self.spec) |
|
700 |
||
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
701 |
def _as_revision_id(self, context_branch): |
702 |
return self._find_revision_id(context_branch, self.spec) |
|
703 |
||
1551.10.33
by Aaron Bentley
Updates from review |
704 |
@staticmethod
|
705 |
def _find_revision_info(branch, other_location): |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
706 |
revision_id = RevisionSpec_ancestor._find_revision_id(branch, |
707 |
other_location) |
|
708 |
try: |
|
709 |
revno = branch.revision_id_to_revno(revision_id) |
|
710 |
except errors.NoSuchRevision: |
|
711 |
revno = None |
|
712 |
return RevisionInfo(branch, revno, revision_id) |
|
713 |
||
714 |
@staticmethod
|
|
715 |
def _find_revision_id(branch, other_location): |
|
1948.4.16
by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes |
716 |
from bzrlib.branch import Branch |
1948.4.18
by John Arbash Meinel
Update branch: spec and tests |
717 |
|
3010.1.12
by Robert Collins
Lock branches while doing revision specification lookups. |
718 |
branch.lock_read() |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
719 |
try: |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
720 |
revision_a = revision.ensure_null(branch.last_revision()) |
721 |
if revision_a == revision.NULL_REVISION: |
|
722 |
raise errors.NoCommits(branch) |
|
723 |
other_branch = Branch.open(other_location) |
|
724 |
other_branch.lock_read() |
|
725 |
try: |
|
726 |
revision_b = revision.ensure_null(other_branch.last_revision()) |
|
727 |
if revision_b == revision.NULL_REVISION: |
|
728 |
raise errors.NoCommits(other_branch) |
|
729 |
graph = branch.repository.get_graph(other_branch.repository) |
|
3010.1.12
by Robert Collins
Lock branches while doing revision specification lookups. |
730 |
rev_id = graph.find_unique_lca(revision_a, revision_b) |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
731 |
finally: |
732 |
other_branch.unlock() |
|
733 |
if rev_id == revision.NULL_REVISION: |
|
734 |
raise errors.NoCommonAncestor(revision_a, revision_b) |
|
735 |
return rev_id |
|
3010.1.12
by Robert Collins
Lock branches while doing revision specification lookups. |
736 |
finally: |
737 |
branch.unlock() |
|
1551.10.33
by Aaron Bentley
Updates from review |
738 |
|
739 |
||
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
740 |
SPEC_TYPES.append(RevisionSpec_ancestor) |
1432
by Robert Collins
branch: namespace |
741 |
|
1948.4.16
by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes |
742 |
|
1432
by Robert Collins
branch: namespace |
743 |
class RevisionSpec_branch(RevisionSpec): |
2070.4.14
by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string |
744 |
"""Selects the last revision of a specified branch."""
|
745 |
||
746 |
help_txt = """Selects the last revision of a specified branch. |
|
2023.1.1
by ghigo
add topics help |
747 |
|
748 |
Supply the path to a branch to select its last revision.
|
|
749 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
750 |
Examples::
|
751 |
||
2023.1.1
by ghigo
add topics help |
752 |
branch:/path/to/branch
|
1432
by Robert Collins
branch: namespace |
753 |
"""
|
754 |
prefix = 'branch:' |
|
755 |
||
756 |
def _match_on(self, branch, revs): |
|
1948.4.18
by John Arbash Meinel
Update branch: spec and tests |
757 |
from bzrlib.branch import Branch |
758 |
other_branch = Branch.open(self.spec) |
|
1432
by Robert Collins
branch: namespace |
759 |
revision_b = other_branch.last_revision() |
1948.4.18
by John Arbash Meinel
Update branch: spec and tests |
760 |
if revision_b in (None, revision.NULL_REVISION): |
1948.4.26
by John Arbash Meinel
Get rid of direct imports of exceptions |
761 |
raise errors.NoCommits(other_branch) |
1432
by Robert Collins
branch: namespace |
762 |
# pull in the remote revisions so we can diff
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
763 |
branch.fetch(other_branch, revision_b) |
1432
by Robert Collins
branch: namespace |
764 |
try: |
765 |
revno = branch.revision_id_to_revno(revision_b) |
|
1948.4.26
by John Arbash Meinel
Get rid of direct imports of exceptions |
766 |
except errors.NoSuchRevision: |
1432
by Robert Collins
branch: namespace |
767 |
revno = None |
768 |
return RevisionInfo(branch, revno, revision_b) |
|
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
769 |
|
770 |
def _as_revision_id(self, context_branch): |
|
771 |
from bzrlib.branch import Branch |
|
772 |
other_branch = Branch.open(self.spec) |
|
773 |
last_revision = other_branch.last_revision() |
|
774 |
last_revision = revision.ensure_null(last_revision) |
|
1551.19.33
by Aaron Bentley
Use as_revision_id for diff |
775 |
context_branch.fetch(other_branch, last_revision) |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
776 |
if last_revision == revision.NULL_REVISION: |
777 |
raise errors.NoCommits(other_branch) |
|
778 |
return last_revision |
|
779 |
||
1432
by Robert Collins
branch: namespace |
780 |
SPEC_TYPES.append(RevisionSpec_branch) |
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
781 |
|
782 |
||
1551.10.33
by Aaron Bentley
Updates from review |
783 |
class RevisionSpec_submit(RevisionSpec_ancestor): |
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
784 |
"""Selects a common ancestor with a submit branch."""
|
785 |
||
786 |
help_txt = """Selects a common ancestor with the submit branch. |
|
787 |
||
788 |
Diffing against this shows all the changes that were made in this branch,
|
|
789 |
and is a good predictor of what merge will do. The submit branch is
|
|
790 |
used by the bundle and merge directive comands. If no submit branch
|
|
791 |
is specified, the parent branch is used instead.
|
|
792 |
||
793 |
The common ancestor is the last revision that existed in both
|
|
794 |
branches. Usually this is the branch point, but it could also be
|
|
795 |
a revision that was merged.
|
|
796 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
797 |
Examples::
|
798 |
||
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
799 |
$ bzr diff -r submit:
|
800 |
"""
|
|
1551.10.33
by Aaron Bentley
Updates from review |
801 |
|
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
802 |
prefix = 'submit:' |
803 |
||
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
804 |
def _get_submit_location(self, branch): |
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
805 |
submit_location = branch.get_submit_branch() |
1551.10.35
by Aaron Bentley
Add note about which branch is selected by submit: |
806 |
location_type = 'submit branch' |
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
807 |
if submit_location is None: |
808 |
submit_location = branch.get_parent() |
|
1551.10.35
by Aaron Bentley
Add note about which branch is selected by submit: |
809 |
location_type = 'parent branch' |
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
810 |
if submit_location is None: |
811 |
raise errors.NoSubmitBranch(branch) |
|
1551.10.35
by Aaron Bentley
Add note about which branch is selected by submit: |
812 |
trace.note('Using %s %s', location_type, submit_location) |
3298.2.5
by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups. |
813 |
return submit_location |
814 |
||
815 |
def _match_on(self, branch, revs): |
|
816 |
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch) |
|
817 |
return self._find_revision_info(branch, |
|
818 |
self._get_submit_location(branch)) |
|
819 |
||
820 |
def _as_revision_id(self, context_branch): |
|
821 |
return self._find_revision_id(context_branch, |
|
822 |
self._get_submit_location(context_branch)) |
|
1551.10.33
by Aaron Bentley
Updates from review |
823 |
|
1551.10.35
by Aaron Bentley
Add note about which branch is selected by submit: |
824 |
|
1551.10.33
by Aaron Bentley
Updates from review |
825 |
SPEC_TYPES.append(RevisionSpec_submit) |