~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
16
17
3224.5.31 by Andrew Bennetts
A couple more lazy imports, helps 'bzr log --line -r -1' a little.
18
from bzrlib.lazy_import import lazy_import
19
lazy_import(globals(), """
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
20
import bisect
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
21
import datetime
5671.1.2 by Jelmer Vernooij
Lazy load gzip (we don't use it when doing 2a), remove some unused imports.
22
23
from bzrlib import (
5365.6.4 by Aaron Bentley
Implement mainline revision spec.
24
    branch as _mod_branch,
2325.2.5 by Marien Zwart
Call osutils.safe_revision_id instead of duplicating it.
25
    osutils,
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
26
    revision,
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
27
    symbol_versioning,
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
28
    workingtree,
29
    )
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
30
from bzrlib.i18n import gettext
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
31
""")
32
33
from bzrlib import (
34
    errors,
5685.1.2 by Jelmer Vernooij
Merge bzr.dev.
35
    lazy_regex,
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
36
    registry,
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
37
    trace,
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
38
    )
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
39
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
40
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
41
class RevisionInfo(object):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
42
    """The results of applying a revision specification to a branch."""
43
44
    help_txt = """The results of applying a revision specification to a branch.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
45
46
    An instance has two useful attributes: revno, and rev_id.
47
48
    They can also be accessed as spec[0] and spec[1] respectively,
49
    so that you can write code like:
50
    revno, rev_id = RevisionSpec(branch, spec)
51
    although this is probably going to be deprecated later.
52
53
    This class exists mostly to be the return value of a RevisionSpec,
54
    so that you can access the member you're interested in (number or id)
55
    or treat the result as a tuple.
56
    """
57
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
58
    def __init__(self, branch, revno=None, rev_id=None):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
59
        self.branch = branch
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
60
        self._has_revno = (revno is not None)
61
        self._revno = revno
62
        self.rev_id = rev_id
63
        if self.rev_id is None and self._revno is not None:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
64
            # allow caller to be lazy
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
65
            self.rev_id = branch.get_rev_id(self._revno)
66
67
    @property
68
    def revno(self):
69
        if not self._has_revno and self.rev_id is not None:
70
            try:
71
                self._revno = self.branch.revision_id_to_revno(self.rev_id)
72
            except errors.NoSuchRevision:
73
                self._revno = None
74
            self._has_revno = True
75
        return self._revno
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
76
77
    def __nonzero__(self):
78
        # first the easy ones...
79
        if self.rev_id is None:
80
            return False
81
        if self.revno is not None:
82
            return True
83
        # TODO: otherwise, it should depend on how I was built -
84
        # if it's in_history(branch), then check revision_history(),
85
        # if it's in_store(branch), do the check below
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
86
        return self.branch.repository.has_revision(self.rev_id)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
87
88
    def __len__(self):
89
        return 2
90
91
    def __getitem__(self, index):
92
        if index == 0: return self.revno
93
        if index == 1: return self.rev_id
94
        raise IndexError(index)
95
96
    def get(self):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
97
        return self.branch.repository.get_revision(self.rev_id)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
98
99
    def __eq__(self, other):
100
        if type(other) not in (tuple, list, type(self)):
101
            return False
102
        if type(other) is type(self) and self.branch is not other.branch:
103
            return False
104
        return tuple(self) == tuple(other)
105
106
    def __repr__(self):
107
        return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
108
            self.revno, self.rev_id, self.branch)
109
2220.2.3 by Martin Pool
Add tag: revision namespace.
110
    @staticmethod
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
111
    def from_revision_id(branch, revision_id, revs=symbol_versioning.DEPRECATED_PARAMETER):
2220.2.3 by Martin Pool
Add tag: revision namespace.
112
        """Construct a RevisionInfo given just the id.
113
114
        Use this if you don't know or care what the revno is.
115
        """
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
116
        if symbol_versioning.deprecated_passed(revs):
117
            symbol_versioning.warn(
118
                'RevisionInfo.from_revision_id(revs) was deprecated in 2.5.',
119
                DeprecationWarning,
120
                stacklevel=2)
121
        return RevisionInfo(branch, revno=None, rev_id=revision_id)
2220.2.3 by Martin Pool
Add tag: revision namespace.
122
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
123
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
124
class RevisionSpec(object):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
125
    """A parsed revision specification."""
126
127
    help_txt = """A parsed revision specification.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
128
4569.2.3 by Matthew Fuller
Adjust the help test for the RevisionSpec class a bit to describe the
129
    A revision specification is a string, which may be unambiguous about
130
    what it represents by giving a prefix like 'date:' or 'revid:' etc,
131
    or it may have no prefix, in which case it's tried against several
132
    specifier types in sequence to determine what the user meant.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
133
134
    Revision specs are an UI element, and they have been moved out
135
    of the branch class to leave "back-end" classes unaware of such
136
    details.  Code that gets a revno or rev_id from other code should
137
    not be using revision specs - revnos and revision ids are the
138
    accepted ways to refer to revisions internally.
139
140
    (Equivalent to the old Branch method get_revision_info())
141
    """
142
143
    prefix = None
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
144
    # wants_revision_history has been deprecated in 2.5.
145
    wants_revision_history = False
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
146
    dwim_catchable_exceptions = (errors.InvalidRevisionSpec,)
