~bzr-pqm/bzr/bzr.dev

2220.2.3 by Martin Pool
Add tag: revision namespace.
1
# Copyright (C) 2005, 2006, 2007 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
import re
19
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
22
import bisect
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
23
import datetime
3224.5.31 by Andrew Bennetts
A couple more lazy imports, helps 'bzr log --line -r -1' a little.
24
""")
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
25
26
from bzrlib import (
27
    errors,
2325.2.5 by Marien Zwart
Call osutils.safe_revision_id instead of duplicating it.
28
    osutils,
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
29
    registry,
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
30
    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
31
    symbol_versioning,
32
    trace,
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
33
    )
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
34
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
35
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
36
_marker = []
37
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
38
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
39
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
40
    """The results of applying a revision specification to a branch."""
41
42
    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.
43
44
    An instance has two useful attributes: revno, and rev_id.
45
46
    They can also be accessed as spec[0] and spec[1] respectively,
47
    so that you can write code like:
48
    revno, rev_id = RevisionSpec(branch, spec)
49
    although this is probably going to be deprecated later.
50
51
    This class exists mostly to be the return value of a RevisionSpec,
52
    so that you can access the member you're interested in (number or id)
53
    or treat the result as a tuple.
54
    """
55
56
    def __init__(self, branch, revno, rev_id=_marker):
57
        self.branch = branch
58
        self.revno = revno
59
        if rev_id is _marker:
60
            # allow caller to be lazy
61
            if self.revno is None:
3872.2.5 by Marius Kruger
return null revid again for null revno
62
                self.rev_id = None
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
63
            else:
64
                self.rev_id = branch.get_rev_id(self.revno)
65
        else:
66
            self.rev_id = rev_id
67
68
    def __nonzero__(self):
69
        # first the easy ones...
70
        if self.rev_id is None:
71
            return False
72
        if self.revno is not None:
73
            return True
74
        # TODO: otherwise, it should depend on how I was built -
75
        # if it's in_history(branch), then check revision_history(),
76
        # if it's in_store(branch), do the check below
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
77
        return self.branch.repository.has_revision(self.rev_id)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
78
79
    def __len__(self):
80
        return 2
81
82
    def __getitem__(self, index):
83
        if index == 0: return self.revno
84
        if index == 1: return self.rev_id
85
        raise IndexError(index)
86
87
    def get(self):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
88
        return self.branch.repository.get_revision(self.rev_id)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
89
90
    def __eq__(self, other):
91
        if type(other) not in (tuple, list, type(self)):
92
            return False
93
        if type(other) is type(self) and self.branch is not other.branch:
94
            return False
95
        return tuple(self) == tuple(other)
96
97
    def __repr__(self):
98
        return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
99
            self.revno, self.rev_id, self.branch)
100
2220.2.3 by Martin Pool
Add tag: revision namespace.
101
    @staticmethod
102
    def from_revision_id(branch, revision_id, revs):
103
        """Construct a RevisionInfo given just the id.
104
105
        Use this if you don't know or care what the revno is.
106
        """
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
107
        if revision_id == revision.NULL_REVISION:
108
            return RevisionInfo(branch, 0, revision_id)
2220.2.3 by Martin Pool
Add tag: revision namespace.
109
        try:
110
            revno = revs.index(revision_id) + 1
111
        except ValueError:
112
            revno = None
113
        return RevisionInfo(branch, revno, revision_id)
114
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
115
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
116
# classes in this list should have a "prefix" attribute, against which
117
# string specs are matched
1948.4.35 by John Arbash Meinel
Move the _revno_regex to a more logical location
118
_revno_regex = None
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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
126
    A revision specification can be an integer, in which case it is
127
    assumed to be a revno (though this will translate negative values
128
    into positive ones); or it can be a string, in which case it is
129
    parsed for something like 'date:' or 'revid:' etc.
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
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
142
143
    @staticmethod
144
    def from_string(spec):
145
        """Parse a revision spec string into a RevisionSpec object.
146
147
        :param spec: A string specified by the user
148
        :return: A RevisionSpec object that understands how to parse the
149
            supplied notation.
150
        """
151
        if not isinstance(spec, (type(None), basestring)):
152
            raise TypeError('error')
