124
def __new__(cls, spec, _internal=False):
126
return object.__new__(cls, spec, _internal=_internal)
128
symbol_versioning.warn('Creating a RevisionSpec directly has'
129
' been deprecated in version 0.11. Use'
130
' RevisionSpec.from_string()'
132
DeprecationWarning, stacklevel=2)
133
return RevisionSpec.from_string(spec)
136
def from_string(spec):
137
"""Parse a revision spec string into a RevisionSpec object.
139
:param spec: A string specified by the user
140
:return: A RevisionSpec object that understands how to parse the
107
def __new__(cls, spec, foo=_marker):
108
"""Parse a revision specifier.
143
if not isinstance(spec, (type(None), basestring)):
144
raise TypeError('error')
147
return RevisionSpec(None, _internal=True)
149
assert isinstance(spec, basestring), \
150
"You should only supply strings not %s" % (type(spec),)
152
for spectype in SPEC_TYPES:
153
if spec.startswith(spectype.prefix):
154
trace.mutter('Returning RevisionSpec %s for %s',
155
spectype.__name__, spec)
156
return spectype(spec, _internal=True)
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' %
158
# RevisionSpec_revno is special cased, because it is the only
159
# one that directly handles plain integers
160
# TODO: This should not be special cased rather it should be
161
# a method invocation on spectype.canparse()
163
if _revno_regex is None:
164
_revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
165
if _revno_regex.match(spec) is not None:
166
return RevisionSpec_revno(spec, _internal=True)
168
raise errors.NoSuchRevisionSpec(spec)
170
def __init__(self, spec, _internal=False):
171
"""Create a RevisionSpec referring to the Null revision.
173
:param spec: The original spec supplied by the user
174
:param _internal: Used to ensure that RevisionSpec is not being
175
called directly. Only from RevisionSpec.from_string()
178
# XXX: Update this after 0.10 is released
179
symbol_versioning.warn('Creating a RevisionSpec directly has'
180
' been deprecated in version 0.11. Use'
181
' RevisionSpec.from_string()'
183
DeprecationWarning, stacklevel=2)
184
self.user_spec = spec
128
raise TypeError('Unhandled revision type %s' % spec)
130
def __init__(self, spec):
185
131
if self.prefix and spec.startswith(self.prefix):
186
132
spec = spec[len(self.prefix):]
189
135
def _match_on(self, branch, revs):
190
trace.mutter('Returning RevisionSpec._match_on: None')
191
136
return RevisionInfo(branch, 0, None)
193
138
def _match_on_and_check(self, branch, revs):
198
143
# special case - the empty tree
200
145
elif self.prefix:
201
raise errors.InvalidRevisionSpec(self.user_spec, branch)
146
raise NoSuchRevision(branch, self.prefix + str(self.spec))
203
raise errors.InvalidRevisionSpec(self.spec, branch)
148
raise NoSuchRevision(branch, str(self.spec))
205
150
def in_history(self, branch):
207
revs = branch.revision_history()
209
# this should never trigger.
210
# TODO: make it a deprecated code path. RBC 20060928
151
revs = branch.revision_history()
212
152
return self._match_on_and_check(branch, revs)
214
# FIXME: in_history is somewhat broken,
215
# it will return non-history revisions in many
216
# circumstances. The expected facility is that
217
# in_history only returns revision-history revs,
218
# in_store returns any rev. RBC 20051010
219
# aliases for now, when we fix the core logic, then they
220
# will do what you expect.
221
in_store = in_history
224
154
def __repr__(self):
225
155
# this is mostly for helping with testing
226
return '<%s %s>' % (self.__class__.__name__,
229
def needs_branch(self):
230
"""Whether this revision spec needs a branch.
232
Set this to False the branch argument of _match_on is not used.
236
def get_branch(self):
237
"""When the revision specifier contains a branch location, return it.
239
Otherwise, return None.
156
return '<%s %s%s>' % (self.__class__.__name__,
163
class RevisionSpec_int(RevisionSpec):
164
"""Spec is a number. Special case."""
165
def __init__(self, spec):
166
self.spec = int(spec)
168
def _match_on(self, branch, revs):
170
revno = len(revs) + self.spec + 1
173
rev_id = branch.get_rev_id(revno, revs)
174
return RevisionInfo(branch, revno, rev_id)
246
177
class RevisionSpec_revno(RevisionSpec):
247
"""Selects a revision using a number."""
249
help_txt = """Selects a revision using a number.
251
Use an integer to specify a revision in the history of the branch.
252
Optionally a branch can be specified. The 'revno:' prefix is optional.
253
A negative number will count from the end of the branch (-1 is the
254
last revision, -2 the previous one). If the negative number is larger
255
than the branch's history, the first revision is returned.
257
revno:1 -> return the first revision
258
revno:3:/path/to/branch -> return the 3rd revision of
259
the branch '/path/to/branch'
260
revno:-1 -> The last revision in a branch.
261
-2:http://other/branch -> The second to last revision in the
263
-1000000 -> Most likely the first revision, unless
264
your history is very long.
266
178
prefix = 'revno:'
268
180
def _match_on(self, branch, revs):
269
181
"""Lookup a revision by revision number"""
270
loc = self.spec.find(':')
272
revno_spec = self.spec
275
revno_spec = self.spec[:loc]
276
branch_spec = self.spec[loc+1:]
280
raise errors.InvalidRevisionSpec(self.user_spec,
281
branch, 'cannot have an empty revno and no branch')
285
revno = int(revno_spec)
288
# dotted decimal. This arguably should not be here
289
# but the from_string method is a little primitive
290
# right now - RBC 20060928
292
match_revno = tuple((int(number) for number in revno_spec.split('.')))
293
except ValueError, e:
294
raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
299
# the user has override the branch to look in.
300
# we need to refresh the revision_history map and
302
from bzrlib.branch import Branch
303
branch = Branch.open(branch_spec)
304
# Need to use a new revision history
305
# because we are using a specific branch
306
revs = branch.revision_history()
311
last_rev = branch.last_revision()
312
merge_sorted_revisions = tsort.merge_sort(
313
branch.repository.get_revision_graph(last_rev),
317
return item[3] == match_revno
318
revisions = filter(match, merge_sorted_revisions)
321
if len(revisions) != 1:
322
return RevisionInfo(branch, None, None)
324
# there is no traditional 'revno' for dotted-decimal revnos.
325
# so for API compatability we return None.
326
return RevisionInfo(branch, None, revisions[0][1])
329
# if get_rev_id supported negative revnos, there would not be a
330
# need for this special case.
331
if (-revno) >= len(revs):
334
revno = len(revs) + revno + 1
336
revision_id = branch.get_rev_id(revno, revs)
337
except errors.NoSuchRevision:
338
raise errors.InvalidRevisionSpec(self.user_spec, branch)
339
return RevisionInfo(branch, revno, revision_id)
341
def needs_branch(self):
342
return self.spec.find(':') == -1
344
def get_branch(self):
345
if self.spec.find(':') == -1:
348
return self.spec[self.spec.find(':')+1:]
351
RevisionSpec_int = RevisionSpec_revno
183
return RevisionInfo(branch, int(self.spec))
185
return RevisionInfo(branch, None)
353
187
SPEC_TYPES.append(RevisionSpec_revno)
356
190
class RevisionSpec_revid(RevisionSpec):
357
"""Selects a revision using the revision id."""
359
help_txt = """Selects a revision using the revision id.
361
Supply a specific revision id, that can be used to specify any
362
revision id in the ancestry of the branch.
363
Including merges, and pending merges.
365
revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'
367
191
prefix = 'revid:'
369
193
def _match_on(self, branch, revs):
371
revno = revs.index(self.spec) + 1
195
return RevisionInfo(branch, revs.index(self.spec) + 1, self.spec)
372
196
except ValueError:
374
return RevisionInfo(branch, revno, self.spec)
197
return RevisionInfo(branch, None)
376
199
SPEC_TYPES.append(RevisionSpec_revid)
379
202
class RevisionSpec_last(RevisionSpec):
380
"""Selects the nth revision from the end."""
382
help_txt = """Selects the nth revision from the end.
384
Supply a positive number to get the nth revision from the end.
385
This is the same as supplying negative numbers to the 'revno:' spec.
387
last:1 -> return the last revision
388
last:3 -> return the revision 2 before the end.
393
206
def _match_on(self, branch, revs):
396
raise errors.NoCommits(branch)
397
return RevisionInfo(branch, len(revs), revs[-1])
400
208
offset = int(self.spec)
401
except ValueError, e:
402
raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
405
raise errors.InvalidRevisionSpec(self.user_spec, branch,
406
'you must supply a positive value')
407
revno = len(revs) - offset + 1
409
revision_id = branch.get_rev_id(revno, revs)
410
except errors.NoSuchRevision:
411
raise errors.InvalidRevisionSpec(self.user_spec, branch)
412
return RevisionInfo(branch, revno, revision_id)
210
return RevisionInfo(branch, None)
213
raise BzrError('You must supply a positive value for --revision last:XXX')
214
return RevisionInfo(branch, len(revs) - offset + 1)
414
216
SPEC_TYPES.append(RevisionSpec_last)
417
219
class RevisionSpec_before(RevisionSpec):
418
"""Selects the parent of the revision specified."""
420
help_txt = """Selects the parent of the revision specified.
422
Supply any revision spec to return the parent of that revision.
423
It is an error to request the parent of the null revision (before:0).
424
This is mostly useful when inspecting revisions that are not in the
425
revision history of a branch.
428
before:1913 -> Return the parent of revno 1913 (revno 1912)
429
before:revid:aaaa@bbbb-1234567890 -> return the parent of revision
431
bzr diff -r before:revid:aaaa..revid:aaaa
432
-> Find the changes between revision 'aaaa' and its parent.
433
(what changes did 'aaaa' introduce)
436
221
prefix = 'before:'
438
223
def _match_on(self, branch, revs):
439
r = RevisionSpec.from_string(self.spec)._match_on(branch, revs)
441
raise errors.InvalidRevisionSpec(self.user_spec, branch,
442
'cannot go before the null: revision')
444
# We need to use the repository history here
445
rev = branch.repository.get_revision(r.rev_id)
446
if not rev.parent_ids:
450
revision_id = rev.parent_ids[0]
452
revno = revs.index(revision_id) + 1
458
revision_id = branch.get_rev_id(revno, revs)
459
except errors.NoSuchRevision:
460
raise errors.InvalidRevisionSpec(self.user_spec,
462
return RevisionInfo(branch, revno, revision_id)
224
r = RevisionSpec(self.spec)._match_on(branch, revs)
225
if (r.revno is None) or (r.revno == 0):
227
return RevisionInfo(branch, r.revno - 1)
464
229
SPEC_TYPES.append(RevisionSpec_before)
467
232
class RevisionSpec_tag(RevisionSpec):
468
"""To be implemented."""
470
help_txt = """To be implemented."""
474
235
def _match_on(self, branch, revs):
475
raise errors.InvalidRevisionSpec(self.user_spec, branch,
476
'tag: namespace registered,'
477
' but not implemented')
236
raise BzrError('tag: namespace registered, but not implemented.')
479
238
SPEC_TYPES.append(RevisionSpec_tag)
482
class _RevListToTimestamps(object):
483
"""This takes a list of revisions, and allows you to bisect by date"""
485
__slots__ = ['revs', 'branch']
487
def __init__(self, revs, branch):
491
def __getitem__(self, index):
492
"""Get the date of the index'd item"""
493
r = self.branch.repository.get_revision(self.revs[index])
494
# TODO: Handle timezone.
495
return datetime.datetime.fromtimestamp(r.timestamp)
498
return len(self.revs)
501
241
class RevisionSpec_date(RevisionSpec):
502
"""Selects a revision on the basis of a datestamp."""
504
help_txt = """Selects a revision on the basis of a datestamp.
506
Supply a datestamp to select the first revision that matches the date.
507
Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
508
Matches the first entry after a given date (either at midnight or
509
at a specified time).
511
One way to display all the changes since yesterday would be:
512
bzr log -r date:yesterday..-1
515
date:yesterday -> select the first revision since yesterday
516
date:2006-08-14,17:10:14 -> select the first revision after
517
August 14th, 2006 at 5:10pm.
520
243
_date_re = re.compile(
521
244
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
544
268
m = self._date_re.match(self.spec)
545
269
if not m or (not m.group('date') and not m.group('time')):
546
raise errors.InvalidRevisionSpec(self.user_spec,
547
branch, 'invalid date')
551
year = int(m.group('year'))
552
month = int(m.group('month'))
553
day = int(m.group('day'))
560
hour = int(m.group('hour'))
561
minute = int(m.group('minute'))
562
if m.group('second'):
563
second = int(m.group('second'))
567
hour, minute, second = 0,0,0
569
raise errors.InvalidRevisionSpec(self.user_spec,
570
branch, 'invalid date')
270
raise BzrError('Invalid revision date %r' % self.spec)
273
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
275
year, month, day = today.year, today.month, today.day
277
hour = int(m.group('hour'))
278
minute = int(m.group('minute'))
279
if m.group('second'):
280
second = int(m.group('second'))
284
hour, minute, second = 0,0,0
572
286
dt = datetime.datetime(year=year, month=month, day=day,
573
287
hour=hour, minute=minute, second=second)
576
rev = bisect.bisect(_RevListToTimestamps(revs, branch), dt)
580
return RevisionInfo(branch, None)
582
return RevisionInfo(branch, rev + 1)
289
for i in range(len(revs)):
290
r = branch.get_revision(revs[i])
291
# TODO: Handle timezone.
292
dt = datetime.datetime.fromtimestamp(r.timestamp)
294
return RevisionInfo(branch, i+1)
295
return RevisionInfo(branch, None)
584
297
SPEC_TYPES.append(RevisionSpec_date)
587
300
class RevisionSpec_ancestor(RevisionSpec):
588
"""Selects a common ancestor with a second branch."""
590
help_txt = """Selects a common ancestor with a second branch.
592
Supply the path to a branch to select the common ancestor.
594
The common ancestor is the last revision that existed in both
595
branches. Usually this is the branch point, but it could also be
596
a revision that was merged.
598
This is frequently used with 'diff' to return all of the changes
599
that your branch introduces, while excluding the changes that you
600
have not merged from the remote branch.
603
ancestor:/path/to/branch
604
$ bzr diff -r ancestor:../../mainline/branch
606
301
prefix = 'ancestor:'
608
303
def _match_on(self, branch, revs):
609
from bzrlib.branch import Branch
611
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
612
other_branch = Branch.open(self.spec)
304
from branch import Branch
305
from revision import common_ancestor, MultipleRevisionSources
306
other_branch = Branch.open_containing(self.spec)
613
307
revision_a = branch.last_revision()
614
308
revision_b = other_branch.last_revision()
615
309
for r, b in ((revision_a, branch), (revision_b, other_branch)):
616
if r in (None, revision.NULL_REVISION):
617
raise errors.NoCommits(b)
618
revision_source = revision.MultipleRevisionSources(
619
branch.repository, other_branch.repository)
620
rev_id = revision.common_ancestor(revision_a, revision_b,
312
revision_source = MultipleRevisionSources(branch, other_branch)
313
rev_id = common_ancestor(revision_a, revision_b, revision_source)
623
315
revno = branch.revision_id_to_revno(rev_id)
624
except errors.NoSuchRevision:
316
except NoSuchRevision:
626
318
return RevisionInfo(branch, revno, rev_id)
628
320
SPEC_TYPES.append(RevisionSpec_ancestor)
631
class RevisionSpec_branch(RevisionSpec):
632
"""Selects the last revision of a specified branch."""
634
help_txt = """Selects the last revision of a specified branch.
636
Supply the path to a branch to select its last revision.
639
branch:/path/to/branch
643
def _match_on(self, branch, revs):
644
from bzrlib.branch import Branch
645
other_branch = Branch.open(self.spec)
646
revision_b = other_branch.last_revision()
647
if revision_b in (None, revision.NULL_REVISION):
648
raise errors.NoCommits(other_branch)
649
# pull in the remote revisions so we can diff
650
branch.fetch(other_branch, revision_b)
652
revno = branch.revision_id_to_revno(revision_b)
653
except errors.NoSuchRevision:
655
return RevisionInfo(branch, revno, revision_b)
657
SPEC_TYPES.append(RevisionSpec_branch)
added
removed
bzrlib/revisionspec.py