4569.2.21 by Vincent Ladeuil
Fix some typos.
147
    """Exceptions that RevisionSpec_dwim._match_on will catch.
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
148
4569.2.21 by Vincent Ladeuil
Fix some typos.
149
    If the revspec is part of ``dwim_revspecs``, it may be tried with an
150
    invalid revspec and raises some exception. The exceptions mentioned here
151
    will not be reported to the user but simply ignored without stopping the
152
    dwim processing.
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
153
    """
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
154
155
    @staticmethod
156
    def from_string(spec):
157
        """Parse a revision spec string into a RevisionSpec object.
158
159
        :param spec: A string specified by the user
160
        :return: A RevisionSpec object that understands how to parse the
161
            supplied notation.
162
        """
163
        if not isinstance(spec, (type(None), basestring)):
164
            raise TypeError('error')
165
166
        if spec is None:
167
            return RevisionSpec(None, _internal=True)
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
168
        match = revspec_registry.get_prefix(spec)
169
        if match is not None:
170
            spectype, specsuffix = match
171
            trace.mutter('Returning RevisionSpec %s for %s',
172
                         spectype.__name__, spec)
173
            return spectype(spec, _internal=True)
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
174
        else:
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
175
            # Otherwise treat it as a DWIM, build the RevisionSpec object and
176
            # wait for _match_on to be called.
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
177
            return RevisionSpec_dwim(spec, _internal=True)
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
178
179
    def __init__(self, spec, _internal=False):
180
        """Create a RevisionSpec referring to the Null revision.
181
182
        :param spec: The original spec supplied by the user
183
        :param _internal: Used to ensure that RevisionSpec is not being
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
184
            called directly. Only from RevisionSpec.from_string()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
185
        """
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
186
        if not _internal:
187
            symbol_versioning.warn('Creating a RevisionSpec directly has'
188
                                   ' been deprecated in version 0.11. Use'
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
189
                                   ' RevisionSpec.from_string()'
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
190
                                   ' instead.',
191
                                   DeprecationWarning, stacklevel=2)
192
        self.user_spec = spec
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
193
        if self.prefix and spec.startswith(self.prefix):
194
            spec = spec[len(self.prefix):]
195
        self.spec = spec
196
197
    def _match_on(self, branch, revs):
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
198
        trace.mutter('Returning RevisionSpec._match_on: None')
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
199
        return RevisionInfo(branch, None, None)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
200
201
    def _match_on_and_check(self, branch, revs):
202
        info = self._match_on(branch, revs)
203
        if info:
204
            return info
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
205
        elif info == (None, None):
206
            # special case - nothing supplied
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
207
            return info
208
        elif self.prefix:
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
209
            raise errors.InvalidRevisionSpec(self.user_spec, branch)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
210
        else:
1948.4.2 by John Arbash Meinel
Update _match_on_and_check to raise the right error
211
            raise errors.InvalidRevisionSpec(self.spec, branch)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
212
213
    def in_history(self, branch):
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
214
        if branch:
3460.1.1 by John Arbash Meinel
Change the RevisionSpec_revno so that it doesn't need to grab the revision_history first.
215
            if self.wants_revision_history:
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
216
                symbol_versioning.warn(
217
                    "RevisionSpec.wants_revision_history was "
218
                    "deprecated in 2.5 (%s)." % self.__class__.__name__,
219
                    DeprecationWarning)
6165.4.23 by Jelmer Vernooij
Fix tests.
220
                branch.lock_read()
221
                try:
222
                    graph = branch.repository.get_graph()
223
                    revs = list(graph.iter_lefthand_ancestry(
224
                        branch.last_revision(), [revision.NULL_REVISION]))
225
                finally:
226
                    branch.unlock()
227
                revs.reverse()
3460.1.1 by John Arbash Meinel
Change the RevisionSpec_revno so that it doesn't need to grab the revision_history first.
228
            else:
229
                revs = None
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
230
        else:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
231
            # this should never trigger.
232
            # TODO: make it a deprecated code path. RBC 20060928
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
233
            revs = None
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
234
        return self._match_on_and_check(branch, revs)
235
1432 by Robert Collins
branch: namespace
236
        # FIXME: in_history is somewhat broken,
237
        # it will return non-history revisions in many
238
        # circumstances. The expected facility is that
239
        # in_history only returns revision-history revs,
240
        # in_store returns any rev. RBC 20051010
241
    # aliases for now, when we fix the core logic, then they
242
    # will do what you expect.
243
    in_store = in_history
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
244
    in_branch = in_store
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
245
3298.2.4 by John Arbash Meinel
Introduce as_revision_id() as a function instead of in_branch(need_revno=False)
246
    def as_revision_id(self, context_branch):
247
        """Return just the revision_id for this revisions spec.
248
249
        Some revision specs require a context_branch to be able to determine
250
        their value. Not all specs will make use of it.
251
        """
252
        return self._as_revision_id(context_branch)
253
254
    def _as_revision_id(self, context_branch):
255
        """Implementation of as_revision_id()
256
257
        Classes should override this function to provide appropriate
258
        functionality. The default is to just call '.in_history().rev_id'
259
        """
260
        return self.in_history(context_branch).rev_id
261
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
262
    def as_tree(self, context_branch):
263
        """Return the tree object for this revisions spec.
264
265
        Some revision specs require a context_branch to be able to determine
266
        the revision id and access the repository. Not all specs will make
267
        use of it.
268
        """
269
        return self._as_tree(context_branch)
