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