1
# Copyright (C) 2005 Canonical Ltd
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.
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.
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
33
class RevisionInfo(object):
34
"""The results of applying a revision specification to a branch.
36
An instance has two useful attributes: revno, and rev_id.
38
They can also be accessed as spec[0] and spec[1] respectively,
39
so that you can write code like:
40
revno, rev_id = RevisionSpec(branch, spec)
41
although this is probably going to be deprecated later.
43
This class exists mostly to be the return value of a RevisionSpec,
44
so that you can access the member you're interested in (number or id)
45
or treat the result as a tuple.
48
def __init__(self, branch, revno, rev_id=_marker):
52
# allow caller to be lazy
53
if self.revno is None:
56
self.rev_id = branch.get_rev_id(self.revno)
60
def __nonzero__(self):
61
# first the easy ones...
62
if self.rev_id is None:
64
if self.revno is not None:
66
# TODO: otherwise, it should depend on how I was built -
67
# if it's in_history(branch), then check revision_history(),
68
# if it's in_store(branch), do the check below
69
return self.branch.repository.has_revision(self.rev_id)
74
def __getitem__(self, index):
75
if index == 0: return self.revno
76
if index == 1: return self.rev_id
77
raise IndexError(index)
80
return self.branch.repository.get_revision(self.rev_id)
82
def __eq__(self, other):
83
if type(other) not in (tuple, list, type(self)):
85
if type(other) is type(self) and self.branch is not other.branch:
87
return tuple(self) == tuple(other)
90
return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
91
self.revno, self.rev_id, self.branch)
94
# classes in this list should have a "prefix" attribute, against which
95
# string specs are matched
100
class RevisionSpec(object):
101
"""A parsed revision specification.
103
A revision specification can be an integer, in which case it is
104
assumed to be a revno (though this will translate negative values
105
into positive ones); or it can be a string, in which case it is
106
parsed for something like 'date:' or 'revid:' etc.
108
Revision specs are an UI element, and they have been moved out
109
of the branch class to leave "back-end" classes unaware of such
110
details. Code that gets a revno or rev_id from other code should
111
not be using revision specs - revnos and revision ids are the
112
accepted ways to refer to revisions internally.
114
(Equivalent to the old Branch method get_revision_info())
119
def __new__(cls, spec, _internal=False):
121
return object.__new__(cls, spec, _internal=_internal)
123
symbol_versioning.warn('Creating a RevisionSpec directly has'
124
' been deprecated in version 0.11. Use'
125
' RevisionSpec.from_string()'
127
DeprecationWarning, stacklevel=2)
128
return RevisionSpec.from_string(spec)
131
def from_string(spec):
132
"""Parse a revision spec string into a RevisionSpec object.
134
:param spec: A string specified by the user
135
:return: A RevisionSpec object that understands how to parse the
138
if not isinstance(spec, (type(None), basestring)):
139
raise TypeError('error')
142
return RevisionSpec(None, _internal=True)
144
assert isinstance(spec, basestring), \
145
"You should only supply strings not %s" % (type(spec),)
147
for spectype in SPEC_TYPES:
148
if spec.startswith(spectype.prefix):
149
trace.mutter('Returning RevisionSpec %s for %s',
150
spectype.__name__, spec)
151
return spectype(spec, _internal=True)
153
# RevisionSpec_revno is special cased, because it is the only
154
# one that directly handles plain integers
156
if _revno_regex is None:
157
_revno_regex = re.compile(r'-?\d+(:.*)?$')
158
if _revno_regex.match(spec) is not None:
159
return RevisionSpec_revno(spec, _internal=True)
161
raise errors.NoSuchRevisionSpec(spec)
163
def __init__(self, spec, _internal=False):
164
"""Create a RevisionSpec referring to the Null revision.
166
:param spec: The original spec supplied by the user
167
:param _internal: Used to ensure that RevisionSpec is not being
168
called directly. Only from RevisionSpec.from_string()
171
# XXX: Update this after 0.10 is released
172
symbol_versioning.warn('Creating a RevisionSpec directly has'
173
' been deprecated in version 0.11. Use'
174
' RevisionSpec.from_string()'
176
DeprecationWarning, stacklevel=2)
177
self.user_spec = spec
178
if self.prefix and spec.startswith(self.prefix):
179
spec = spec[len(self.prefix):]
182
def _match_on(self, branch, revs):
183
trace.mutter('Returning RevisionSpec._match_on: None')
184
return RevisionInfo(branch, 0, None)
186
def _match_on_and_check(self, branch, revs):
187
info = self._match_on(branch, revs)
190
elif info == (0, None):
191
# special case - the empty tree
194
raise errors.InvalidRevisionSpec(self.user_spec, branch)
196
raise errors.InvalidRevisionSpec(self.spec, branch)
198
def in_history(self, branch):
200
revs = branch.revision_history()
203
return self._match_on_and_check(branch, revs)
205
# FIXME: in_history is somewhat broken,
206
# it will return non-history revisions in many
207
# circumstances. The expected facility is that
208
# in_history only returns revision-history revs,
209
# in_store returns any rev. RBC 20051010
210
# aliases for now, when we fix the core logic, then they
211
# will do what you expect.
212
in_store = in_history
216
# this is mostly for helping with testing
217
return '<%s %s>' % (self.__class__.__name__,
220
def needs_branch(self):
221
"""Whether this revision spec needs a branch.
223
Set this to False the branch argument of _match_on is not used.
230
class RevisionSpec_revno(RevisionSpec):
233
def _match_on(self, branch, revs):
234
"""Lookup a revision by revision number"""
235
loc = self.spec.find(':')
237
revno_spec = self.spec
240
revno_spec = self.spec[:loc]
241
branch_spec = self.spec[loc+1:]
245
raise errors.InvalidRevisionSpec(self.user_spec,
246
branch, 'cannot have an empty revno and no branch')
250
revno = int(revno_spec)
251
except ValueError, e:
252
raise errors.InvalidRevisionSpec(self.user_spec,
256
from bzrlib.branch import Branch
257
branch = Branch.open(branch_spec)
258
# Need to use a new revision history
259
# because we are using a specific branch
260
revs = branch.revision_history()
263
if (-revno) >= len(revs):
266
revno = len(revs) + revno + 1
268
revision_id = branch.get_rev_id(revno, revs)
269
except errors.NoSuchRevision:
270
raise errors.InvalidRevisionSpec(self.user_spec, branch)
271
return RevisionInfo(branch, revno, revision_id)
273
def needs_branch(self):
274
return self.spec.find(':') == -1
277
RevisionSpec_int = RevisionSpec_revno
279
SPEC_TYPES.append(RevisionSpec_revno)
282
class RevisionSpec_revid(RevisionSpec):
285
def _match_on(self, branch, revs):
287
revno = revs.index(self.spec) + 1
290
return RevisionInfo(branch, revno, self.spec)
292
SPEC_TYPES.append(RevisionSpec_revid)
295
class RevisionSpec_last(RevisionSpec):
299
def _match_on(self, branch, revs):
302
raise errors.NoCommits(branch)
303
return RevisionInfo(branch, len(revs), revs[-1])
306
offset = int(self.spec)
307
except ValueError, e:
308
raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
311
raise errors.InvalidRevisionSpec(self.user_spec, branch,
312
'you must supply a positive value')
313
revno = len(revs) - offset + 1
315
revision_id = branch.get_rev_id(revno, revs)
316
except errors.NoSuchRevision:
317
raise errors.InvalidRevisionSpec(self.user_spec, branch)
318
return RevisionInfo(branch, revno, revision_id)
320
SPEC_TYPES.append(RevisionSpec_last)
323
class RevisionSpec_before(RevisionSpec):
327
def _match_on(self, branch, revs):
328
r = RevisionSpec.from_string(self.spec)._match_on(branch, revs)
330
raise errors.InvalidRevisionSpec(self.user_spec, branch,
331
'cannot go before the null: revision')
333
# We need to use the repository history here
334
rev = branch.repository.get_revision(r.rev_id)
335
if not rev.parent_ids:
339
revision_id = rev.parent_ids[0]
341
revno = revs.index(revision_id) + 1
347
revision_id = branch.get_rev_id(revno, revs)
348
except errors.NoSuchRevision:
349
raise errors.InvalidRevisionSpec(self.user_spec,
351
return RevisionInfo(branch, revno, revision_id)
353
SPEC_TYPES.append(RevisionSpec_before)
356
class RevisionSpec_tag(RevisionSpec):
359
def _match_on(self, branch, revs):
360
raise errors.InvalidRevisionSpec(self.user_spec, branch,
361
'tag: namespace registered,'
362
' but not implemented')
364
SPEC_TYPES.append(RevisionSpec_tag)
367
class _RevListToTimestamps(object):
368
"""This takes a list of revisions, and allows you to bisect by date"""
370
__slots__ = ['revs', 'branch']
372
def __init__(self, revs, branch):
376
def __getitem__(self, index):
377
"""Get the date of the index'd item"""
378
r = self.branch.repository.get_revision(self.revs[index])
379
# TODO: Handle timezone.
380
return datetime.datetime.fromtimestamp(r.timestamp)
383
return len(self.revs)
386
class RevisionSpec_date(RevisionSpec):
388
_date_re = re.compile(
389
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
391
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
394
def _match_on(self, branch, revs):
396
Spec for date revisions:
398
value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
399
matches the first entry after a given date (either at midnight or
400
at a specified time).
402
So the proper way of saying 'give me all entries for today' is:
403
-r date:yesterday..date:today
405
today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
406
if self.spec.lower() == 'yesterday':
407
dt = today - datetime.timedelta(days=1)
408
elif self.spec.lower() == 'today':
410
elif self.spec.lower() == 'tomorrow':
411
dt = today + datetime.timedelta(days=1)
413
m = self._date_re.match(self.spec)
414
if not m or (not m.group('date') and not m.group('time')):
415
raise errors.InvalidRevisionSpec(self.user_spec,
416
branch, 'invalid date')
420
year = int(m.group('year'))
421
month = int(m.group('month'))
422
day = int(m.group('day'))
429
hour = int(m.group('hour'))
430
minute = int(m.group('minute'))
431
if m.group('second'):
432
second = int(m.group('second'))
436
hour, minute, second = 0,0,0
438
raise errors.InvalidRevisionSpec(self.user_spec,
439
branch, 'invalid date')
441
dt = datetime.datetime(year=year, month=month, day=day,
442
hour=hour, minute=minute, second=second)
445
rev = bisect.bisect(_RevListToTimestamps(revs, branch), dt)
449
return RevisionInfo(branch, None)
451
return RevisionInfo(branch, rev + 1)
453
SPEC_TYPES.append(RevisionSpec_date)
456
class RevisionSpec_ancestor(RevisionSpec):
459
def _match_on(self, branch, revs):
460
from bzrlib.branch import Branch
462
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
463
other_branch = Branch.open(self.spec)
464
revision_a = branch.last_revision()
465
revision_b = other_branch.last_revision()
466
for r, b in ((revision_a, branch), (revision_b, other_branch)):
467
if r in (None, revision.NULL_REVISION):
468
raise errors.NoCommits(b)
469
revision_source = revision.MultipleRevisionSources(
470
branch.repository, other_branch.repository)
471
rev_id = revision.common_ancestor(revision_a, revision_b,
474
revno = branch.revision_id_to_revno(rev_id)
475
except errors.NoSuchRevision:
477
return RevisionInfo(branch, revno, rev_id)
479
SPEC_TYPES.append(RevisionSpec_ancestor)
482
class RevisionSpec_branch(RevisionSpec):
483
"""A branch: revision specifier.
485
This takes the path to a branch and returns its tip revision id.
489
def _match_on(self, branch, revs):
490
from bzrlib.branch import Branch
491
other_branch = Branch.open(self.spec)
492
revision_b = other_branch.last_revision()
493
if revision_b in (None, revision.NULL_REVISION):
494
raise errors.NoCommits(other_branch)
495
# pull in the remote revisions so we can diff
496
branch.fetch(other_branch, revision_b)
498
revno = branch.revision_id_to_revno(revision_b)
499
except errors.NoSuchRevision:
501
return RevisionInfo(branch, revno, revision_b)
503
SPEC_TYPES.append(RevisionSpec_branch)
added
removed
bzrlib/revisionspec.py
