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
20
from bzrlib.errors import BzrError, NoSuchRevision, NoCommits
24
class RevisionInfo(object):
25
"""The results of applying a revision specification to a branch.
27
An instance has two useful attributes: revno, and rev_id.
29
They can also be accessed as spec[0] and spec[1] respectively,
30
so that you can write code like:
31
revno, rev_id = RevisionSpec(branch, spec)
32
although this is probably going to be deprecated later.
34
This class exists mostly to be the return value of a RevisionSpec,
35
so that you can access the member you're interested in (number or id)
36
or treat the result as a tuple.
39
def __init__(self, branch, revno, rev_id=_marker):
43
# allow caller to be lazy
44
if self.revno is None:
47
self.rev_id = branch.get_rev_id(self.revno)
51
def __nonzero__(self):
52
# first the easy ones...
53
if self.rev_id is None:
55
if self.revno is not None:
57
# TODO: otherwise, it should depend on how I was built -
58
# if it's in_history(branch), then check revision_history(),
59
# if it's in_store(branch), do the check below
60
return self.branch.repository.has_revision(self.rev_id)
65
def __getitem__(self, index):
66
if index == 0: return self.revno
67
if index == 1: return self.rev_id
68
raise IndexError(index)
71
return self.branch.repository.get_revision(self.rev_id)
73
def __eq__(self, other):
74
if type(other) not in (tuple, list, type(self)):
76
if type(other) is type(self) and self.branch is not other.branch:
78
return tuple(self) == tuple(other)
81
return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
82
self.revno, self.rev_id, self.branch)
84
# classes in this list should have a "prefix" attribute, against which
85
# string specs are matched
88
class RevisionSpec(object):
89
"""A parsed revision specification.
91
A revision specification can be an integer, in which case it is
92
assumed to be a revno (though this will translate negative values
93
into positive ones); or it can be a string, in which case it is
94
parsed for something like 'date:' or 'revid:' etc.
96
Revision specs are an UI element, and they have been moved out
97
of the branch class to leave "back-end" classes unaware of such
98
details. Code that gets a revno or rev_id from other code should
99
not be using revision specs - revnos and revision ids are the
100
accepted ways to refer to revisions internally.
102
(Equivalent to the old Branch method get_revision_info())
107
def __new__(cls, spec, foo=_marker):
108
"""Parse a revision specifier.
111
return object.__new__(RevisionSpec, spec)
118
if isinstance(spec, int):
119
return object.__new__(RevisionSpec_int, spec)
120
elif isinstance(spec, basestring):
121
for spectype in SPEC_TYPES:
122
if spec.startswith(spectype.prefix):
123
return object.__new__(spectype, spec)
125
raise BzrError('No namespace registered for string: %r' %
128
raise TypeError('Unhandled revision type %s' % spec)
130
def __init__(self, spec):
131
if self.prefix and spec.startswith(self.prefix):
132
spec = spec[len(self.prefix):]
135
def _match_on(self, branch, revs):
136
return RevisionInfo(branch, 0, None)
138
def _match_on_and_check(self, branch, revs):
139
info = self._match_on(branch, revs)
142
elif info == (0, None):
143
# special case - the empty tree
146
raise NoSuchRevision(branch, self.prefix + str(self.spec))
148
raise NoSuchRevision(branch, str(self.spec))
150
def in_history(self, branch):
151
revs = branch.revision_history()
152
return self._match_on_and_check(branch, revs)
154
# FIXME: in_history is somewhat broken,
155
# it will return non-history revisions in many
156
# circumstances. The expected facility is that
157
# in_history only returns revision-history revs,
158
# in_store returns any rev. RBC 20051010
159
# aliases for now, when we fix the core logic, then they
160
# will do what you expect.
161
in_store = in_history
165
# this is mostly for helping with testing
166
return '<%s %s%s>' % (self.__class__.__name__,
173
class RevisionSpec_int(RevisionSpec):
174
"""Spec is a number. Special case."""
175
def __init__(self, spec):
176
self.spec = int(spec)
178
def _match_on(self, branch, revs):
180
revno = len(revs) + self.spec + 1
183
rev_id = branch.get_rev_id(revno, revs)
184
return RevisionInfo(branch, revno, rev_id)
187
class RevisionSpec_revno(RevisionSpec):
190
def _match_on(self, branch, revs):
191
"""Lookup a revision by revision number"""
193
return RevisionInfo(branch, int(self.spec))
195
return RevisionInfo(branch, None)
197
SPEC_TYPES.append(RevisionSpec_revno)
200
class RevisionSpec_revid(RevisionSpec):
203
def _match_on(self, branch, revs):
205
return RevisionInfo(branch, revs.index(self.spec) + 1, self.spec)
207
return RevisionInfo(branch, None, self.spec)
209
SPEC_TYPES.append(RevisionSpec_revid)
212
class RevisionSpec_last(RevisionSpec):
216
def _match_on(self, branch, revs):
218
offset = int(self.spec)
220
return RevisionInfo(branch, None)
223
raise BzrError('You must supply a positive value for --revision last:XXX')
224
return RevisionInfo(branch, len(revs) - offset + 1)
226
SPEC_TYPES.append(RevisionSpec_last)
229
class RevisionSpec_before(RevisionSpec):
233
def _match_on(self, branch, revs):
234
r = RevisionSpec(self.spec)._match_on(branch, revs)
235
if (r.revno is None) or (r.revno == 0):
237
return RevisionInfo(branch, r.revno - 1)
239
SPEC_TYPES.append(RevisionSpec_before)
242
class RevisionSpec_tag(RevisionSpec):
245
def _match_on(self, branch, revs):
246
raise BzrError('tag: namespace registered, but not implemented.')
248
SPEC_TYPES.append(RevisionSpec_tag)
251
class RevisionSpec_date(RevisionSpec):
253
_date_re = re.compile(
254
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
256
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
259
def _match_on(self, branch, revs):
261
Spec for date revisions:
263
value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
264
matches the first entry after a given date (either at midnight or
265
at a specified time).
267
So the proper way of saying 'give me all entries for today' is:
268
-r date:today..date:tomorrow
270
today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
271
if self.spec.lower() == 'yesterday':
272
dt = today - datetime.timedelta(days=1)
273
elif self.spec.lower() == 'today':
275
elif self.spec.lower() == 'tomorrow':
276
dt = today + datetime.timedelta(days=1)
278
m = self._date_re.match(self.spec)
279
if not m or (not m.group('date') and not m.group('time')):
280
raise BzrError('Invalid revision date %r' % self.spec)
283
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
285
year, month, day = today.year, today.month, today.day
287
hour = int(m.group('hour'))
288
minute = int(m.group('minute'))
289
if m.group('second'):
290
second = int(m.group('second'))
294
hour, minute, second = 0,0,0
296
dt = datetime.datetime(year=year, month=month, day=day,
297
hour=hour, minute=minute, second=second)
299
for i in range(len(revs)):
300
r = branch.repository.get_revision(revs[i])
301
# TODO: Handle timezone.
302
dt = datetime.datetime.fromtimestamp(r.timestamp)
304
return RevisionInfo(branch, i+1)
305
return RevisionInfo(branch, None)
307
SPEC_TYPES.append(RevisionSpec_date)
310
class RevisionSpec_ancestor(RevisionSpec):
313
def _match_on(self, branch, revs):
314
from branch import Branch
315
from revision import common_ancestor, MultipleRevisionSources
316
other_branch = Branch.open_containing(self.spec)[0]
317
revision_a = branch.last_revision()
318
revision_b = other_branch.last_revision()
319
for r, b in ((revision_a, branch), (revision_b, other_branch)):
322
revision_source = MultipleRevisionSources(branch.repository,
323
other_branch.repository)
324
rev_id = common_ancestor(revision_a, revision_b, revision_source)
326
revno = branch.revision_id_to_revno(rev_id)
327
except NoSuchRevision:
329
return RevisionInfo(branch, revno, rev_id)
331
SPEC_TYPES.append(RevisionSpec_ancestor)
333
class RevisionSpec_branch(RevisionSpec):
334
"""A branch: revision specifier.
336
This takes the path to a branch and returns its tip revision id.
340
def _match_on(self, branch, revs):
341
from branch import Branch
342
from fetch import greedy_fetch
343
other_branch = Branch.open_containing(self.spec)[0]
344
revision_b = other_branch.last_revision()
345
if revision_b is None:
346
raise NoCommits(other_branch)
347
# pull in the remote revisions so we can diff
348
greedy_fetch(branch, other_branch, revision=revision_b)
350
revno = branch.revision_id_to_revno(revision_b)
351
except NoSuchRevision:
353
return RevisionInfo(branch, revno, revision_b)
355
SPEC_TYPES.append(RevisionSpec_branch)
added
removed
bzrlib/revisionspec.py