270
271
    def _as_tree(self, context_branch):
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
272
        """Implementation of as_tree().
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
273
274
        Classes should override this function to provide appropriate
275
        functionality. The default is to just call '.as_revision_id()'
276
        and get the revision tree from context_branch's repository.
277
        """
278
        revision_id = self.as_revision_id(context_branch)
279
        return context_branch.repository.revision_tree(revision_id)
280
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
281
    def __repr__(self):
282
        # this is mostly for helping with testing
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
283
        return '<%s %s>' % (self.__class__.__name__,
284
                              self.user_spec)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
285
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
286
    def needs_branch(self):
287
        """Whether this revision spec needs a branch.
288
1711.2.99 by John Arbash Meinel
minor typo fix
289
        Set this to False the branch argument of _match_on is not used.
290
        """
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
291
        return True
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
292
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
293
    def get_branch(self):
294
        """When the revision specifier contains a branch location, return it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
295
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
296
        Otherwise, return None.
297
        """
298
        return None
299
1907.4.9 by Matthieu Moy
missing newline
300
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
301
# private API
302
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
303
class RevisionSpec_dwim(RevisionSpec):
304
    """Provides a DWIMish revision specifier lookup.
305
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
306
    Note that this does not go in the revspec_registry because by definition
307
    there is no prefix to identify it.  It's solely called from
308
    RevisionSpec.from_string() because the DWIMification happen when _match_on
309
    is called so the string describing the revision is kept here until needed.
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
310
    """
311
312
    help_txt = None
313
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
314
    _revno_regex = lazy_regex.lazy_compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
315
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
316
    # The revspecs to try
317
    _possible_revspecs = []
318
4569.2.19 by Vincent Ladeuil
A bit more tweaks.
319
    def _try_spectype(self, rstype, branch):
320
        rs = rstype(self.spec, _internal=True)
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
321
        # Hit in_history to find out if it exists, or we need to try the
322
        # next type.
323
        return rs.in_history(branch)
324
325
    def _match_on(self, branch, revs):
326
        """Run the lookup and see what we can get."""
327
328
        # First, see if it's a revno
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
329
        if self._revno_regex.match(self.spec) is not None:
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
330
            try:
4569.2.19 by Vincent Ladeuil
A bit more tweaks.
331
                return self._try_spectype(RevisionSpec_revno, branch)
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
332
            except RevisionSpec_revno.dwim_catchable_exceptions:
333
                pass
334
335
        # Next see what has been registered
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
336
        for objgetter in self._possible_revspecs:
337
            rs_class = objgetter.get_obj()
338
            try:
339
                return self._try_spectype(rs_class, branch)
340
            except rs_class.dwim_catchable_exceptions:
341
                pass
342
343
        # Try the old (deprecated) dwim list:
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
344
        for rs_class in dwim_revspecs:
345
            try:
4569.2.19 by Vincent Ladeuil
A bit more tweaks.
346
                return self._try_spectype(rs_class, branch)
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
347
            except rs_class.dwim_catchable_exceptions:
348
                pass
349
350
        # Well, I dunno what it is. Note that we don't try to keep track of the
351
        # first of last exception raised during the DWIM tries as none seems
352
        # really relevant.
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
353
        raise errors.InvalidRevisionSpec(self.spec, branch)
354
5671.5.3 by Jelmer Vernooij
Fix test.. not sure how I missed this.
355
    @classmethod
356
    def append_possible_revspec(cls, revspec):
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
357
        """Append a possible DWIM revspec.
358
359
        :param revspec: Revision spec to try.
360
        """
5671.5.3 by Jelmer Vernooij
Fix test.. not sure how I missed this.
361
        cls._possible_revspecs.append(registry._ObjectGetter(revspec))
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
362
5671.5.3 by Jelmer Vernooij
Fix test.. not sure how I missed this.
363
    @classmethod
364
    def append_possible_lazy_revspec(cls, module_name, member_name):
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
365
        """Append a possible lazily loaded DWIM revspec.
366
367
        :param module_name: Name of the module with the revspec
368
        :param member_name: Name of the revspec within the module
369
        """
5671.5.3 by Jelmer Vernooij
Fix test.. not sure how I missed this.
370
        cls._possible_revspecs.append(
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
371
            registry._LazyObjectGetter(module_name, member_name))
