118
113
return RevisionInfo(branch, revno, revision_id)
116
# classes in this list should have a "prefix" attribute, against which
117
# string specs are matched
121
121
class RevisionSpec(object):
122
122
"""A parsed revision specification."""
124
124
help_txt = """A parsed revision specification.
126
A revision specification is a string, which may be unambiguous about
127
what it represents by giving a prefix like 'date:' or 'revid:' etc,
128
or it may have no prefix, in which case it's tried against several
129
specifier types in sequence to determine what the user meant.
126
A revision specification can be an integer, in which case it is
127
assumed to be a revno (though this will translate negative values
128
into positive ones); or it can be a string, in which case it is
129
parsed for something like 'date:' or 'revid:' etc.
131
131
Revision specs are an UI element, and they have been moved out
132
132
of the branch class to leave "back-end" classes unaware of such
168
160
spectype.__name__, spec)
169
161
return spectype(spec, _internal=True)
171
# Otherwise treat it as a DWIM, build the RevisionSpec object and
172
# wait for _match_on to be called.
173
return RevisionSpec_dwim(spec, _internal=True)
163
for spectype in SPEC_TYPES:
164
trace.mutter('Returning RevisionSpec %s for %s',
165
spectype.__name__, spec)
166
if spec.startswith(spectype.prefix):
167
return spectype(spec, _internal=True)
168
# RevisionSpec_revno is special cased, because it is the only
169
# one that directly handles plain integers
170
# TODO: This should not be special cased rather it should be
171
# a method invocation on spectype.canparse()
173
if _revno_regex is None:
174
_revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
175
if _revno_regex.match(spec) is not None:
176
return RevisionSpec_revno(spec, _internal=True)
178
raise errors.NoSuchRevisionSpec(spec)
175
180
def __init__(self, spec, _internal=False):
176
181
"""Create a RevisionSpec referring to the Null revision.
296
class RevisionSpec_dwim(RevisionSpec):
297
"""Provides a DWIMish revision specifier lookup.
299
Note that this does not go in the revspec_registry because by definition
300
there is no prefix to identify it. It's solely called from
301
RevisionSpec.from_string() because the DWIMification happen when _match_on
302
is called so the string describing the revision is kept here until needed.
306
# We don't need to build the revision history ourself, that's delegated to
307
# each revspec we try.
308
wants_revision_history = False
310
_revno_regex = lazy_regex.lazy_compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
312
# The revspecs to try
313
_possible_revspecs = []
315
def _try_spectype(self, rstype, branch):
316
rs = rstype(self.spec, _internal=True)
317
# Hit in_history to find out if it exists, or we need to try the
319
return rs.in_history(branch)
321
def _match_on(self, branch, revs):
322
"""Run the lookup and see what we can get."""
324
# First, see if it's a revno
325
if self._revno_regex.match(self.spec) is not None:
327
return self._try_spectype(RevisionSpec_revno, branch)
328
except RevisionSpec_revno.dwim_catchable_exceptions:
331
# Next see what has been registered
332
for objgetter in self._possible_revspecs:
333
rs_class = objgetter.get_obj()
335
return self._try_spectype(rs_class, branch)
336
except rs_class.dwim_catchable_exceptions:
339
# Try the old (deprecated) dwim list:
340
for rs_class in dwim_revspecs:
342
return self._try_spectype(rs_class, branch)
343
except rs_class.dwim_catchable_exceptions:
346
# Well, I dunno what it is. Note that we don't try to keep track of the
347
# first of last exception raised during the DWIM tries as none seems
349
raise errors.InvalidRevisionSpec(self.spec, branch)
352
def append_possible_revspec(cls, revspec):
353
"""Append a possible DWIM revspec.
355
:param revspec: Revision spec to try.
357
cls._possible_revspecs.append(registry._ObjectGetter(revspec))
360
def append_possible_lazy_revspec(cls, module_name, member_name):
361
"""Append a possible lazily loaded DWIM revspec.
363
:param module_name: Name of the module with the revspec
364
:param member_name: Name of the revspec within the module
366
cls._possible_revspecs.append(
367
registry._LazyObjectGetter(module_name, member_name))
370
294
class RevisionSpec_revno(RevisionSpec):
371
295
"""Selects a revision using a number."""
373
297
help_txt = """Selects a revision using a number.
375
299
Use an integer to specify a revision in the history of the branch.
376
Optionally a branch can be specified. A negative number will count
377
from the end of the branch (-1 is the last revision, -2 the previous
378
one). If the negative number is larger than the branch's history, the
379
first revision is returned.
300
Optionally a branch can be specified. The 'revno:' prefix is optional.
301
A negative number will count from the end of the branch (-1 is the
302
last revision, -2 the previous one). If the negative number is larger
303
than the branch's history, the first revision is returned.
382
306
revno:1 -> return the first revision of this branch
480
class RevisionIDSpec(RevisionSpec):
482
def _match_on(self, branch, revs):
483
revision_id = self.as_revision_id(branch)
484
return RevisionInfo.from_revision_id(branch, revision_id, revs)
487
class RevisionSpec_revid(RevisionIDSpec):
404
class RevisionSpec_revid(RevisionSpec):
488
405
"""Selects a revision using the revision id."""
490
407
help_txt = """Selects a revision using the revision id.
500
417
prefix = 'revid:'
502
def _as_revision_id(self, context_branch):
419
def _match_on(self, branch, revs):
503
420
# self.spec comes straight from parsing the command line arguments,
504
421
# so we expect it to be a Unicode string. Switch it to the internal
505
422
# representation.
423
revision_id = osutils.safe_revision_id(self.spec, warn=False)
424
return RevisionInfo.from_revision_id(branch, revision_id, revs)
426
def _as_revision_id(self, context_branch):
506
427
return osutils.safe_revision_id(self.spec, warn=False)
849
768
revision_b = other_branch.last_revision()
850
769
if revision_b in (None, revision.NULL_REVISION):
851
770
raise errors.NoCommits(other_branch)
853
branch = other_branch
856
# pull in the remote revisions so we can diff
857
branch.fetch(other_branch, revision_b)
858
except errors.ReadOnlyError:
859
branch = other_branch
771
# pull in the remote revisions so we can diff
772
branch.fetch(other_branch, revision_b)
861
774
revno = branch.revision_id_to_revno(revision_b)
862
775
except errors.NoSuchRevision:
933
839
self._get_submit_location(context_branch))
936
class RevisionSpec_annotate(RevisionIDSpec):
940
help_txt = """Select the revision that last modified the specified line.
942
Select the revision that last modified the specified line. Line is
943
specified as path:number. Path is a relative path to the file. Numbers
944
start at 1, and are relative to the current version, not the last-
945
committed version of the file.
948
def _raise_invalid(self, numstring, context_branch):
949
raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
950
'No such line: %s' % numstring)
952
def _as_revision_id(self, context_branch):
953
path, numstring = self.spec.rsplit(':', 1)
955
index = int(numstring) - 1
957
self._raise_invalid(numstring, context_branch)
958
tree, file_path = workingtree.WorkingTree.open_containing(path)
961
file_id = tree.path2id(file_path)
963
raise errors.InvalidRevisionSpec(self.user_spec,
964
context_branch, "File '%s' is not versioned." %
966
revision_ids = [r for (r, l) in tree.annotate_iter(file_id)]
970
revision_id = revision_ids[index]
972
self._raise_invalid(numstring, context_branch)
973
if revision_id == revision.CURRENT_REVISION:
974
raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
975
'Line %s has not been committed.' % numstring)
979
class RevisionSpec_mainline(RevisionIDSpec):
981
help_txt = """Select mainline revision that merged the specified revision.
983
Select the revision that merged the specified revision into mainline.
988
def _as_revision_id(self, context_branch):
989
revspec = RevisionSpec.from_string(self.spec)
990
if revspec.get_branch() is None:
991
spec_branch = context_branch
993
spec_branch = _mod_branch.Branch.open(revspec.get_branch())
994
revision_id = revspec.as_revision_id(spec_branch)
995
graph = context_branch.repository.get_graph()
996
result = graph.find_lefthand_merger(revision_id,
997
context_branch.last_revision())
999
raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
1003
# The order in which we want to DWIM a revision spec without any prefix.
1004
# revno is always tried first and isn't listed here, this is used by
1005
# RevisionSpec_dwim._match_on
1006
dwim_revspecs = symbol_versioning.deprecated_list(
1007
symbol_versioning.deprecated_in((2, 4, 0)), "dwim_revspecs", [])
1009
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_tag)
1010
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_revid)
1011
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_date)
1012
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_branch)
1014
842
revspec_registry = registry.Registry()
1015
843
def _register_revspec(revspec):
1016
844
revspec_registry.register(revspec.prefix, revspec)
added
removed
bzrlib/revisionspec.py