153
154
        if spec is None:
155
            return RevisionSpec(None, _internal=True)
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
156
        match = revspec_registry.get_prefix(spec)
157
        if match is not None:
158
            spectype, specsuffix = match
159
            trace.mutter('Returning RevisionSpec %s for %s',
160
                         spectype.__name__, spec)
161
            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)
162
        else:
3966.2.2 by Jelmer Vernooij
Add backwards compatibility copy of SPEC_TYPES.
163
            for spectype in SPEC_TYPES:
164
                if spec.startswith(spectype.prefix):
4557.4.1 by Matthew Fuller
Move a mutter so that it triggers when the thing it describes happens,
165
                    trace.mutter('Returning RevisionSpec %s for %s',
166
                                 spectype.__name__, spec)
3966.2.2 by Jelmer Vernooij
Add backwards compatibility copy of SPEC_TYPES.
167
                    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)
168
            # RevisionSpec_revno is special cased, because it is the only
169
            # one that directly handles plain integers
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
170
            # TODO: This should not be special cased rather it should be
171
            # a method invocation on spectype.canparse()
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
172
            global _revno_regex
173
            if _revno_regex is None:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
174
                _revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
175
            if _revno_regex.match(spec) is not None:
176
                return RevisionSpec_revno(spec, _internal=True)
