1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1
# Copyright (C) 2005 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
35
33
class RevisionInfo(object):
36
"""The results of applying a revision specification to a branch."""
38
help_txt = """The results of applying a revision specification to a branch.
34
"""The results of applying a revision specification to a branch.
40
36
An instance has two useful attributes: revno, and rev_id.
94
90
return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
95
91
self.revno, self.rev_id, self.branch)
98
def from_revision_id(branch, revision_id, revs):
99
"""Construct a RevisionInfo given just the id.
101
Use this if you don't know or care what the revno is.
104
revno = revs.index(revision_id) + 1
107
return RevisionInfo(branch, revno, revision_id)
110
94
# classes in this list should have a "prefix" attribute, against which
111
95
# string specs are matched
116
100
class RevisionSpec(object):
117
"""A parsed revision specification."""
119
help_txt = """A parsed revision specification.
101
"""A parsed revision specification.
121
103
A revision specification can be an integer, in which case it is
122
104
assumed to be a revno (though this will translate negative values
171
153
# RevisionSpec_revno is special cased, because it is the only
172
154
# one that directly handles plain integers
173
# TODO: This should not be special cased rather it should be
174
# a method invocation on spectype.canparse()
175
155
global _revno_regex
176
156
if _revno_regex is None:
177
_revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
157
_revno_regex = re.compile(r'-?\d+(:.*)?$')
178
158
if _revno_regex.match(spec) is not None:
179
159
return RevisionSpec_revno(spec, _internal=True)
259
237
class RevisionSpec_revno(RevisionSpec):
260
"""Selects a revision using a number."""
262
help_txt = """Selects a revision using a number.
264
Use an integer to specify a revision in the history of the branch.
265
Optionally a branch can be specified. The 'revno:' prefix is optional.
266
A negative number will count from the end of the branch (-1 is the
267
last revision, -2 the previous one). If the negative number is larger
268
than the branch's history, the first revision is returned.
270
revno:1 -> return the first revision
271
revno:3:/path/to/branch -> return the 3rd revision of
272
the branch '/path/to/branch'
273
revno:-1 -> The last revision in a branch.
274
-2:http://other/branch -> The second to last revision in the
276
-1000000 -> Most likely the first revision, unless
277
your history is very long.
279
238
prefix = 'revno:'
281
240
def _match_on(self, branch, revs):
298
257
revno = int(revno_spec)
301
# dotted decimal. This arguably should not be here
302
# but the from_string method is a little primitive
303
# right now - RBC 20060928
305
match_revno = tuple((int(number) for number in revno_spec.split('.')))
306
except ValueError, e:
307
raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
258
except ValueError, e:
259
raise errors.InvalidRevisionSpec(self.user_spec,
312
# the user has override the branch to look in.
313
# we need to refresh the revision_history map and
315
263
from bzrlib.branch import Branch
316
264
branch = Branch.open(branch_spec)
317
265
# Need to use a new revision history
318
266
# because we are using a specific branch
319
267
revs = branch.revision_history()
324
last_rev = branch.last_revision()
325
merge_sorted_revisions = tsort.merge_sort(
326
branch.repository.get_revision_graph(last_rev),
330
return item[3] == match_revno
331
revisions = filter(match, merge_sorted_revisions)
334
if len(revisions) != 1:
335
return RevisionInfo(branch, None, None)
270
if (-revno) >= len(revs):
337
# there is no traditional 'revno' for dotted-decimal revnos.
338
# so for API compatability we return None.
339
return RevisionInfo(branch, None, revisions[0][1])
342
# if get_rev_id supported negative revnos, there would not be a
343
# need for this special case.
344
if (-revno) >= len(revs):
347
revno = len(revs) + revno + 1
349
revision_id = branch.get_rev_id(revno, revs)
350
except errors.NoSuchRevision:
351
raise errors.InvalidRevisionSpec(self.user_spec, branch)
273
revno = len(revs) + revno + 1
275
revision_id = branch.get_rev_id(revno, revs)
276
except errors.NoSuchRevision:
277
raise errors.InvalidRevisionSpec(self.user_spec, branch)
352
278
return RevisionInfo(branch, revno, revision_id)
354
280
def needs_branch(self):
369
295
class RevisionSpec_revid(RevisionSpec):
370
"""Selects a revision using the revision id."""
372
help_txt = """Selects a revision using the revision id.
374
Supply a specific revision id, that can be used to specify any
375
revision id in the ancestry of the branch.
376
Including merges, and pending merges.
378
revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'
380
296
prefix = 'revid:'
382
298
def _match_on(self, branch, revs):
383
# self.spec comes straight from parsing the command line arguments,
384
# so we expect it to be a Unicode string. Switch it to the internal
386
revision_id = osutils.safe_revision_id(self.spec, warn=False)
387
return RevisionInfo.from_revision_id(branch, revision_id, revs)
300
revno = revs.index(self.spec) + 1
303
return RevisionInfo(branch, revno, self.spec)
389
305
SPEC_TYPES.append(RevisionSpec_revid)
392
308
class RevisionSpec_last(RevisionSpec):
393
"""Selects the nth revision from the end."""
395
help_txt = """Selects the nth revision from the end.
397
Supply a positive number to get the nth revision from the end.
398
This is the same as supplying negative numbers to the 'revno:' spec.
400
last:1 -> return the last revision
401
last:3 -> return the revision 2 before the end.
430
336
class RevisionSpec_before(RevisionSpec):
431
"""Selects the parent of the revision specified."""
433
help_txt = """Selects the parent of the revision specified.
435
Supply any revision spec to return the parent of that revision.
436
It is an error to request the parent of the null revision (before:0).
437
This is mostly useful when inspecting revisions that are not in the
438
revision history of a branch.
441
before:1913 -> Return the parent of revno 1913 (revno 1912)
442
before:revid:aaaa@bbbb-1234567890 -> return the parent of revision
444
bzr diff -r before:revid:aaaa..revid:aaaa
445
-> Find the changes between revision 'aaaa' and its parent.
446
(what changes did 'aaaa' introduce)
449
338
prefix = 'before:'
480
369
class RevisionSpec_tag(RevisionSpec):
481
"""Select a revision identified by tag name"""
483
help_txt = """Selects a revision identified by a tag name.
485
Tags are stored in the branch and created by the 'tag' command.
490
372
def _match_on(self, branch, revs):
491
# Can raise tags not supported, NoSuchTag, etc
492
return RevisionInfo.from_revision_id(branch,
493
branch.tags.lookup_tag(self.spec),
373
raise errors.InvalidRevisionSpec(self.user_spec, branch,
374
'tag: namespace registered,'
375
' but not implemented')
496
377
SPEC_TYPES.append(RevisionSpec_tag)
518
399
class RevisionSpec_date(RevisionSpec):
519
"""Selects a revision on the basis of a datestamp."""
521
help_txt = """Selects a revision on the basis of a datestamp.
523
Supply a datestamp to select the first revision that matches the date.
524
Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
525
Matches the first entry after a given date (either at midnight or
526
at a specified time).
528
One way to display all the changes since yesterday would be:
529
bzr log -r date:yesterday..-1
532
date:yesterday -> select the first revision since yesterday
533
date:2006-08-14,17:10:14 -> select the first revision after
534
August 14th, 2006 at 5:10pm.
537
401
_date_re = re.compile(
538
402
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
543
407
def _match_on(self, branch, revs):
544
"""Spec for date revisions:
409
Spec for date revisions:
546
411
value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
547
412
matches the first entry after a given date (either at midnight or
548
413
at a specified time).
415
So the proper way of saying 'give me all entries for today' is:
416
-r date:yesterday..date:today
550
# XXX: This doesn't actually work
551
# So the proper way of saying 'give me all entries for today' is:
552
# -r date:yesterday..date:today
553
418
today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
554
419
if self.spec.lower() == 'yesterday':
555
420
dt = today - datetime.timedelta(days=1)
604
469
class RevisionSpec_ancestor(RevisionSpec):
605
"""Selects a common ancestor with a second branch."""
607
help_txt = """Selects a common ancestor with a second branch.
609
Supply the path to a branch to select the common ancestor.
611
The common ancestor is the last revision that existed in both
612
branches. Usually this is the branch point, but it could also be
613
a revision that was merged.
615
This is frequently used with 'diff' to return all of the changes
616
that your branch introduces, while excluding the changes that you
617
have not merged from the remote branch.
620
ancestor:/path/to/branch
621
$ bzr diff -r ancestor:../../mainline/branch
623
470
prefix = 'ancestor:'
625
472
def _match_on(self, branch, revs):
473
from bzrlib.branch import Branch
626
475
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
627
return self._find_revision_info(branch, self.spec)
630
def _find_revision_info(branch, other_location):
631
from bzrlib.branch import Branch
633
other_branch = Branch.open(other_location)
476
other_branch = Branch.open(self.spec)
634
477
revision_a = branch.last_revision()
635
478
revision_b = other_branch.last_revision()
636
479
for r, b in ((revision_a, branch), (revision_b, other_branch)):
645
488
except errors.NoSuchRevision:
647
490
return RevisionInfo(branch, revno, rev_id)
650
492
SPEC_TYPES.append(RevisionSpec_ancestor)
653
495
class RevisionSpec_branch(RevisionSpec):
654
"""Selects the last revision of a specified branch."""
656
help_txt = """Selects the last revision of a specified branch.
658
Supply the path to a branch to select its last revision.
661
branch:/path/to/branch
496
"""A branch: revision specifier.
498
This takes the path to a branch and returns its tip revision id.
663
500
prefix = 'branch:'
677
514
return RevisionInfo(branch, revno, revision_b)
679
516
SPEC_TYPES.append(RevisionSpec_branch)
682
class RevisionSpec_submit(RevisionSpec_ancestor):
683
"""Selects a common ancestor with a submit branch."""
685
help_txt = """Selects a common ancestor with the submit branch.
687
Diffing against this shows all the changes that were made in this branch,
688
and is a good predictor of what merge will do. The submit branch is
689
used by the bundle and merge directive comands. If no submit branch
690
is specified, the parent branch is used instead.
692
The common ancestor is the last revision that existed in both
693
branches. Usually this is the branch point, but it could also be
694
a revision that was merged.
697
$ bzr diff -r submit:
702
def _match_on(self, branch, revs):
703
trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
704
submit_location = branch.get_submit_branch()
705
location_type = 'submit branch'
706
if submit_location is None:
707
submit_location = branch.get_parent()
708
location_type = 'parent branch'
709
if submit_location is None:
710
raise errors.NoSubmitBranch(branch)
711
trace.note('Using %s %s', location_type, submit_location)
712
return self._find_revision_info(branch, submit_location)
715
SPEC_TYPES.append(RevisionSpec_submit)
added
removed
bzrlib/revisionspec.py