372
4569.2.1 by Matthew Fuller
Implement a DWIM revspec type and use it to allow simpler user
373
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
374
class RevisionSpec_revno(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
375
    """Selects a revision using a number."""
376
377
    help_txt = """Selects a revision using a number.
2023.1.1 by ghigo
add topics help
378
379
    Use an integer to specify a revision in the history of the branch.
4569.2.5 by Matthew Fuller
Update online documentation to match new DWIM behavior.
380
    Optionally a branch can be specified.  A negative number will count
381
    from the end of the branch (-1 is the last revision, -2 the previous
382
    one). If the negative number is larger than the branch's history, the
383
    first revision is returned.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
384
    Examples::
385
3651.2.1 by Daniel Clemente
Clarify that you don't have to write a path if you mean the current branch
386
      revno:1                   -> return the first revision of this branch
2023.1.1 by ghigo
add topics help
387
      revno:3:/path/to/branch   -> return the 3rd revision of
388
                                   the branch '/path/to/branch'
389
      revno:-1                  -> The last revision in a branch.
390
      -2:http://other/branch    -> The second to last revision in the
391
                                   remote branch.
392
      -1000000                  -> Most likely the first revision, unless
393
                                   your history is very long.
394
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
395
    prefix = 'revno:'
396
397
    def _match_on(self, branch, revs):
398
        """Lookup a revision by revision number"""
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
399
        branch, revno, revision_id = self._lookup(branch)
3298.2.6 by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id()
400
        return RevisionInfo(branch, revno, revision_id)
401
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
402
    def _lookup(self, branch):
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
403
        loc = self.spec.find(':')
404
        if loc == -1:
405
            revno_spec = self.spec
406
            branch_spec = None
407
        else:
408
            revno_spec = self.spec[:loc]
409
            branch_spec = self.spec[loc+1:]
410
411
        if revno_spec == '':
1948.4.6 by John Arbash Meinel
A small bugfix, and more tests for revno:
412
            if not branch_spec:
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
413
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.5 by John Arbash Meinel
Fix tests for negative entries, and add tests for revno:
414
                        branch, 'cannot have an empty revno and no branch')
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
415
            revno = None
416
        else:
417
            try:
418
                revno = int(revno_spec)
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
419
                dotted = False
420
            except ValueError:
421
                # dotted decimal. This arguably should not be here
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
422
                # but the from_string method is a little primitive
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
423
                # right now - RBC 20060928
424
                try:
425
                    match_revno = tuple((int(number) for number in revno_spec.split('.')))
426
                except ValueError, e:
427
                    raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
428
429
                dotted = True
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
430
1948.4.6 by John Arbash Meinel
A small bugfix, and more tests for revno:
431
        if branch_spec:
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
432
            # the user has overriden the branch to look in.
433
            branch = _mod_branch.Branch.open(branch_spec)
1948.4.22 by John Arbash Meinel
Refactor common code from integer revno handlers
434
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
435
        if dotted:
436
            try:
3949.2.6 by Ian Clatworthy
review feedback from jam
437
                revision_id = branch.dotted_revno_to_revision_id(match_revno,
438
                    _cache_reverse=True)
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
439
            except errors.NoSuchRevision:
3872.2.2 by Marius Kruger
* use NULL_REVISION in stead of None for rev_id
440
                raise errors.InvalidRevisionSpec(self.user_spec, branch)
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
441
            else:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
442
                # there is no traditional 'revno' for dotted-decimal revnos.
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
443
                # so for API compatibility we return None.
3949.2.6 by Ian Clatworthy
review feedback from jam
444
                return branch, None, revision_id
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
445
        else:
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
446
            last_revno, last_revision_id = branch.last_revision_info()
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
447
            if revno < 0:
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
448
                # if get_rev_id supported negative revnos, there would not be a
449
                # need for this special case.
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
450
                if (-revno) >= last_revno:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
451
                    revno = 1
452
                else:
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
453
                    revno = last_revno + revno + 1
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
454
            try:
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
455
                revision_id = branch.get_rev_id(revno)
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
456
            except errors.NoSuchRevision:
457
                raise errors.InvalidRevisionSpec(self.user_spec, branch)
3298.2.6 by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id()
458
        return branch, revno, revision_id
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
459
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
460
    def _as_revision_id(self, context_branch):
461
        # We would have the revno here, but we don't really care
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
462
        branch, revno, revision_id = self._lookup(context_branch)
3298.2.6 by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id()
463
        return revision_id
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
464
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
465
    def needs_branch(self):
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
466
        return self.spec.find(':') == -1
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
467
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
468
    def get_branch(self):
469
        if self.spec.find(':') == -1:
470
            return None
471
        else:
472
            return self.spec[self.spec.find(':')+1:]
473
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
474
# Old compatibility
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
475
RevisionSpec_int = RevisionSpec_revno
476
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
477
5365.6.4 by Aaron Bentley
Implement mainline revision spec.
478
class RevisionIDSpec(RevisionSpec):
479
480
    def _match_on(self, branch, revs):
481
        revision_id = self.as_revision_id(branch)
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
482
        return RevisionInfo.from_revision_id(branch, revision_id)
5365.6.4 by Aaron Bentley
Implement mainline revision spec.
483
484
485
class RevisionSpec_revid(RevisionIDSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
486
    """Selects a revision using the revision id."""
487
488
    help_txt = """Selects a revision using the revision id.
2023.1.1 by ghigo
add topics help
489
490
    Supply a specific revision id, that can be used to specify any
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
491
    revision id in the ancestry of the branch.
2023.1.1 by ghigo
add topics help
492
    Including merges, and pending merges.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
493
    Examples::
494
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
495
      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
496
    """
497
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
498
    prefix = 'revid:'
499
5365.6.4 by Aaron Bentley
Implement mainline revision spec.
500
    def _as_revision_id(self, context_branch):
2325.2.5 by Marien Zwart
Call osutils.safe_revision_id instead of duplicating it.
501
        # self.spec comes straight from parsing the command line arguments,
502
        # so we expect it to be a Unicode string. Switch it to the internal
503
        # representation.
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
504
        return osutils.safe_revision_id(self.spec, warn=False)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
505
506
507
508
class RevisionSpec_last(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
509
    """Selects the nth revision from the end."""
510
511
    help_txt = """Selects the nth revision from the end.
2023.1.1 by ghigo
add topics help
512
513
    Supply a positive number to get the nth revision from the end.
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
514
    This is the same as supplying negative numbers to the 'revno:' spec.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
515
    Examples::
516
2023.1.1 by ghigo
add topics help
517
      last:1        -> return the last revision
518
      last:3        -> return the revision 2 before the end.
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
519
    """
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
520
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
521
    prefix = 'last:'
522
523
    def _match_on(self, branch, revs):
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
524
        revno, revision_id = self._revno_and_revision_id(branch)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
525
        return RevisionInfo(branch, revno, revision_id)
526
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
527
    def _revno_and_revision_id(self, context_branch):
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
528
        last_revno, last_revision_id = context_branch.last_revision_info()
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
529
1948.4.9 by John Arbash Meinel
Cleanup and test last:
530
        if self.spec == '':
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
531
            if not last_revno:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
532
                raise errors.NoCommits(context_branch)
533
            return last_revno, last_revision_id
1948.4.9 by John Arbash Meinel
Cleanup and test last:
534
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
535
        try:
536
            offset = int(self.spec)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
537
        except ValueError, e:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
538
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch, e)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
539
540
        if offset <= 0:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
541
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
1948.4.9 by John Arbash Meinel
Cleanup and test last:
542
                                             'you must supply a positive value')
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
543
544
        revno = last_revno - offset + 1
1948.4.9 by John Arbash Meinel
Cleanup and test last:
545
        try:
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
546
            revision_id = context_branch.get_rev_id(revno)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
547
        except errors.NoSuchRevision:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
548
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
549
        return revno, revision_id
550
551
    def _as_revision_id(self, context_branch):
552
        # We compute the revno as part of the process, but we don't really care
553
        # about it.
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
554
        revno, revision_id = self._revno_and_revision_id(context_branch)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
555
        return revision_id
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
556
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
557
558
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
559
class RevisionSpec_before(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
560
    """Selects the parent of the revision specified."""
561
562
    help_txt = """Selects the parent of the revision specified.
2023.1.1 by ghigo
add topics help
563
3651.2.4 by Daniel Clemente
Reordered to put explanation first and exceptions after
564
    Supply any revision spec to return the parent of that revision.  This is
565
    mostly useful when inspecting revisions that are not in the revision history
566
    of a branch.
567
2023.1.1 by ghigo
add topics help
568
    It is an error to request the parent of the null revision (before:0).
569
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
570
    Examples::
571
2023.1.1 by ghigo
add topics help
572
      before:1913    -> Return the parent of revno 1913 (revno 1912)
573
      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
574
                                            aaaa@bbbb-1234567890
3651.2.5 by Daniel Clemente
Wrote specifical and simpler example for 'before:', and referred to 'bzr diff -c'
575
      bzr diff -r before:1913..1913
576
            -> Find the changes between revision 1913 and its parent (1912).
577
               (What changes did revision 1913 introduce).
578
               This is equivalent to:  bzr diff -c 1913
2023.1.1 by ghigo
add topics help
579
    """
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
580
581
    prefix = 'before:'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
582
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
583
    def _match_on(self, branch, revs):
584
        r = RevisionSpec.from_string(self.spec)._match_on(branch, revs)
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
585
        if r.revno == 0:
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
586
            raise errors.InvalidRevisionSpec(self.user_spec, branch,
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
587
                                         'cannot go before the null: revision')
588
        if r.revno is None:
589
            # We need to use the repository history here
590
            rev = branch.repository.get_revision(r.rev_id)
591
            if not rev.parent_ids:
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
592
                revision_id = revision.NULL_REVISION
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
593
            else:
594
                revision_id = rev.parent_ids[0]
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
595
            revno = None
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
596
        else:
597
            revno = r.revno - 1
598
            try:
599
                revision_id = branch.get_rev_id(revno, revs)
1948.4.26 by John Arbash Meinel
Get rid of direct imports of exceptions
600
            except errors.NoSuchRevision:
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
601
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
602
                                                 branch)
603
        return RevisionInfo(branch, revno, revision_id)
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
604
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
605
    def _as_revision_id(self, context_branch):
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
606
        base_revision_id = RevisionSpec.from_string(self.spec)._as_revision_id(context_branch)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
607
        if base_revision_id == revision.NULL_REVISION:
3495.1.1 by John Arbash Meinel
Fix bug #239933, use the right exception for -c0
608
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
609
                                         'cannot go before the null: revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
610
        context_repo = context_branch.repository
611
        context_repo.lock_read()
612
        try:
613
            parent_map = context_repo.get_parent_map([base_revision_id])
614
        finally:
615
            context_repo.unlock()
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
616
        if base_revision_id not in parent_map:
617
            # Ghost, or unknown revision id
618
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
619
                'cannot find the matching revision')
620
        parents = parent_map[base_revision_id]
621
        if len(parents) < 1:
622
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
623
                'No parents for revision.')
624
        return parents[0]
3060.3.5 by Lukáš Lalinský
Add support for in_branch for the remaining RevisionSpec subclasses.
625
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
626
627
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
628
class RevisionSpec_tag(RevisionSpec):
2220.2.3 by Martin Pool
Add tag: revision namespace.
629
    """Select a revision identified by tag name"""
630
631
    help_txt = """Selects a revision identified by a tag name.
632
1551.10.34 by Aaron Bentley
Fix tag: help
633
    Tags are stored in the branch and created by the 'tag' command.
2220.2.3 by Martin Pool
Add tag: revision namespace.
634
    """
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
635
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
636
    prefix = 'tag:'
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
637
    dwim_catchable_exceptions = (errors.NoSuchTag, errors.TagsNotSupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
638
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
639
    def _match_on(self, branch, revs):
2220.2.3 by Martin Pool
Add tag: revision namespace.
640
        # Can raise tags not supported, NoSuchTag, etc
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
641
        return RevisionInfo.from_revision_id(branch,
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
642
            branch.tags.lookup_tag(self.spec))
3060.3.5 by Lukáš Lalinský
Add support for in_branch for the remaining RevisionSpec subclasses.
643
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
644
    def _as_revision_id(self, context_branch):
645
        return context_branch.tags.lookup_tag(self.spec)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
646
647
648
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
649
class _RevListToTimestamps(object):
650
    """This takes a list of revisions, and allows you to bisect by date"""
651
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
652
    __slots__ = ['branch']
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
653
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
654
    def __init__(self, branch):
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
655
        self.branch = branch
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
656
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
657
    def __getitem__(self, index):
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
658
        """Get the date of the index'd item"""
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
659
        r = self.branch.repository.get_revision(self.branch.get_rev_id(index))
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
660
        # TODO: Handle timezone.
661
        return datetime.datetime.fromtimestamp(r.timestamp)
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
662
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
663
    def __len__(self):
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
664
        return self.branch.revno()
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
665
666
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
667
class RevisionSpec_date(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
668
    """Selects a revision on the basis of a datestamp."""
669
670
    help_txt = """Selects a revision on the basis of a datestamp.
2023.1.1 by ghigo
add topics help
671
672
    Supply a datestamp to select the first revision that matches the date.
673
    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
674
    Matches the first entry after a given date (either at midnight or
675
    at a specified time).
676
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
677
    One way to display all the changes since yesterday would be::
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
678
3565.2.1 by Christophe Troestler
(trivial) Corrected typos.
679
        bzr log -r date:yesterday..
2023.1.1 by ghigo
add topics help
680
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
681
    Examples::
682
2023.1.1 by ghigo
add topics help
683
      date:yesterday            -> select the first revision since yesterday
684
      date:2006-08-14,17:10:14  -> select the first revision after
685
                                   August 14th, 2006 at 5:10pm.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
686
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
687
    prefix = 'date:'
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
688
    _date_regex = lazy_regex.lazy_compile(
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
689
            r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
690
            r'(,|T)?\s*'
691
            r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
692
        )
693
694
    def _match_on(self, branch, revs):
2023.1.1 by ghigo
add topics help
695
        """Spec for date revisions:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
696
          date:value
697
          value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
698
          matches the first entry after a given date (either at midnight or
699
          at a specified time).
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
700
        """
2070.4.3 by John Arbash Meinel
code and doc cleanup
701
        #  XXX: This doesn't actually work
702
        #  So the proper way of saying 'give me all entries for today' is:
703
        #      -r date:yesterday..date:today
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
704
        today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
705
        if self.spec.lower() == 'yesterday':
706
            dt = today - datetime.timedelta(days=1)
707
        elif self.spec.lower() == 'today':
708
            dt = today
709
        elif self.spec.lower() == 'tomorrow':
710
            dt = today + datetime.timedelta(days=1)
711
        else:
5685.1.1 by Jelmer Vernooij
More lazy imports, lazy regexes in bzrlib.revisionspec.
712
            m = self._date_regex.match(self.spec)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
713
            if not m or (not m.group('date') and not m.group('time')):
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
714
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
715
                                                 branch, 'invalid date')
716
717
            try:
718
                if m.group('date'):
719
                    year = int(m.group('year'))
720
                    month = int(m.group('month'))
721
                    day = int(m.group('day'))
722
                else:
723
                    year = today.year
724
                    month = today.month
725
                    day = today.day
726
727
                if m.group('time'):
728
                    hour = int(m.group('hour'))
729
                    minute = int(m.group('minute'))
730
                    if m.group('second'):
731
                        second = int(m.group('second'))
732
                    else:
733
                        second = 0
734
                else:
735
                    hour, minute, second = 0,0,0
736
            except ValueError:
1948.4.27 by John Arbash Meinel
Deprecate calling RevisionSpec directly, and instead use a helper function. Also merge the old RevisionSpec_int class into RevisionSpec_revno
737
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
738
                                                 branch, 'invalid date')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
739
740
            dt = datetime.datetime(year=year, month=month, day=day,
741
                    hour=hour, minute=minute, second=second)
1704.2.27 by Martin Pool
Run bisection search for revision date with lock held. (Robert Widhopf-Frenk)
742
        branch.lock_read()
743
        try:
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
744
            rev = bisect.bisect(_RevListToTimestamps(branch), dt, 1)
1704.2.27 by Martin Pool
Run bisection search for revision date with lock held. (Robert Widhopf-Frenk)
745
        finally:
746
            branch.unlock()
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
747
        if rev == branch.revno():
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
748
            raise errors.InvalidRevisionSpec(self.user_spec, branch)
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
749
        return RevisionInfo(branch, rev)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
750
751
752
753
class RevisionSpec_ancestor(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
754
    """Selects a common ancestor with a second branch."""
755
756
    help_txt = """Selects a common ancestor with a second branch.
2023.1.1 by ghigo
add topics help
757
758
    Supply the path to a branch to select the common ancestor.
759
760
    The common ancestor is the last revision that existed in both
761
    branches. Usually this is the branch point, but it could also be
762
    a revision that was merged.
763
764
    This is frequently used with 'diff' to return all of the changes
765
    that your branch introduces, while excluding the changes that you
766
    have not merged from the remote branch.
767
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
768
    Examples::
769
2023.1.1 by ghigo
add topics help
770
      ancestor:/path/to/branch
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
771
      $ bzr diff -r ancestor:../../mainline/branch
2023.1.1 by ghigo
add topics help
772
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
773
    prefix = 'ancestor:'
774
775
    def _match_on(self, branch, revs):
1551.10.33 by Aaron Bentley
Updates from review
776
        trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
777
        return self._find_revision_info(branch, self.spec)
778
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
779
    def _as_revision_id(self, context_branch):
780
        return self._find_revision_id(context_branch, self.spec)
781
1551.10.33 by Aaron Bentley
Updates from review
782
    @staticmethod
783
    def _find_revision_info(branch, other_location):
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
784
        revision_id = RevisionSpec_ancestor._find_revision_id(branch,
785
                                                              other_location)
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
786
        return RevisionInfo(branch, None, revision_id)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
787
788
    @staticmethod
789
    def _find_revision_id(branch, other_location):
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
790
        from bzrlib.branch import Branch
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
791
3010.1.12 by Robert Collins
Lock branches while doing revision specification lookups.
792
        branch.lock_read()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
793
        try:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
794
            revision_a = revision.ensure_null(branch.last_revision())
795
            if revision_a == revision.NULL_REVISION:
796
                raise errors.NoCommits(branch)
3984.1.2 by Daniel Watkins
Added fix.
797
            if other_location == '':
798
                other_location = branch.get_parent()
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
799
            other_branch = Branch.open(other_location)
800
            other_branch.lock_read()
801
            try:
802
                revision_b = revision.ensure_null(other_branch.last_revision())
803
                if revision_b == revision.NULL_REVISION:
804
                    raise errors.NoCommits(other_branch)
805
                graph = branch.repository.get_graph(other_branch.repository)
3010.1.12 by Robert Collins
Lock branches while doing revision specification lookups.
806
                rev_id = graph.find_unique_lca(revision_a, revision_b)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
807
            finally:
808
                other_branch.unlock()
809
            if rev_id == revision.NULL_REVISION:
810
                raise errors.NoCommonAncestor(revision_a, revision_b)
811
            return rev_id
3010.1.12 by Robert Collins
Lock branches while doing revision specification lookups.
812
        finally:
813
            branch.unlock()
1551.10.33 by Aaron Bentley
Updates from review
814
815
1432 by Robert Collins
branch: namespace
816
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
817
1432 by Robert Collins
branch: namespace
818
class RevisionSpec_branch(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
819
    """Selects the last revision of a specified branch."""
820
821
    help_txt = """Selects the last revision of a specified branch.
2023.1.1 by ghigo
add topics help
822
823
    Supply the path to a branch to select its last revision.
824
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
825
    Examples::
826
2023.1.1 by ghigo
add topics help
827
      branch:/path/to/branch
1432 by Robert Collins
branch: namespace
828
    """
829
    prefix = 'branch:'
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
830
    dwim_catchable_exceptions = (errors.NotBranchError,)
1432 by Robert Collins
branch: namespace
831
832
    def _match_on(self, branch, revs):
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
833
        from bzrlib.branch import Branch
834
        other_branch = Branch.open(self.spec)
1432 by Robert Collins
branch: namespace
835
        revision_b = other_branch.last_revision()
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
836
        if revision_b in (None, revision.NULL_REVISION):
1948.4.26 by John Arbash Meinel
Get rid of direct imports of exceptions
837
            raise errors.NoCommits(other_branch)
5318.1.1 by Martin von Gagern
Extract branch location from branch: revision specs.
838
        if branch is None:
839
            branch = other_branch
840
        else:
841
            try:
842
                # pull in the remote revisions so we can diff
843
                branch.fetch(other_branch, revision_b)
844
            except errors.ReadOnlyError:
845
                branch = other_branch
6336.1.1 by Jelmer Vernooij
Deprecate ``RevisionSpec.wants_revision_history`` and remove any uses of it.
846
        return RevisionInfo(branch, None, revision_b)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
847
848
    def _as_revision_id(self, context_branch):
849
        from bzrlib.branch import Branch
850
        other_branch = Branch.open(self.spec)
851
        last_revision = other_branch.last_revision()
852
        last_revision = revision.ensure_null(last_revision)
1551.19.33 by Aaron Bentley
Use as_revision_id for diff
853
        context_branch.fetch(other_branch, last_revision)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
854
        if last_revision == revision.NULL_REVISION:
855
            raise errors.NoCommits(other_branch)
856
        return last_revision
857
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
858
    def _as_tree(self, context_branch):
859
        from bzrlib.branch import Branch
860
        other_branch = Branch.open(self.spec)
861
        last_revision = other_branch.last_revision()
862
        last_revision = revision.ensure_null(last_revision)
863
        if last_revision == revision.NULL_REVISION:
864
            raise errors.NoCommits(other_branch)
865
        return other_branch.repository.revision_tree(last_revision)
866
5318.1.1 by Martin von Gagern
Extract branch location from branch: revision specs.
867
    def needs_branch(self):
868
        return False
869
870
    def get_branch(self):
871
        return self.spec
872
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
873
874
1551.10.33 by Aaron Bentley
Updates from review
875
class RevisionSpec_submit(RevisionSpec_ancestor):
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
876
    """Selects a common ancestor with a submit branch."""
877
878
    help_txt = """Selects a common ancestor with the submit branch.
879
880
    Diffing against this shows all the changes that were made in this branch,
881
    and is a good predictor of what merge will do.  The submit branch is
3565.2.1 by Christophe Troestler
(trivial) Corrected typos.
882
    used by the bundle and merge directive commands.  If no submit branch
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
883
    is specified, the parent branch is used instead.
884
885
    The common ancestor is the last revision that existed in both
886
    branches. Usually this is the branch point, but it could also be
887
    a revision that was merged.
888
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
889
    Examples::
890
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
891
      $ bzr diff -r submit:
892
    """
1551.10.33 by Aaron Bentley
Updates from review
893
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
894
    prefix = 'submit:'
895
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
896
    def _get_submit_location(self, branch):
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
897
        submit_location = branch.get_submit_branch()
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
898
        location_type = 'submit branch'
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
899
        if submit_location is None:
900
            submit_location = branch.get_parent()
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
901
            location_type = 'parent branch'
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
902
        if submit_location is None:
903
            raise errors.NoSubmitBranch(branch)
6147.1.1 by Jonathan Riddell
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations
904
        trace.note(gettext('Using {0} {1}').format(location_type,
905
                                                        submit_location))
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
906
        return submit_location
907
908
    def _match_on(self, branch, revs):
909
        trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
910
        return self._find_revision_info(branch,
911
            self._get_submit_location(branch))
912
913
    def _as_revision_id(self, context_branch):
914
        return self._find_revision_id(context_branch,
915
            self._get_submit_location(context_branch))
1551.10.33 by Aaron Bentley
Updates from review
916
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
917
5365.6.6 by Aaron Bentley
Implement 'annotate' revision-id.
918
class RevisionSpec_annotate(RevisionIDSpec):
919
920
    prefix = 'annotate:'
921
922
    help_txt = """Select the revision that last modified the specified line.
923
924
    Select the revision that last modified the specified line.  Line is
925
    specified as path:number.  Path is a relative path to the file.  Numbers
926
    start at 1, and are relative to the current version, not the last-
927
    committed version of the file.
928
    """
929
930
    def _raise_invalid(self, numstring, context_branch):
931
        raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
932
            'No such line: %s' % numstring)
933
934
    def _as_revision_id(self, context_branch):
935
        path, numstring = self.spec.rsplit(':', 1)
936
        try:
937
            index = int(numstring) - 1
938
        except ValueError:
939
            self._raise_invalid(numstring, context_branch)
940
        tree, file_path = workingtree.WorkingTree.open_containing(path)
941
        tree.lock_read()
942
        try:
943
            file_id = tree.path2id(file_path)
944
            if file_id is None:
945
                raise errors.InvalidRevisionSpec(self.user_spec,
946
                    context_branch, "File '%s' is not versioned." %
947
                    file_path)
948
            revision_ids = [r for (r, l) in tree.annotate_iter(file_id)]
949
        finally:
950
            tree.unlock()
951
        try:
952
            revision_id = revision_ids[index]
953
        except IndexError:
954
            self._raise_invalid(numstring, context_branch)
955
        if revision_id == revision.CURRENT_REVISION:
956
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
957
                'Line %s has not been committed.' % numstring)
958
        return revision_id
959
960
5365.6.4 by Aaron Bentley
Implement mainline revision spec.
961
class RevisionSpec_mainline(RevisionIDSpec):
962
963
    help_txt = """Select mainline revision that merged the specified revision.
964
965
    Select the revision that merged the specified revision into mainline.
966
    """
967
968
    prefix = 'mainline:'
969
970
    def _as_revision_id(self, context_branch):
971
        revspec = RevisionSpec.from_string(self.spec)
972
        if revspec.get_branch() is None:
973
            spec_branch = context_branch
974
        else:
975
            spec_branch = _mod_branch.Branch.open(revspec.get_branch())
976
        revision_id = revspec.as_revision_id(spec_branch)
977
        graph = context_branch.repository.get_graph()
978
        result = graph.find_lefthand_merger(revision_id,
979
                                            context_branch.last_revision())
980
        if result is None:
981
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
982
        return result
983
984
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
985
# The order in which we want to DWIM a revision spec without any prefix.
986
# revno is always tried first and isn't listed here, this is used by
987
# RevisionSpec_dwim._match_on
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
988
dwim_revspecs = symbol_versioning.deprecated_list(
989
    symbol_versioning.deprecated_in((2, 4, 0)), "dwim_revspecs", [])
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
990
5671.5.1 by Jelmer Vernooij
Allow lazily registering possible DWIM revspecs.
991
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_tag)
992
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_revid)
993
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_date)
994
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_branch)
4569.2.18 by Vincent Ladeuil
Small refactoring to unblock the submission.
995
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
996
revspec_registry = registry.Registry()
997
def _register_revspec(revspec):
998
    revspec_registry.register(revspec.prefix, revspec)
999
1000
_register_revspec(RevisionSpec_revno)
1001
_register_revspec(RevisionSpec_revid)
1002
_register_revspec(RevisionSpec_last)
1003
_register_revspec(RevisionSpec_before)
1004
_register_revspec(RevisionSpec_tag)
1005
_register_revspec(RevisionSpec_date)
1006
_register_revspec(RevisionSpec_ancestor)
1007
_register_revspec(RevisionSpec_branch)
1008
_register_revspec(RevisionSpec_submit)
5365.6.6 by Aaron Bentley
Implement 'annotate' revision-id.
1009
_register_revspec(RevisionSpec_annotate)
5365.6.4 by Aaron Bentley
Implement mainline revision spec.
1010
_register_revspec(RevisionSpec_mainline)