14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
20
from .lazy_import import lazy_import
20
from bzrlib.lazy_import import lazy_import
21
21
lazy_import(globals(), """
26
branch as _mod_branch,
32
from breezy.i18n import gettext
46
39
class RevisionInfo(object):
60
53
or treat the result as a tuple.
63
def __init__(self, branch, revno=None, rev_id=None):
56
def __init__(self, branch, revno, rev_id=_marker):
64
57
self.branch = branch
65
self._has_revno = (revno is not None)
68
if self.rev_id is None and self._revno is not None:
69
60
# allow caller to be lazy
70
self.rev_id = branch.get_rev_id(self._revno)
74
if not self._has_revno and self.rev_id is not None:
76
self._revno = self.branch.revision_id_to_revno(self.rev_id)
77
except errors.NoSuchRevision:
79
self._has_revno = True
61
if self.revno is None:
64
self.rev_id = branch.get_rev_id(self.revno)
68
def __nonzero__(self):
69
# first the easy ones...
83
70
if self.rev_id is None:
72
if self.revno is not None:
85
74
# TODO: otherwise, it should depend on how I was built -
86
75
# if it's in_history(branch), then check revision_history(),
87
76
# if it's in_store(branch), do the check below
88
77
return self.branch.repository.has_revision(self.rev_id)
90
__nonzero__ = __bool__
103
90
def __eq__(self, other):
104
91
if type(other) not in (tuple, list, type(self)):
106
if isinstance(other, type(self)) and self.branch is not other.branch:
93
if type(other) is type(self) and self.branch is not other.branch:
108
95
return tuple(self) == tuple(other)
110
97
def __repr__(self):
111
return '<breezy.revisionspec.RevisionInfo object %s, %s for %r>' % (
98
return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
112
99
self.revno, self.rev_id, self.branch)
115
def from_revision_id(branch, revision_id):
102
def from_revision_id(branch, revision_id, revs):
116
103
"""Construct a RevisionInfo given just the id.
118
105
Use this if you don't know or care what the revno is.
120
return RevisionInfo(branch, revno=None, rev_id=revision_id)
107
if revision_id == revision.NULL_REVISION:
108
return RevisionInfo(branch, 0, revision_id)
110
revno = revs.index(revision_id) + 1
113
return RevisionInfo(branch, revno, revision_id)
123
119
class RevisionSpec(object):
157
154
:return: A RevisionSpec object that understands how to parse the
158
155
supplied notation.
157
if not isinstance(spec, (type(None), basestring)):
158
raise TypeError('error')
161
161
return RevisionSpec(None, _internal=True)
162
if not isinstance(spec, (str, text_type)):
163
raise TypeError("revision spec needs to be text")
164
162
match = revspec_registry.get_prefix(spec)
165
163
if match is not None:
166
164
spectype, specsuffix = match
168
166
spectype.__name__, spec)
169
167
return spectype(spec, _internal=True)
169
for spectype in SPEC_TYPES:
170
if spec.startswith(spectype.prefix):
171
trace.mutter('Returning RevisionSpec %s for %s',
172
spectype.__name__, spec)
173
return spectype(spec, _internal=True)
171
174
# Otherwise treat it as a DWIM, build the RevisionSpec object and
172
175
# wait for _match_on to be called.
173
176
return RevisionSpec_dwim(spec, _internal=True)
180
183
called directly. Only from RevisionSpec.from_string()
182
185
if not _internal:
183
raise AssertionError(
184
'Creating a RevisionSpec directly is not supported. '
185
'Use RevisionSpec.from_string() instead.')
186
symbol_versioning.warn('Creating a RevisionSpec directly has'
187
' been deprecated in version 0.11. Use'
188
' RevisionSpec.from_string()'
190
DeprecationWarning, stacklevel=2)
186
191
self.user_spec = spec
187
192
if self.prefix and spec.startswith(self.prefix):
188
193
spec = spec[len(self.prefix):]
205
210
raise errors.InvalidRevisionSpec(self.spec, branch)
207
212
def in_history(self, branch):
208
return self._match_on_and_check(branch, revs=None)
214
if self.wants_revision_history:
215
revs = branch.revision_history()
219
# this should never trigger.
220
# TODO: make it a deprecated code path. RBC 20060928
222
return self._match_on_and_check(branch, revs)
210
224
# FIXME: in_history is somewhat broken,
211
225
# it will return non-history revisions in many
300
312
"""Run the lookup and see what we can get."""
302
314
# First, see if it's a revno
303
if self._revno_regex.match(self.spec) is not None:
316
if _revno_regex is None:
317
_revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
318
if _revno_regex.match(self.spec) is not None:
305
320
return self._try_spectype(RevisionSpec_revno, branch)
306
321
except RevisionSpec_revno.dwim_catchable_exceptions:
309
324
# Next see what has been registered
310
for objgetter in self._possible_revspecs:
311
rs_class = objgetter.get_obj()
325
for rs_class in dwim_revspecs:
313
327
return self._try_spectype(rs_class, branch)
314
328
except rs_class.dwim_catchable_exceptions:
319
333
# really relevant.
320
334
raise errors.InvalidRevisionSpec(self.spec, branch)
323
def append_possible_revspec(cls, revspec):
324
"""Append a possible DWIM revspec.
326
:param revspec: Revision spec to try.
328
cls._possible_revspecs.append(registry._ObjectGetter(revspec))
331
def append_possible_lazy_revspec(cls, module_name, member_name):
332
"""Append a possible lazily loaded DWIM revspec.
334
:param module_name: Name of the module with the revspec
335
:param member_name: Name of the revspec within the module
337
cls._possible_revspecs.append(
338
registry._LazyObjectGetter(module_name, member_name))
341
337
class RevisionSpec_revno(RevisionSpec):
342
338
"""Selects a revision using a number."""
360
356
your history is very long.
362
358
prefix = 'revno:'
359
wants_revision_history = False
364
361
def _match_on(self, branch, revs):
365
362
"""Lookup a revision by revision number"""
366
branch, revno, revision_id = self._lookup(branch)
363
branch, revno, revision_id = self._lookup(branch, revs)
367
364
return RevisionInfo(branch, revno, revision_id)
369
def _lookup(self, branch):
366
def _lookup(self, branch, revs_or_none):
370
367
loc = self.spec.find(':')
372
369
revno_spec = self.spec
390
387
# right now - RBC 20060928
392
389
match_revno = tuple((int(number) for number in revno_spec.split('.')))
393
except ValueError as e:
390
except ValueError, e:
394
391
raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
399
# the user has overriden the branch to look in.
400
branch = _mod_branch.Branch.open(branch_spec)
396
# the user has override the branch to look in.
397
# we need to refresh the revision_history map and
399
from bzrlib.branch import Branch
400
branch = Branch.open(branch_spec)
420
421
revno = last_revno + revno + 1
422
revision_id = branch.get_rev_id(revno)
423
revision_id = branch.get_rev_id(revno, revs_or_none)
423
424
except errors.NoSuchRevision:
424
425
raise errors.InvalidRevisionSpec(self.user_spec, branch)
425
426
return branch, revno, revision_id
427
428
def _as_revision_id(self, context_branch):
428
429
# We would have the revno here, but we don't really care
429
branch, revno, revision_id = self._lookup(context_branch)
430
branch, revno, revision_id = self._lookup(context_branch, None)
430
431
return revision_id
432
433
def needs_branch(self):
442
443
RevisionSpec_int = RevisionSpec_revno
445
class RevisionIDSpec(RevisionSpec):
447
def _match_on(self, branch, revs):
448
revision_id = self.as_revision_id(branch)
449
return RevisionInfo.from_revision_id(branch, revision_id)
452
class RevisionSpec_revid(RevisionIDSpec):
447
class RevisionSpec_revid(RevisionSpec):
453
448
"""Selects a revision using the revision id."""
455
450
help_txt = """Selects a revision using the revision id.
465
460
prefix = 'revid:'
467
def _as_revision_id(self, context_branch):
462
def _match_on(self, branch, revs):
468
463
# self.spec comes straight from parsing the command line arguments,
469
464
# so we expect it to be a Unicode string. Switch it to the internal
470
465
# representation.
471
if isinstance(self.spec, text_type):
472
return cache_utf8.encode(self.spec)
466
revision_id = osutils.safe_revision_id(self.spec, warn=False)
467
return RevisionInfo.from_revision_id(branch, revision_id, revs)
469
def _as_revision_id(self, context_branch):
470
return osutils.safe_revision_id(self.spec, warn=False)
492
489
def _match_on(self, branch, revs):
493
revno, revision_id = self._revno_and_revision_id(branch)
490
revno, revision_id = self._revno_and_revision_id(branch, revs)
494
491
return RevisionInfo(branch, revno, revision_id)
496
def _revno_and_revision_id(self, context_branch):
493
def _revno_and_revision_id(self, context_branch, revs_or_none):
497
494
last_revno, last_revision_id = context_branch.last_revision_info()
499
496
if self.spec == '':
572
573
return RevisionInfo(branch, revno, revision_id)
574
575
def _as_revision_id(self, context_branch):
575
base_revision_id = RevisionSpec.from_string(self.spec)._as_revision_id(context_branch)
576
base_revspec = RevisionSpec.from_string(self.spec)
577
base_revision_id = base_revspec.as_revision_id(context_branch)
576
578
if base_revision_id == revision.NULL_REVISION:
577
579
raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
578
580
'cannot go before the null: revision')
608
610
def _match_on(self, branch, revs):
609
611
# Can raise tags not supported, NoSuchTag, etc
610
612
return RevisionInfo.from_revision_id(branch,
611
branch.tags.lookup_tag(self.spec))
613
branch.tags.lookup_tag(self.spec),
613
616
def _as_revision_id(self, context_branch):
614
617
return context_branch.tags.lookup_tag(self.spec)
618
621
class _RevListToTimestamps(object):
619
622
"""This takes a list of revisions, and allows you to bisect by date"""
621
__slots__ = ['branch']
624
__slots__ = ['revs', 'branch']
623
def __init__(self, branch):
626
def __init__(self, revs, branch):
624
628
self.branch = branch
626
630
def __getitem__(self, index):
627
631
"""Get the date of the index'd item"""
628
r = self.branch.repository.get_revision(self.branch.get_rev_id(index))
632
r = self.branch.repository.get_revision(self.revs[index])
629
633
# TODO: Handle timezone.
630
634
return datetime.datetime.fromtimestamp(r.timestamp)
632
636
def __len__(self):
633
return self.branch.revno()
637
return len(self.revs)
636
640
class RevisionSpec_date(RevisionSpec):
704
hour, minute, second = 0, 0, 0
708
hour, minute, second = 0,0,0
705
709
except ValueError:
706
710
raise errors.InvalidRevisionSpec(self.user_spec,
707
711
branch, 'invalid date')
709
713
dt = datetime.datetime(year=year, month=month, day=day,
710
714
hour=hour, minute=minute, second=second)
711
with branch.lock_read():
712
rev = bisect.bisect(_RevListToTimestamps(branch), dt, 1)
713
if rev == branch.revno():
717
rev = bisect.bisect(_RevListToTimestamps(revs, branch), dt)
714
721
raise errors.InvalidRevisionSpec(self.user_spec, branch)
715
return RevisionInfo(branch, rev)
723
return RevisionInfo(branch, rev + 1)
749
757
def _find_revision_info(branch, other_location):
750
758
revision_id = RevisionSpec_ancestor._find_revision_id(branch,
752
return RevisionInfo(branch, None, revision_id)
761
revno = branch.revision_id_to_revno(revision_id)
762
except errors.NoSuchRevision:
764
return RevisionInfo(branch, revno, revision_id)
755
767
def _find_revision_id(branch, other_location):
756
from .branch import Branch
768
from bzrlib.branch import Branch
758
with branch.lock_read():
759
772
revision_a = revision.ensure_null(branch.last_revision())
760
773
if revision_a == revision.NULL_REVISION:
761
774
raise errors.NoCommits(branch)
762
775
if other_location == '':
763
776
other_location = branch.get_parent()
764
777
other_branch = Branch.open(other_location)
765
with other_branch.lock_read():
778
other_branch.lock_read()
766
780
revision_b = revision.ensure_null(other_branch.last_revision())
767
781
if revision_b == revision.NULL_REVISION:
768
782
raise errors.NoCommits(other_branch)
769
783
graph = branch.repository.get_graph(other_branch.repository)
770
784
rev_id = graph.find_unique_lca(revision_a, revision_b)
786
other_branch.unlock()
771
787
if rev_id == revision.NULL_REVISION:
772
788
raise errors.NoCommonAncestor(revision_a, revision_b)
776
796
class RevisionSpec_branch(RevisionSpec):
788
808
dwim_catchable_exceptions = (errors.NotBranchError,)
790
810
def _match_on(self, branch, revs):
791
from .branch import Branch
811
from bzrlib.branch import Branch
792
812
other_branch = Branch.open(self.spec)
793
813
revision_b = other_branch.last_revision()
794
814
if revision_b in (None, revision.NULL_REVISION):
795
815
raise errors.NoCommits(other_branch)
797
branch = other_branch
800
# pull in the remote revisions so we can diff
801
branch.fetch(other_branch, revision_b)
802
except errors.ReadOnlyError:
803
branch = other_branch
804
return RevisionInfo(branch, None, revision_b)
816
# pull in the remote revisions so we can diff
817
branch.fetch(other_branch, revision_b)
819
revno = branch.revision_id_to_revno(revision_b)
820
except errors.NoSuchRevision:
822
return RevisionInfo(branch, revno, revision_b)
806
824
def _as_revision_id(self, context_branch):
807
from .branch import Branch
825
from bzrlib.branch import Branch
808
826
other_branch = Branch.open(self.spec)
809
827
last_revision = other_branch.last_revision()
810
828
last_revision = revision.ensure_null(last_revision)
873
884
self._get_submit_location(context_branch))
876
class RevisionSpec_annotate(RevisionIDSpec):
880
help_txt = """Select the revision that last modified the specified line.
882
Select the revision that last modified the specified line. Line is
883
specified as path:number. Path is a relative path to the file. Numbers
884
start at 1, and are relative to the current version, not the last-
885
committed version of the file.
888
def _raise_invalid(self, numstring, context_branch):
889
raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
890
'No such line: %s' % numstring)
892
def _as_revision_id(self, context_branch):
893
path, numstring = self.spec.rsplit(':', 1)
895
index = int(numstring) - 1
897
self._raise_invalid(numstring, context_branch)
898
tree, file_path = workingtree.WorkingTree.open_containing(path)
899
with tree.lock_read():
900
if not tree.has_filename(file_path):
901
raise errors.InvalidRevisionSpec(self.user_spec,
902
context_branch, "File '%s' is not versioned." %
904
revision_ids = [r for (r, l) in tree.annotate_iter(file_path)]
906
revision_id = revision_ids[index]
908
self._raise_invalid(numstring, context_branch)
909
if revision_id == revision.CURRENT_REVISION:
910
raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
911
'Line %s has not been committed.' % numstring)
915
class RevisionSpec_mainline(RevisionIDSpec):
917
help_txt = """Select mainline revision that merged the specified revision.
919
Select the revision that merged the specified revision into mainline.
924
def _as_revision_id(self, context_branch):
925
revspec = RevisionSpec.from_string(self.spec)
926
if revspec.get_branch() is None:
927
spec_branch = context_branch
929
spec_branch = _mod_branch.Branch.open(revspec.get_branch())
930
revision_id = revspec.as_revision_id(spec_branch)
931
graph = context_branch.repository.get_graph()
932
result = graph.find_lefthand_merger(revision_id,
933
context_branch.last_revision())
935
raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
939
887
# The order in which we want to DWIM a revision spec without any prefix.
940
888
# revno is always tried first and isn't listed here, this is used by
941
889
# RevisionSpec_dwim._match_on
942
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_tag)
943
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_revid)
944
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_date)
945
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_branch)
891
RevisionSpec_tag, # Let's try for a tag
892
RevisionSpec_revid, # Maybe it's a revid?
893
RevisionSpec_date, # Perhaps a date?
894
RevisionSpec_branch, # OK, last try, maybe it's a branch
947
898
revspec_registry = registry.Registry()
948
899
def _register_revspec(revspec):
957
908
_register_revspec(RevisionSpec_ancestor)
958
909
_register_revspec(RevisionSpec_branch)
959
910
_register_revspec(RevisionSpec_submit)
960
_register_revspec(RevisionSpec_annotate)
961
_register_revspec(RevisionSpec_mainline)
912
# classes in this list should have a "prefix" attribute, against which
913
# string specs are matched
914
SPEC_TYPES = symbol_versioning.deprecated_list(
915
symbol_versioning.deprecated_in((1, 12, 0)), "SPEC_TYPES", [])