177
178
            raise errors.NoSuchRevisionSpec(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
179
180
    def __init__(self, spec, _internal=False):
181
        """Create a RevisionSpec referring to the Null revision.
182
183
        :param spec: The original spec supplied by the user
184
        :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)
185
            called directly. Only from RevisionSpec.from_string()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
186
        """
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
187
        if not _internal:
188
            symbol_versioning.warn('Creating a RevisionSpec directly has'
189
                                   ' 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)
190
                                   ' 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
191
                                   ' instead.',
192
                                   DeprecationWarning, stacklevel=2)
193
        self.user_spec = spec
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
194
        if self.prefix and spec.startswith(self.prefix):
195
            spec = spec[len(self.prefix):]
196
        self.spec = spec
197
198
    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
199
        trace.mutter('Returning RevisionSpec._match_on: None')
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
200
        return RevisionInfo(branch, None, None)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
201
202
    def _match_on_and_check(self, branch, revs):
203
        info = self._match_on(branch, revs)
204
        if info:
205
            return info
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
206
        elif info == (None, None):
207
            # special case - nothing supplied
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
208
            return info
209
        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
210
            raise errors.InvalidRevisionSpec(self.user_spec, branch)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
211
        else:
1948.4.2 by John Arbash Meinel
Update _match_on_and_check to raise the right error
212
            raise errors.InvalidRevisionSpec(self.spec, branch)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
213
214
    def in_history(self, branch):
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
215
        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.
216
            if self.wants_revision_history:
217
                revs = branch.revision_history()
218
            else:
219
                revs = None
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
220
        else:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
221
            # this should never trigger.
222
            # TODO: make it a deprecated code path. RBC 20060928
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
223
            revs = None
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
224
        return self._match_on_and_check(branch, revs)
225
1432 by Robert Collins
branch: namespace
226
        # FIXME: in_history is somewhat broken,
227
        # it will return non-history revisions in many
228
        # circumstances. The expected facility is that
229
        # in_history only returns revision-history revs,
230
        # in_store returns any rev. RBC 20051010
231
    # aliases for now, when we fix the core logic, then they
232
    # will do what you expect.
233
    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()
234
    in_branch = in_store
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
235
3298.2.4 by John Arbash Meinel
Introduce as_revision_id() as a function instead of in_branch(need_revno=False)
236
    def as_revision_id(self, context_branch):
237
        """Return just the revision_id for this revisions spec.
238
239
        Some revision specs require a context_branch to be able to determine
240
        their value. Not all specs will make use of it.
241
        """
242
        return self._as_revision_id(context_branch)
243
244
    def _as_revision_id(self, context_branch):
245
        """Implementation of as_revision_id()
246
247
        Classes should override this function to provide appropriate
248
        functionality. The default is to just call '.in_history().rev_id'
249
        """
250
        return self.in_history(context_branch).rev_id
251
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
252
    def as_tree(self, context_branch):
253
        """Return the tree object for this revisions spec.
254
255
        Some revision specs require a context_branch to be able to determine
256
        the revision id and access the repository. Not all specs will make
257
        use of it.
258
        """
259
        return self._as_tree(context_branch)
260
261
    def _as_tree(self, context_branch):
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
262
        """Implementation of as_tree().
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
263
264
        Classes should override this function to provide appropriate
265
        functionality. The default is to just call '.as_revision_id()'
266
        and get the revision tree from context_branch's repository.
267
        """
268
        revision_id = self.as_revision_id(context_branch)
269
        return context_branch.repository.revision_tree(revision_id)
270
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
271
    def __repr__(self):
272
        # 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/
273
        return '<%s %s>' % (self.__class__.__name__,
274
                              self.user_spec)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
275
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
276
    def needs_branch(self):
277
        """Whether this revision spec needs a branch.
278
1711.2.99 by John Arbash Meinel
minor typo fix
279
        Set this to False the branch argument of _match_on is not used.
280
        """
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
281
        return True
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
282
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
283
    def get_branch(self):
284
        """When the revision specifier contains a branch location, return it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
285
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
286
        Otherwise, return None.
287
        """
288
        return None
289
1907.4.9 by Matthieu Moy
missing newline
290
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
291
# private API
292
293
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
294
    """Selects a revision using a number."""
295
296
    help_txt = """Selects a revision using a number.
2023.1.1 by ghigo
add topics help
297
298
    Use an integer to specify a revision in the history of the branch.
299
    Optionally a branch can be specified. The 'revno:' prefix is optional.
300
    A negative number will count from the end of the branch (-1 is the
301
    last revision, -2 the previous one). If the negative number is larger
302
    than the branch's history, the first revision is returned.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
303
    Examples::
304
3651.2.1 by Daniel Clemente
Clarify that you don't have to write a path if you mean the current branch
305
      revno:1                   -> return the first revision of this branch
2023.1.1 by ghigo
add topics help
306
      revno:3:/path/to/branch   -> return the 3rd revision of
307
                                   the branch '/path/to/branch'
308
      revno:-1                  -> The last revision in a branch.
309
      -2:http://other/branch    -> The second to last revision in the
310
                                   remote branch.
311
      -1000000                  -> Most likely the first revision, unless
312
                                   your history is very long.
313
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
314
    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.
315
    wants_revision_history = False
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
316
317
    def _match_on(self, branch, revs):
318
        """Lookup a revision by revision number"""
3298.2.6 by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id()
319
        branch, revno, revision_id = self._lookup(branch, revs)
320
        return RevisionInfo(branch, revno, revision_id)
321
322
    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
323
        loc = self.spec.find(':')
324
        if loc == -1:
325
            revno_spec = self.spec
326
            branch_spec = None
327
        else:
328
            revno_spec = self.spec[:loc]
329
            branch_spec = self.spec[loc+1:]
330
331
        if revno_spec == '':
1948.4.6 by John Arbash Meinel
A small bugfix, and more tests for revno:
332
            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
333
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.5 by John Arbash Meinel
Fix tests for negative entries, and add tests for revno:
334
                        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
335
            revno = None
336
        else:
337
            try:
338
                revno = int(revno_spec)
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
339
                dotted = False
340
            except ValueError:
341
                # dotted decimal. This arguably should not be here
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
342
                # 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.
343
                # right now - RBC 20060928
344
                try:
345
                    match_revno = tuple((int(number) for number in revno_spec.split('.')))
346
                except ValueError, e:
347
                    raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
348
349
                dotted = True
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
350
1948.4.6 by John Arbash Meinel
A small bugfix, and more tests for revno:
351
        if branch_spec:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
352
            # the user has override the branch to look in.
353
            # we need to refresh the revision_history map and
354
            # the branch object.
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
355
            from bzrlib.branch import Branch
356
            branch = Branch.open(branch_spec)
3298.2.6 by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id()
357
            revs_or_none = None
1948.4.22 by John Arbash Meinel
Refactor common code from integer revno handlers
358
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
359
        if dotted:
360
            try:
3949.2.6 by Ian Clatworthy
review feedback from jam
361
                revision_id = branch.dotted_revno_to_revision_id(match_revno,
362
                    _cache_reverse=True)
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
363
            except errors.NoSuchRevision:
3872.2.2 by Marius Kruger
* use NULL_REVISION in stead of None for rev_id
364
                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
365
            else:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
366
                # there is no traditional 'revno' for dotted-decimal revnos.
367
                # so for  API compatability we return None.
3949.2.6 by Ian Clatworthy
review feedback from jam
368
                return branch, None, revision_id
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
369
        else:
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
370
            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.
371
            if revno < 0:
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
372
                # if get_rev_id supported negative revnos, there would not be a
373
                # need for this special case.
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
374
                if (-revno) >= last_revno:
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
375
                    revno = 1
376
                else:
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
377
                    revno = last_revno + revno + 1
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
378
            try:
3298.2.6 by John Arbash Meinel
Don't abstract through RevisionInfo for RevisionSpec_revno.as_revision_id()
379
                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.
380
            except errors.NoSuchRevision:
381
                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()
382
        return branch, revno, revision_id
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
383
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
384
    def _as_revision_id(self, context_branch):
385
        # 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()
386
        branch, revno, revision_id = self._lookup(context_branch, None)
387
        return revision_id
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
388
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
389
    def needs_branch(self):
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
390
        return self.spec.find(':') == -1
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
391
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
392
    def get_branch(self):
393
        if self.spec.find(':') == -1:
394
            return None
395
        else:
396
            return self.spec[self.spec.find(':')+1:]
397
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
398
# 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
399
RevisionSpec_int = RevisionSpec_revno
400
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
401
402
403
class RevisionSpec_revid(RevisionSpec):
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
404
    """Selects a revision using the revision id."""
405
406
    help_txt = """Selects a revision using the revision id.
2023.1.1 by ghigo
add topics help
407
408
    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
409
    revision id in the ancestry of the branch.
2023.1.1 by ghigo
add topics help
410
    Including merges, and pending merges.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
411
    Examples::
412
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
413
      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.
414
    """
415
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
416
    prefix = 'revid:'
417
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
418
    def _match_on(self, branch, revs):
2325.2.5 by Marien Zwart
Call osutils.safe_revision_id instead of duplicating it.
419
        # self.spec comes straight from parsing the command line arguments,
420
        # so we expect it to be a Unicode string. Switch it to the internal
421
        # representation.
422
        revision_id = osutils.safe_revision_id(self.spec, warn=False)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
423
        return RevisionInfo.from_revision_id(branch, revision_id, revs)
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
424
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
425
    def _as_revision_id(self, context_branch):
426
        return osutils.safe_revision_id(self.spec, warn=False)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
427
428
429
430
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
431
    """Selects the nth revision from the end."""
432
433
    help_txt = """Selects the nth revision from the end.
2023.1.1 by ghigo
add topics help
434
435
    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
436
    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
437
    Examples::
438
2023.1.1 by ghigo
add topics help
439
      last:1        -> return the last revision
440
      last:3        -> return the revision 2 before the end.
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
441
    """
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
442
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
443
    prefix = 'last:'
444
445
    def _match_on(self, branch, revs):
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
446
        revno, revision_id = self._revno_and_revision_id(branch, revs)
447
        return RevisionInfo(branch, revno, revision_id)
448
449
    def _revno_and_revision_id(self, context_branch, revs_or_none):
450
        last_revno, last_revision_id = context_branch.last_revision_info()
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
451
1948.4.9 by John Arbash Meinel
Cleanup and test last:
452
        if self.spec == '':
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
453
            if not last_revno:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
454
                raise errors.NoCommits(context_branch)
455
            return last_revno, last_revision_id
1948.4.9 by John Arbash Meinel
Cleanup and test last:
456
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
457
        try:
458
            offset = int(self.spec)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
459
        except ValueError, e:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
460
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch, e)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
461
462
        if offset <= 0:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
463
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
1948.4.9 by John Arbash Meinel
Cleanup and test last:
464
                                             'you must supply a positive value')
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
465
466
        revno = last_revno - offset + 1
1948.4.9 by John Arbash Meinel
Cleanup and test last:
467
        try:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
468
            revision_id = context_branch.get_rev_id(revno, revs_or_none)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
469
        except errors.NoSuchRevision:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
470
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
471
        return revno, revision_id
472
473
    def _as_revision_id(self, context_branch):
474
        # We compute the revno as part of the process, but we don't really care
475
        # about it.
476
        revno, revision_id = self._revno_and_revision_id(context_branch, None)
477
        return revision_id
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
478
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
479
480
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
481
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
482
    """Selects the parent of the revision specified."""
483
484
    help_txt = """Selects the parent of the revision specified.
2023.1.1 by ghigo
add topics help
485
3651.2.4 by Daniel Clemente
Reordered to put explanation first and exceptions after
486
    Supply any revision spec to return the parent of that revision.  This is
487
    mostly useful when inspecting revisions that are not in the revision history
488
    of a branch.
489
2023.1.1 by ghigo
add topics help
490
    It is an error to request the parent of the null revision (before:0).
491
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
492
    Examples::
493
2023.1.1 by ghigo
add topics help
494
      before:1913    -> Return the parent of revno 1913 (revno 1912)
495
      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
496
                                            aaaa@bbbb-1234567890
3651.2.5 by Daniel Clemente
Wrote specifical and simpler example for 'before:', and referred to 'bzr diff -c'
497
      bzr diff -r before:1913..1913
498
            -> Find the changes between revision 1913 and its parent (1912).
499
               (What changes did revision 1913 introduce).
500
               This is equivalent to:  bzr diff -c 1913
2023.1.1 by ghigo
add topics help
501
    """
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
502
503
    prefix = 'before:'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
504
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
505
    def _match_on(self, branch, revs):
506
        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
507
        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
508
            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
509
                                         'cannot go before the null: revision')
510
        if r.revno is None:
511
            # We need to use the repository history here
512
            rev = branch.repository.get_revision(r.rev_id)
513
            if not rev.parent_ids:
514
                revno = 0
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
515
                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
516
            else:
517
                revision_id = rev.parent_ids[0]
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
518
                try:
519
                    revno = revs.index(revision_id) + 1
520
                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
521
                    revno = None
522
        else:
523
            revno = r.revno - 1
524
            try:
525
                revision_id = branch.get_rev_id(revno, revs)
1948.4.26 by John Arbash Meinel
Get rid of direct imports of exceptions
526
            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
527
                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
528
                                                 branch)
529
        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
530
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
531
    def _as_revision_id(self, context_branch):
532
        base_revspec = RevisionSpec.from_string(self.spec)
533
        base_revision_id = base_revspec.as_revision_id(context_branch)
534
        if base_revision_id == revision.NULL_REVISION:
3495.1.1 by John Arbash Meinel
Fix bug #239933, use the right exception for -c0
535
            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.
536
                                         'cannot go before the null: revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
537
        context_repo = context_branch.repository
538
        context_repo.lock_read()
539
        try:
540
            parent_map = context_repo.get_parent_map([base_revision_id])
541
        finally:
542
            context_repo.unlock()
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
543
        if base_revision_id not in parent_map:
544
            # Ghost, or unknown revision id
545
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
546
                'cannot find the matching revision')
547
        parents = parent_map[base_revision_id]
548
        if len(parents) < 1:
549
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
550
                'No parents for revision.')
551
        return parents[0]
3060.3.5 by Lukáš Lalinský
Add support for in_branch for the remaining RevisionSpec subclasses.
552
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
553
554
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
555
class RevisionSpec_tag(RevisionSpec):
2220.2.3 by Martin Pool
Add tag: revision namespace.
556
    """Select a revision identified by tag name"""
557
558
    help_txt = """Selects a revision identified by a tag name.
559
1551.10.34 by Aaron Bentley
Fix tag: help
560
    Tags are stored in the branch and created by the 'tag' command.
2220.2.3 by Martin Pool
Add tag: revision namespace.
561
    """
2070.4.14 by John Arbash Meinel
Switch revisionspec to use the help defined as help_txt rather than the doc string
562
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
563
    prefix = 'tag:'
564
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
565
    def _match_on(self, branch, revs):
2220.2.3 by Martin Pool
Add tag: revision namespace.
566
        # 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.
567
        return RevisionInfo.from_revision_id(branch,
568
            branch.tags.lookup_tag(self.spec),
569
            revs)
3060.3.5 by Lukáš Lalinský
Add support for in_branch for the remaining RevisionSpec subclasses.
570
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
571
    def _as_revision_id(self, context_branch):
572
        return context_branch.tags.lookup_tag(self.spec)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
573
574
575
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
576
class _RevListToTimestamps(object):
577
    """This takes a list of revisions, and allows you to bisect by date"""
578
579
    __slots__ = ['revs', 'branch']
580
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
581
    def __init__(self, revs, branch):
582
        self.revs = revs
583
        self.branch = branch
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
584
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
585
    def __getitem__(self, index):
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
586
        """Get the date of the index'd item"""
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
587
        r = self.branch.repository.get_revision(self.revs[index])
588
        # TODO: Handle timezone.
589
        return datetime.datetime.fromtimestamp(r.timestamp)
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
590
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
591
    def __len__(self):
592
        return len(self.revs)
593
594
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
595
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
596
    """Selects a revision on the basis of a datestamp."""
597
598
    help_txt = """Selects a revision on the basis of a datestamp.
2023.1.1 by ghigo
add topics help
599
600
    Supply a datestamp to select the first revision that matches the date.
601
    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
602
    Matches the first entry after a given date (either at midnight or
603
    at a specified time).
604
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
605
    One way to display all the changes since yesterday would be::
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
606
3565.2.1 by Christophe Troestler
(trivial) Corrected typos.
607
        bzr log -r date:yesterday..
2023.1.1 by ghigo
add topics help
608
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
609
    Examples::
610
2023.1.1 by ghigo
add topics help
611
      date:yesterday            -> select the first revision since yesterday
612
      date:2006-08-14,17:10:14  -> select the first revision after
613
                                   August 14th, 2006 at 5:10pm.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
614
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
615
    prefix = 'date:'
616
    _date_re = re.compile(
617
            r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
618
            r'(,|T)?\s*'
619
            r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
620
        )
621
622
    def _match_on(self, branch, revs):
2023.1.1 by ghigo
add topics help
623
        """Spec for date revisions:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
624
          date:value
625
          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
626
          matches the first entry after a given date (either at midnight or
627
          at a specified time).
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
628
        """
2070.4.3 by John Arbash Meinel
code and doc cleanup
629
        #  XXX: This doesn't actually work
630
        #  So the proper way of saying 'give me all entries for today' is:
631
        #      -r date:yesterday..date:today
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
632
        today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
633
        if self.spec.lower() == 'yesterday':
634
            dt = today - datetime.timedelta(days=1)
635
        elif self.spec.lower() == 'today':
636
            dt = today
637
        elif self.spec.lower() == 'tomorrow':
638
            dt = today + datetime.timedelta(days=1)
639
        else:
640
            m = self._date_re.match(self.spec)
641
            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
642
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
643
                                                 branch, 'invalid date')
644
645
            try:
646
                if m.group('date'):
647
                    year = int(m.group('year'))
648
                    month = int(m.group('month'))
649
                    day = int(m.group('day'))
650
                else:
651
                    year = today.year
652
                    month = today.month
653
                    day = today.day
654
655
                if m.group('time'):
656
                    hour = int(m.group('hour'))
657
                    minute = int(m.group('minute'))
658
                    if m.group('second'):
659
                        second = int(m.group('second'))
660
                    else:
661
                        second = 0
662
                else:
663
                    hour, minute, second = 0,0,0
664
            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
665
                raise errors.InvalidRevisionSpec(self.user_spec,
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
666
                                                 branch, 'invalid date')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
667
668
            dt = datetime.datetime(year=year, month=month, day=day,
669
                    hour=hour, minute=minute, second=second)
1704.2.27 by Martin Pool
Run bisection search for revision date with lock held. (Robert Widhopf-Frenk)
670
        branch.lock_read()
671
        try:
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
672
            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)
673
        finally:
674
            branch.unlock()
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
675
        if rev == len(revs):
3298.2.11 by Aaron Bentley
Update tests for null:, clea up slightly
676
            raise errors.InvalidRevisionSpec(self.user_spec, branch)
1688.2.2 by Guillaume Pinot
Binary search for 'date:' revision.
677
        else:
678
            return RevisionInfo(branch, rev + 1)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
679
680
681
682
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
683
    """Selects a common ancestor with a second branch."""
684
685
    help_txt = """Selects a common ancestor with a second branch.
2023.1.1 by ghigo
add topics help
686
687
    Supply the path to a branch to select the common ancestor.
688
689
    The common ancestor is the last revision that existed in both
690
    branches. Usually this is the branch point, but it could also be
691
    a revision that was merged.
692
693
    This is frequently used with 'diff' to return all of the changes
694
    that your branch introduces, while excluding the changes that you
695
    have not merged from the remote branch.
696
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
697
    Examples::
698
2023.1.1 by ghigo
add topics help
699
      ancestor:/path/to/branch
2070.4.7 by ghigo
Updates on the basis of the Richard Wilbur suggestions
700
      $ bzr diff -r ancestor:../../mainline/branch
2023.1.1 by ghigo
add topics help
701
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
702
    prefix = 'ancestor:'
703
704
    def _match_on(self, branch, revs):
1551.10.33 by Aaron Bentley
Updates from review
705
        trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
706
        return self._find_revision_info(branch, self.spec)
707
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
708
    def _as_revision_id(self, context_branch):
709
        return self._find_revision_id(context_branch, self.spec)
710
1551.10.33 by Aaron Bentley
Updates from review
711
    @staticmethod
712
    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.
713
        revision_id = RevisionSpec_ancestor._find_revision_id(branch,
714
                                                              other_location)
715
        try:
716
            revno = branch.revision_id_to_revno(revision_id)
717
        except errors.NoSuchRevision:
718
            revno = None
719
        return RevisionInfo(branch, revno, revision_id)
720
721
    @staticmethod
722
    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
723
        from bzrlib.branch import Branch
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
724
3010.1.12 by Robert Collins
Lock branches while doing revision specification lookups.
725
        branch.lock_read()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
726
        try:
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
727
            revision_a = revision.ensure_null(branch.last_revision())
728
            if revision_a == revision.NULL_REVISION:
729
                raise errors.NoCommits(branch)
3984.1.2 by Daniel Watkins
Added fix.
730
            if other_location == '':
731
                other_location = branch.get_parent()
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
732
            other_branch = Branch.open(other_location)
733
            other_branch.lock_read()
734
            try:
735
                revision_b = revision.ensure_null(other_branch.last_revision())
736
                if revision_b == revision.NULL_REVISION:
737
                    raise errors.NoCommits(other_branch)
738
                graph = branch.repository.get_graph(other_branch.repository)
3010.1.12 by Robert Collins
Lock branches while doing revision specification lookups.
739
                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.
740
            finally:
741
                other_branch.unlock()
742
            if rev_id == revision.NULL_REVISION:
743
                raise errors.NoCommonAncestor(revision_a, revision_b)
744
            return rev_id
3010.1.12 by Robert Collins
Lock branches while doing revision specification lookups.
745
        finally:
746
            branch.unlock()
1551.10.33 by Aaron Bentley
Updates from review
747
748
1432 by Robert Collins
branch: namespace
749
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
750
1432 by Robert Collins
branch: namespace
751
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
752
    """Selects the last revision of a specified branch."""
753
754
    help_txt = """Selects the last revision of a specified branch.
2023.1.1 by ghigo
add topics help
755
756
    Supply the path to a branch to select its last revision.
757
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
758
    Examples::
759
2023.1.1 by ghigo
add topics help
760
      branch:/path/to/branch
1432 by Robert Collins
branch: namespace
761
    """
762
    prefix = 'branch:'
763
764
    def _match_on(self, branch, revs):
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
765
        from bzrlib.branch import Branch
766
        other_branch = Branch.open(self.spec)
1432 by Robert Collins
branch: namespace
767
        revision_b = other_branch.last_revision()
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
768
        if revision_b in (None, revision.NULL_REVISION):
1948.4.26 by John Arbash Meinel
Get rid of direct imports of exceptions
769
            raise errors.NoCommits(other_branch)
1432 by Robert Collins
branch: namespace
770
        # pull in the remote revisions so we can diff
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
771
        branch.fetch(other_branch, revision_b)
1432 by Robert Collins
branch: namespace
772
        try:
773
            revno = branch.revision_id_to_revno(revision_b)
1948.4.26 by John Arbash Meinel
Get rid of direct imports of exceptions
774
        except errors.NoSuchRevision:
1432 by Robert Collins
branch: namespace
775
            revno = None
776
        return RevisionInfo(branch, revno, revision_b)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
777
778
    def _as_revision_id(self, context_branch):
779
        from bzrlib.branch import Branch
780
        other_branch = Branch.open(self.spec)
781
        last_revision = other_branch.last_revision()
782
        last_revision = revision.ensure_null(last_revision)
1551.19.33 by Aaron Bentley
Use as_revision_id for diff
783
        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.
784
        if last_revision == revision.NULL_REVISION:
785
            raise errors.NoCommits(other_branch)
786
        return last_revision
787
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
788
    def _as_tree(self, context_branch):
789
        from bzrlib.branch import Branch
790
        other_branch = Branch.open(self.spec)
791
        last_revision = other_branch.last_revision()
792
        last_revision = revision.ensure_null(last_revision)
793
        if last_revision == revision.NULL_REVISION:
794
            raise errors.NoCommits(other_branch)
795
        return other_branch.repository.revision_tree(last_revision)
796
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
797
798
1551.10.33 by Aaron Bentley
Updates from review
799
class RevisionSpec_submit(RevisionSpec_ancestor):
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
800
    """Selects a common ancestor with a submit branch."""
801
802
    help_txt = """Selects a common ancestor with the submit branch.
803
804
    Diffing against this shows all the changes that were made in this branch,
805
    and is a good predictor of what merge will do.  The submit branch is
3565.2.1 by Christophe Troestler
(trivial) Corrected typos.
806
    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
807
    is specified, the parent branch is used instead.
808
809
    The common ancestor is the last revision that existed in both
810
    branches. Usually this is the branch point, but it could also be
811
    a revision that was merged.
812
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
813
    Examples::
814
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
815
      $ bzr diff -r submit:
816
    """
1551.10.33 by Aaron Bentley
Updates from review
817
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
818
    prefix = 'submit:'
819
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
820
    def _get_submit_location(self, branch):
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
821
        submit_location = branch.get_submit_branch()
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
822
        location_type = 'submit branch'
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
823
        if submit_location is None:
824
            submit_location = branch.get_parent()
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
825
            location_type = 'parent branch'
1551.10.32 by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs
826
        if submit_location is None:
827
            raise errors.NoSubmitBranch(branch)
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
828
        trace.note('Using %s %s', location_type, submit_location)
3298.2.5 by John Arbash Meinel
Start implementing everything in terms of cheaper _as_revision_id lookups.
829
        return submit_location
830
831
    def _match_on(self, branch, revs):
832
        trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
833
        return self._find_revision_info(branch,
834
            self._get_submit_location(branch))
835
836
    def _as_revision_id(self, context_branch):
837
        return self._find_revision_id(context_branch,
838
            self._get_submit_location(context_branch))
1551.10.33 by Aaron Bentley
Updates from review
839
1551.10.35 by Aaron Bentley
Add note about which branch is selected by submit:
840
3966.2.1 by Jelmer Vernooij
Register revision specifiers in a registry.
841
revspec_registry = registry.Registry()
842
def _register_revspec(revspec):
843
    revspec_registry.register(revspec.prefix, revspec)
844
845
_register_revspec(RevisionSpec_revno)
846
_register_revspec(RevisionSpec_revid)
847
_register_revspec(RevisionSpec_last)
848
_register_revspec(RevisionSpec_before)
849
_register_revspec(RevisionSpec_tag)
850
_register_revspec(RevisionSpec_date)
851
_register_revspec(RevisionSpec_ancestor)
852
_register_revspec(RevisionSpec_branch)
853
_register_revspec(RevisionSpec_submit)
3966.2.2 by Jelmer Vernooij
Add backwards compatibility copy of SPEC_TYPES.
854
855
SPEC_TYPES = symbol_versioning.deprecated_list(
856
    symbol_versioning.deprecated_in((1, 12, 0)), "SPEC_TYPES", [])