108
def __new__(cls, spec, foo=_marker):
109
"""Parse a revision specifier.
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
143
if not isinstance(spec, (type(None), basestring)):
144
raise TypeError('error')
112
return object.__new__(RevisionSpec, spec)
119
if isinstance(spec, int):
120
return object.__new__(RevisionSpec_int, spec)
121
elif isinstance(spec, basestring):
122
for spectype in SPEC_TYPES:
123
if spec.startswith(spectype.prefix):
124
return object.__new__(spectype, spec)
126
raise BzrError('No namespace registered for string: %r' %
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)
129
raise TypeError('Unhandled revision type %s' % spec)
131
def __init__(self, spec):
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
132
185
if self.prefix and spec.startswith(self.prefix):
133
186
spec = spec[len(self.prefix):]
136
189
def _match_on(self, branch, revs):
190
trace.mutter('Returning RevisionSpec._match_on: None')
137
191
return RevisionInfo(branch, 0, None)
139
193
def _match_on_and_check(self, branch, revs):
236
def get_branch(self):
237
"""When the revision specifier contains a branch location, return it.
239
Otherwise, return None.
183
class RevisionSpec_int(RevisionSpec):
184
"""Spec is a number. Special case."""
185
def __init__(self, spec):
186
self.spec = int(spec)
188
def _match_on(self, branch, revs):
190
revno = len(revs) + self.spec + 1
193
rev_id = branch.get_rev_id(revno, revs)
194
return RevisionInfo(branch, revno, rev_id)
197
246
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.
198
266
prefix = 'revno:'
200
268
def _match_on(self, branch, revs):
201
269
"""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 (-revno) >= len(revs):
332
revno = len(revs) + revno + 1
334
revision_id = branch.get_rev_id(revno, revs)
335
except errors.NoSuchRevision:
336
raise errors.InvalidRevisionSpec(self.user_spec, branch)
337
return RevisionInfo(branch, revno, revision_id)
339
def needs_branch(self):
340
return self.spec.find(':') == -1
342
def get_branch(self):
202
343
if self.spec.find(':') == -1:
204
return RevisionInfo(branch, int(self.spec))
206
return RevisionInfo(branch, None)
208
from branch import Branch
209
revname = self.spec[self.spec.find(':')+1:]
210
other_branch = Branch.open_containing(revname)[0]
212
revno = int(self.spec[:self.spec.find(':')])
214
return RevisionInfo(other_branch, None)
215
revid = other_branch.get_rev_id(revno)
216
return RevisionInfo(other_branch, revno)
218
def needs_branch(self):
219
return self.spec.find(':') == -1
346
return self.spec[self.spec.find(':')+1:]
349
RevisionSpec_int = RevisionSpec_revno
221
351
SPEC_TYPES.append(RevisionSpec_revno)
224
354
class RevisionSpec_revid(RevisionSpec):
355
"""Selects a revision using the revision id."""
357
help_txt = """Selects a revision using the revision id.
359
Supply a specific revision id, that can be used to specify any
360
revision id in the ancestry of the branch.
361
Including merges, and pending merges.
363
revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'
225
365
prefix = 'revid:'
227
367
def _match_on(self, branch, revs):
229
return RevisionInfo(branch, revs.index(self.spec) + 1, self.spec)
369
revno = revs.index(self.spec) + 1
230
370
except ValueError:
231
return RevisionInfo(branch, None, self.spec)
372
return RevisionInfo(branch, revno, self.spec)
233
374
SPEC_TYPES.append(RevisionSpec_revid)
236
377
class RevisionSpec_last(RevisionSpec):
378
"""Selects the nth revision from the end."""
380
help_txt = """Selects the nth revision from the end.
382
Supply a positive number to get the nth revision from the end.
383
This is the same as supplying negative numbers to the 'revno:' spec.
385
last:1 -> return the last revision
386
last:3 -> return the revision 2 before the end.
240
391
def _match_on(self, branch, revs):
394
raise errors.NoCommits(branch)
395
return RevisionInfo(branch, len(revs), revs[-1])
242
398
offset = int(self.spec)
244
return RevisionInfo(branch, None)
247
raise BzrError('You must supply a positive value for --revision last:XXX')
248
return RevisionInfo(branch, len(revs) - offset + 1)
399
except ValueError, e:
400
raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
403
raise errors.InvalidRevisionSpec(self.user_spec, branch,
404
'you must supply a positive value')
405
revno = len(revs) - offset + 1
407
revision_id = branch.get_rev_id(revno, revs)
408
except errors.NoSuchRevision:
409
raise errors.InvalidRevisionSpec(self.user_spec, branch)
410
return RevisionInfo(branch, revno, revision_id)
250
412
SPEC_TYPES.append(RevisionSpec_last)
253
415
class RevisionSpec_before(RevisionSpec):
416
"""Selects the parent of the revision specified."""
418
help_txt = """Selects the parent of the revision specified.
420
Supply any revision spec to return the parent of that revision.
421
It is an error to request the parent of the null revision (before:0).
422
This is mostly useful when inspecting revisions that are not in the
423
revision history of a branch.
426
before:1913 -> Return the parent of revno 1913 (revno 1912)
427
before:revid:aaaa@bbbb-1234567890 -> return the parent of revision
429
bzr diff -r before:revid:aaaa..revid:aaaa
430
-> Find the changes between revision 'aaaa' and its parent.
431
(what changes did 'aaaa' introduce)
255
434
prefix = 'before:'
257
436
def _match_on(self, branch, revs):
258
r = RevisionSpec(self.spec)._match_on(branch, revs)
259
if (r.revno is None) or (r.revno == 0):
261
return RevisionInfo(branch, r.revno - 1)
437
r = RevisionSpec.from_string(self.spec)._match_on(branch, revs)
439
raise errors.InvalidRevisionSpec(self.user_spec, branch,
440
'cannot go before the null: revision')
442
# We need to use the repository history here
443
rev = branch.repository.get_revision(r.rev_id)
444
if not rev.parent_ids:
448
revision_id = rev.parent_ids[0]
450
revno = revs.index(revision_id) + 1
456
revision_id = branch.get_rev_id(revno, revs)
457
except errors.NoSuchRevision:
458
raise errors.InvalidRevisionSpec(self.user_spec,
460
return RevisionInfo(branch, revno, revision_id)
263
462
SPEC_TYPES.append(RevisionSpec_before)
266
465
class RevisionSpec_tag(RevisionSpec):
466
"""To be implemented."""
468
help_txt = """To be implemented."""
269
472
def _match_on(self, branch, revs):
270
raise BzrError('tag: namespace registered, but not implemented.')
473
raise errors.InvalidRevisionSpec(self.user_spec, branch,
474
'tag: namespace registered,'
475
' but not implemented')
272
477
SPEC_TYPES.append(RevisionSpec_tag)
275
class RevisionSpec_revs:
480
class _RevListToTimestamps(object):
481
"""This takes a list of revisions, and allows you to bisect by date"""
483
__slots__ = ['revs', 'branch']
276
485
def __init__(self, revs, branch):
278
487
self.branch = branch
279
489
def __getitem__(self, index):
490
"""Get the date of the index'd item"""
280
491
r = self.branch.repository.get_revision(self.revs[index])
281
492
# TODO: Handle timezone.
282
493
return datetime.datetime.fromtimestamp(r.timestamp)
283
495
def __len__(self):
284
496
return len(self.revs)
287
499
class RevisionSpec_date(RevisionSpec):
500
"""Selects a revision on the basis of a datestamp."""
502
help_txt = """Selects a revision on the basis of a datestamp.
504
Supply a datestamp to select the first revision that matches the date.
505
Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
506
Matches the first entry after a given date (either at midnight or
507
at a specified time).
509
One way to display all the changes since yesterday would be:
510
bzr log -r date:yesterday..-1
513
date:yesterday -> select the first revision since yesterday
514
date:2006-08-14,17:10:14 -> select the first revision after
515
August 14th, 2006 at 5:10pm.
289
518
_date_re = re.compile(
290
519
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
347
585
class RevisionSpec_ancestor(RevisionSpec):
586
"""Selects a common ancestor with a second branch."""
588
help_txt = """Selects a common ancestor with a second branch.
590
Supply the path to a branch to select the common ancestor.
592
The common ancestor is the last revision that existed in both
593
branches. Usually this is the branch point, but it could also be
594
a revision that was merged.
596
This is frequently used with 'diff' to return all of the changes
597
that your branch introduces, while excluding the changes that you
598
have not merged from the remote branch.
601
ancestor:/path/to/branch
602
$ bzr diff -r ancestor:../../mainline/branch
348
604
prefix = 'ancestor:'
350
606
def _match_on(self, branch, revs):
351
from branch import Branch
352
from revision import common_ancestor, MultipleRevisionSources
353
other_branch = Branch.open_containing(self.spec)[0]
607
from bzrlib.branch import Branch
609
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
610
other_branch = Branch.open(self.spec)
354
611
revision_a = branch.last_revision()
355
612
revision_b = other_branch.last_revision()
356
613
for r, b in ((revision_a, branch), (revision_b, other_branch)):
359
revision_source = MultipleRevisionSources(branch.repository,
360
other_branch.repository)
361
rev_id = common_ancestor(revision_a, revision_b, revision_source)
614
if r in (None, revision.NULL_REVISION):
615
raise errors.NoCommits(b)
616
revision_source = revision.MultipleRevisionSources(
617
branch.repository, other_branch.repository)
618
rev_id = revision.common_ancestor(revision_a, revision_b,
363
621
revno = branch.revision_id_to_revno(rev_id)
364
except NoSuchRevision:
622
except errors.NoSuchRevision:
366
624
return RevisionInfo(branch, revno, rev_id)
368
626
SPEC_TYPES.append(RevisionSpec_ancestor)
370
629
class RevisionSpec_branch(RevisionSpec):
371
"""A branch: revision specifier.
373
This takes the path to a branch and returns its tip revision id.
630
"""Selects the last revision of a specified branch."""
632
help_txt = """Selects the last revision of a specified branch.
634
Supply the path to a branch to select its last revision.
637
branch:/path/to/branch
375
639
prefix = 'branch:'
377
641
def _match_on(self, branch, revs):
378
from branch import Branch
379
other_branch = Branch.open_containing(self.spec)[0]
642
from bzrlib.branch import Branch
643
other_branch = Branch.open(self.spec)
380
644
revision_b = other_branch.last_revision()
381
if revision_b is None:
382
raise NoCommits(other_branch)
645
if revision_b in (None, revision.NULL_REVISION):
646
raise errors.NoCommits(other_branch)
383
647
# pull in the remote revisions so we can diff
384
648
branch.fetch(other_branch, revision_b)
386
650
revno = branch.revision_id_to_revno(revision_b)
387
except NoSuchRevision:
651
except errors.NoSuchRevision:
389
653
return RevisionInfo(branch, revno, revision_b)
added
removed
bzrlib/revisionspec.py
