/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
 
 
20
 
from .lazy_import import lazy_import
 
17
 
 
18
import re
 
19
 
 
20
from bzrlib.lazy_import import lazy_import
21
21
lazy_import(globals(), """
22
22
import bisect
23
23
import datetime
24
 
 
25
 
from breezy import (
26
 
    branch as _mod_branch,
27
 
    cache_utf8,
28
 
    revision,
29
 
    workingtree,
30
 
    )
31
 
from breezy.i18n import gettext
32
24
""")
33
25
 
34
 
from . import (
 
26
from bzrlib import (
35
27
    errors,
36
 
    lazy_regex,
 
28
    osutils,
37
29
    registry,
 
30
    revision,
 
31
    symbol_versioning,
38
32
    trace,
39
33
    )
40
 
from .sixish import (
41
 
    text_type,
42
 
    )
 
34
 
 
35
 
 
36
_marker = []
43
37
 
44
38
 
45
39
class RevisionInfo(object):
59
53
    or treat the result as a tuple.
60
54
    """
61
55
 
62
 
    def __init__(self, branch, revno=None, rev_id=None):
 
56
    def __init__(self, branch, revno, rev_id=_marker):
63
57
        self.branch = branch
64
 
        self._has_revno = (revno is not None)
65
 
        self._revno = revno
66
 
        self.rev_id = rev_id
67
 
        if self.rev_id is None and self._revno is not None:
 
58
        self.revno = revno
 
59
        if rev_id is _marker:
68
60
            # allow caller to be lazy
69
 
            self.rev_id = branch.get_rev_id(self._revno)
70
 
 
71
 
    @property
72
 
    def revno(self):
73
 
        if not self._has_revno and self.rev_id is not None:
74
 
            try:
75
 
                self._revno = self.branch.revision_id_to_revno(self.rev_id)
76
 
            except errors.NoSuchRevision:
77
 
                self._revno = None
78
 
            self._has_revno = True
79
 
        return self._revno
80
 
 
81
 
    def __bool__(self):
 
61
            if self.revno is None:
 
62
                self.rev_id = None
 
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...
82
70
        if self.rev_id is None:
83
71
            return False
 
72
        if self.revno is not None:
 
73
            return True
84
74
        # TODO: otherwise, it should depend on how I was built -
85
75
        # if it's in_history(branch), then check revision_history(),
86
76
        # if it's in_store(branch), do the check below
87
77
        return self.branch.repository.has_revision(self.rev_id)
88
78
 
89
 
    __nonzero__ = __bool__
90
 
 
91
79
    def __len__(self):
92
80
        return 2
93
81
 
94
82
    def __getitem__(self, index):
95
 
        if index == 0:
96
 
            return self.revno
97
 
        if index == 1:
98
 
            return self.rev_id
 
83
        if index == 0: return self.revno
 
84
        if index == 1: return self.rev_id
99
85
        raise IndexError(index)
100
86
 
101
87
    def get(self):
104
90
    def __eq__(self, other):
105
91
        if type(other) not in (tuple, list, type(self)):
106
92
            return False
107
 
        if isinstance(other, type(self)) and self.branch is not other.branch:
 
93
        if type(other) is type(self) and self.branch is not other.branch:
108
94
            return False
109
95
        return tuple(self) == tuple(other)
110
96
 
111
97
    def __repr__(self):
112
 
        return '<breezy.revisionspec.RevisionInfo object %s, %s for %r>' % (
 
98
        return '<bzrlib.revisionspec.RevisionInfo object %s, %s for %r>' % (
113
99
            self.revno, self.rev_id, self.branch)
114
100
 
115
101
    @staticmethod
116
 
    def from_revision_id(branch, revision_id):
 
102
    def from_revision_id(branch, revision_id, revs):
117
103
        """Construct a RevisionInfo given just the id.
118
104
 
119
105
        Use this if you don't know or care what the revno is.
120
106
        """
121
 
        return RevisionInfo(branch, revno=None, rev_id=revision_id)
 
107
        if revision_id == revision.NULL_REVISION:
 
108
            return RevisionInfo(branch, 0, revision_id)
 
109
        try:
 
110
            revno = revs.index(revision_id) + 1
 
111
        except ValueError:
 
112
            revno = None
 
113
        return RevisionInfo(branch, revno, revision_id)
 
114
 
 
115
 
 
116
_revno_regex = None
122
117
 
123
118
 
124
119
class RevisionSpec(object):
141
136
    """
142
137
 
143
138
    prefix = None
 
139
    wants_revision_history = True
144
140
    dwim_catchable_exceptions = (errors.InvalidRevisionSpec,)
145
141
    """Exceptions that RevisionSpec_dwim._match_on will catch.
146
142
 
158
154
        :return: A RevisionSpec object that understands how to parse the
159
155
            supplied notation.
160
156
        """
 
157
        if not isinstance(spec, (type(None), basestring)):
 
158
            raise TypeError('error')
 
159
 
161
160
        if spec is None:
162
161
            return RevisionSpec(None, _internal=True)
163
 
        if not isinstance(spec, (str, text_type)):
164
 
            raise TypeError("revision spec needs to be text")
165
162
        match = revspec_registry.get_prefix(spec)
166
163
        if match is not None:
167
164
            spectype, specsuffix = match
169
166
                         spectype.__name__, spec)
170
167
            return spectype(spec, _internal=True)
171
168
        else:
 
169
            for spectype in SPEC_TYPES:
 
170
                if spec.startswith(spectype.prefix):
 
171
                    trace.mutter('Returning RevisionSpec %s for %s',
 
172
                                 spectype.__name__, spec)
 
173
                    return spectype(spec, _internal=True)
172
174
            # Otherwise treat it as a DWIM, build the RevisionSpec object and
173
175
            # wait for _match_on to be called.
174
176
            return RevisionSpec_dwim(spec, _internal=True)
181
183
            called directly. Only from RevisionSpec.from_string()
182
184
        """
183
185
        if not _internal:
184
 
            raise AssertionError(
185
 
                'Creating a RevisionSpec directly is not supported. '
186
 
                'Use RevisionSpec.from_string() instead.')
 
186
            symbol_versioning.warn('Creating a RevisionSpec directly has'
 
187
                                   ' been deprecated in version 0.11. Use'
 
188
                                   ' RevisionSpec.from_string()'
 
189
                                   ' instead.',
 
190
                                   DeprecationWarning, stacklevel=2)
187
191
        self.user_spec = spec
188
192
        if self.prefix and spec.startswith(self.prefix):
189
193
            spec = spec[len(self.prefix):]
206
210
            raise errors.InvalidRevisionSpec(self.spec, branch)
207
211
 
208
212
    def in_history(self, branch):
209
 
        return self._match_on_and_check(branch, revs=None)
 
213
        if branch:
 
214
            if self.wants_revision_history:
 
215
                revs = branch.revision_history()
 
216
            else:
 
217
                revs = None
 
218
        else:
 
219
            # this should never trigger.
 
220
            # TODO: make it a deprecated code path. RBC 20060928
 
221
            revs = None
 
222
        return self._match_on_and_check(branch, revs)
210
223
 
211
224
        # FIXME: in_history is somewhat broken,
212
225
        # it will return non-history revisions in many
256
269
    def __repr__(self):
257
270
        # this is mostly for helping with testing
258
271
        return '<%s %s>' % (self.__class__.__name__,
259
 
                            self.user_spec)
 
272
                              self.user_spec)
260
273
 
261
274
    def needs_branch(self):
262
275
        """Whether this revision spec needs a branch.
285
298
    """
286
299
 
287
300
    help_txt = None
288
 
 
289
 
    _revno_regex = lazy_regex.lazy_compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
290
 
 
291
 
    # The revspecs to try
292
 
    _possible_revspecs = []
 
301
    # We don't need to build the revision history ourself, that's delegated to
 
302
    # each revspec we try.
 
303
    wants_revision_history = False
293
304
 
294
305
    def _try_spectype(self, rstype, branch):
295
306
        rs = rstype(self.spec, _internal=True)
301
312
        """Run the lookup and see what we can get."""
302
313
 
303
314
        # First, see if it's a revno
304
 
        if self._revno_regex.match(self.spec) is not None:
 
315
        global _revno_regex
 
316
        if _revno_regex is None:
 
317
            _revno_regex = re.compile(r'^(?:(\d+(\.\d+)*)|-\d+)(:.*)?$')
 
318
        if _revno_regex.match(self.spec) is not None:
305
319
            try:
306
320
                return self._try_spectype(RevisionSpec_revno, branch)
307
321
            except RevisionSpec_revno.dwim_catchable_exceptions:
308
322
                pass
309
323
 
310
324
        # Next see what has been registered
311
 
        for objgetter in self._possible_revspecs:
312
 
            rs_class = objgetter.get_obj()
 
325
        for rs_class in dwim_revspecs:
313
326
            try:
314
327
                return self._try_spectype(rs_class, branch)
315
328
            except rs_class.dwim_catchable_exceptions:
320
333
        # really relevant.
321
334
        raise errors.InvalidRevisionSpec(self.spec, branch)
322
335
 
323
 
    @classmethod
324
 
    def append_possible_revspec(cls, revspec):
325
 
        """Append a possible DWIM revspec.
326
 
 
327
 
        :param revspec: Revision spec to try.
328
 
        """
329
 
        cls._possible_revspecs.append(registry._ObjectGetter(revspec))
330
 
 
331
 
    @classmethod
332
 
    def append_possible_lazy_revspec(cls, module_name, member_name):
333
 
        """Append a possible lazily loaded DWIM revspec.
334
 
 
335
 
        :param module_name: Name of the module with the revspec
336
 
        :param member_name: Name of the revspec within the module
337
 
        """
338
 
        cls._possible_revspecs.append(
339
 
            registry._LazyObjectGetter(module_name, member_name))
340
 
 
341
336
 
342
337
class RevisionSpec_revno(RevisionSpec):
343
338
    """Selects a revision using a number."""
361
356
                                   your history is very long.
362
357
    """
363
358
    prefix = 'revno:'
 
359
    wants_revision_history = False
364
360
 
365
361
    def _match_on(self, branch, revs):
366
362
        """Lookup a revision by revision number"""
367
 
        branch, revno, revision_id = self._lookup(branch)
 
363
        branch, revno, revision_id = self._lookup(branch, revs)
368
364
        return RevisionInfo(branch, revno, revision_id)
369
365
 
370
 
    def _lookup(self, branch):
 
366
    def _lookup(self, branch, revs_or_none):
371
367
        loc = self.spec.find(':')
372
368
        if loc == -1:
373
369
            revno_spec = self.spec
374
370
            branch_spec = None
375
371
        else:
376
372
            revno_spec = self.spec[:loc]
377
 
            branch_spec = self.spec[loc + 1:]
 
373
            branch_spec = self.spec[loc+1:]
378
374
 
379
375
        if revno_spec == '':
380
376
            if not branch_spec:
381
377
                raise errors.InvalidRevisionSpec(self.user_spec,
382
 
                                                 branch, 'cannot have an empty revno and no branch')
 
378
                        branch, 'cannot have an empty revno and no branch')
383
379
            revno = None
384
380
        else:
385
381
            try:
390
386
                # but the from_string method is a little primitive
391
387
                # right now - RBC 20060928
392
388
                try:
393
 
                    match_revno = tuple((int(number)
394
 
                                         for number in revno_spec.split('.')))
395
 
                except ValueError as e:
 
389
                    match_revno = tuple((int(number) for number in revno_spec.split('.')))
 
390
                except ValueError, e:
396
391
                    raise errors.InvalidRevisionSpec(self.user_spec, branch, e)
397
392
 
398
393
                dotted = True
399
394
 
400
395
        if branch_spec:
401
 
            # the user has overriden the branch to look in.
402
 
            branch = _mod_branch.Branch.open(branch_spec)
 
396
            # the user has override the branch to look in.
 
397
            # we need to refresh the revision_history map and
 
398
            # the branch object.
 
399
            from bzrlib.branch import Branch
 
400
            branch = Branch.open(branch_spec)
 
401
            revs_or_none = None
403
402
 
404
403
        if dotted:
405
404
            try:
406
405
                revision_id = branch.dotted_revno_to_revision_id(match_revno,
407
 
                                                                 _cache_reverse=True)
 
406
                    _cache_reverse=True)
408
407
            except errors.NoSuchRevision:
409
408
                raise errors.InvalidRevisionSpec(self.user_spec, branch)
410
409
            else:
411
410
                # there is no traditional 'revno' for dotted-decimal revnos.
412
 
                # so for API compatibility we return None.
 
411
                # so for  API compatability we return None.
413
412
                return branch, None, revision_id
414
413
        else:
415
414
            last_revno, last_revision_id = branch.last_revision_info()
421
420
                else:
422
421
                    revno = last_revno + revno + 1
423
422
            try:
424
 
                revision_id = branch.get_rev_id(revno)
 
423
                revision_id = branch.get_rev_id(revno, revs_or_none)
425
424
            except errors.NoSuchRevision:
426
425
                raise errors.InvalidRevisionSpec(self.user_spec, branch)
427
426
        return branch, revno, revision_id
428
427
 
429
428
    def _as_revision_id(self, context_branch):
430
429
        # We would have the revno here, but we don't really care
431
 
        branch, revno, revision_id = self._lookup(context_branch)
 
430
        branch, revno, revision_id = self._lookup(context_branch, None)
432
431
        return revision_id
433
432
 
434
433
    def needs_branch(self):
438
437
        if self.spec.find(':') == -1:
439
438
            return None
440
439
        else:
441
 
            return self.spec[self.spec.find(':') + 1:]
442
 
 
 
440
            return self.spec[self.spec.find(':')+1:]
443
441
 
444
442
# Old compatibility
445
443
RevisionSpec_int = RevisionSpec_revno
446
444
 
447
445
 
448
 
class RevisionIDSpec(RevisionSpec):
449
 
 
450
 
    def _match_on(self, branch, revs):
451
 
        revision_id = self.as_revision_id(branch)
452
 
        return RevisionInfo.from_revision_id(branch, revision_id)
453
 
 
454
 
 
455
 
class RevisionSpec_revid(RevisionIDSpec):
 
446
 
 
447
class RevisionSpec_revid(RevisionSpec):
456
448
    """Selects a revision using the revision id."""
457
449
 
458
450
    help_txt = """Selects a revision using the revision id.
467
459
 
468
460
    prefix = 'revid:'
469
461
 
470
 
    def _as_revision_id(self, context_branch):
 
462
    def _match_on(self, branch, revs):
471
463
        # self.spec comes straight from parsing the command line arguments,
472
464
        # so we expect it to be a Unicode string. Switch it to the internal
473
465
        # representation.
474
 
        if isinstance(self.spec, text_type):
475
 
            return cache_utf8.encode(self.spec)
476
 
        return self.spec
 
466
        revision_id = osutils.safe_revision_id(self.spec, warn=False)
 
467
        return RevisionInfo.from_revision_id(branch, revision_id, revs)
 
468
 
 
469
    def _as_revision_id(self, context_branch):
 
470
        return osutils.safe_revision_id(self.spec, warn=False)
 
471
 
477
472
 
478
473
 
479
474
class RevisionSpec_last(RevisionSpec):
492
487
    prefix = 'last:'
493
488
 
494
489
    def _match_on(self, branch, revs):
495
 
        revno, revision_id = self._revno_and_revision_id(branch)
 
490
        revno, revision_id = self._revno_and_revision_id(branch, revs)
496
491
        return RevisionInfo(branch, revno, revision_id)
497
492
 
498
 
    def _revno_and_revision_id(self, context_branch):
 
493
    def _revno_and_revision_id(self, context_branch, revs_or_none):
499
494
        last_revno, last_revision_id = context_branch.last_revision_info()
500
495
 
501
496
        if self.spec == '':
505
500
 
506
501
        try:
507
502
            offset = int(self.spec)
508
 
        except ValueError as e:
 
503
        except ValueError, e:
509
504
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch, e)
510
505
 
511
506
        if offset <= 0:
514
509
 
515
510
        revno = last_revno - offset + 1
516
511
        try:
517
 
            revision_id = context_branch.get_rev_id(revno)
 
512
            revision_id = context_branch.get_rev_id(revno, revs_or_none)
518
513
        except errors.NoSuchRevision:
519
514
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
520
515
        return revno, revision_id
522
517
    def _as_revision_id(self, context_branch):
523
518
        # We compute the revno as part of the process, but we don't really care
524
519
        # about it.
525
 
        revno, revision_id = self._revno_and_revision_id(context_branch)
 
520
        revno, revision_id = self._revno_and_revision_id(context_branch, None)
526
521
        return revision_id
527
522
 
528
523
 
 
524
 
529
525
class RevisionSpec_before(RevisionSpec):
530
526
    """Selects the parent of the revision specified."""
531
527
 
554
550
        r = RevisionSpec.from_string(self.spec)._match_on(branch, revs)
555
551
        if r.revno == 0:
556
552
            raise errors.InvalidRevisionSpec(self.user_spec, branch,
557
 
                                             'cannot go before the null: revision')
 
553
                                         'cannot go before the null: revision')
558
554
        if r.revno is None:
559
555
            # We need to use the repository history here
560
556
            rev = branch.repository.get_revision(r.rev_id)
561
557
            if not rev.parent_ids:
 
558
                revno = 0
562
559
                revision_id = revision.NULL_REVISION
563
560
            else:
564
561
                revision_id = rev.parent_ids[0]
565
 
            revno = None
 
562
                try:
 
563
                    revno = revs.index(revision_id) + 1
 
564
                except ValueError:
 
565
                    revno = None
566
566
        else:
567
567
            revno = r.revno - 1
568
568
            try:
573
573
        return RevisionInfo(branch, revno, revision_id)
574
574
 
575
575
    def _as_revision_id(self, context_branch):
576
 
        base_revision_id = RevisionSpec.from_string(
577
 
            self.spec)._as_revision_id(context_branch)
 
576
        base_revspec = RevisionSpec.from_string(self.spec)
 
577
        base_revision_id = base_revspec.as_revision_id(context_branch)
578
578
        if base_revision_id == revision.NULL_REVISION:
579
579
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
580
 
                                             'cannot go before the null: revision')
 
580
                                         'cannot go before the null: revision')
581
581
        context_repo = context_branch.repository
582
582
        context_repo.lock_read()
583
583
        try:
587
587
        if base_revision_id not in parent_map:
588
588
            # Ghost, or unknown revision id
589
589
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
590
 
                                             'cannot find the matching revision')
 
590
                'cannot find the matching revision')
591
591
        parents = parent_map[base_revision_id]
592
592
        if len(parents) < 1:
593
593
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
594
 
                                             'No parents for revision.')
 
594
                'No parents for revision.')
595
595
        return parents[0]
596
596
 
597
597
 
 
598
 
598
599
class RevisionSpec_tag(RevisionSpec):
599
600
    """Select a revision identified by tag name"""
600
601
 
609
610
    def _match_on(self, branch, revs):
610
611
        # Can raise tags not supported, NoSuchTag, etc
611
612
        return RevisionInfo.from_revision_id(branch,
612
 
                                             branch.tags.lookup_tag(self.spec))
 
613
            branch.tags.lookup_tag(self.spec),
 
614
            revs)
613
615
 
614
616
    def _as_revision_id(self, context_branch):
615
617
        return context_branch.tags.lookup_tag(self.spec)
616
618
 
617
619
 
 
620
 
618
621
class _RevListToTimestamps(object):
619
622
    """This takes a list of revisions, and allows you to bisect by date"""
620
623
 
621
 
    __slots__ = ['branch']
 
624
    __slots__ = ['revs', 'branch']
622
625
 
623
 
    def __init__(self, branch):
 
626
    def __init__(self, revs, branch):
 
627
        self.revs = revs
624
628
        self.branch = branch
625
629
 
626
630
    def __getitem__(self, index):
627
631
        """Get the date of the index'd item"""
628
 
        r = self.branch.repository.get_revision(self.branch.get_rev_id(index))
 
632
        r = self.branch.repository.get_revision(self.revs[index])
629
633
        # TODO: Handle timezone.
630
634
        return datetime.datetime.fromtimestamp(r.timestamp)
631
635
 
632
636
    def __len__(self):
633
 
        return self.branch.revno()
 
637
        return len(self.revs)
634
638
 
635
639
 
636
640
class RevisionSpec_date(RevisionSpec):
645
649
 
646
650
    One way to display all the changes since yesterday would be::
647
651
 
648
 
        brz log -r date:yesterday..
 
652
        bzr log -r date:yesterday..
649
653
 
650
654
    Examples::
651
655
 
654
658
                                   August 14th, 2006 at 5:10pm.
655
659
    """
656
660
    prefix = 'date:'
657
 
    _date_regex = lazy_regex.lazy_compile(
658
 
        r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
659
 
        r'(,|T)?\s*'
660
 
        r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
 
661
    _date_re = re.compile(
 
662
            r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
 
663
            r'(,|T)?\s*'
 
664
            r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
661
665
        )
662
666
 
663
667
    def _match_on(self, branch, revs):
670
674
        #  XXX: This doesn't actually work
671
675
        #  So the proper way of saying 'give me all entries for today' is:
672
676
        #      -r date:yesterday..date:today
673
 
        today = datetime.datetime.fromordinal(
674
 
            datetime.date.today().toordinal())
 
677
        today = datetime.datetime.fromordinal(datetime.date.today().toordinal())
675
678
        if self.spec.lower() == 'yesterday':
676
679
            dt = today - datetime.timedelta(days=1)
677
680
        elif self.spec.lower() == 'today':
679
682
        elif self.spec.lower() == 'tomorrow':
680
683
            dt = today + datetime.timedelta(days=1)
681
684
        else:
682
 
            m = self._date_regex.match(self.spec)
 
685
            m = self._date_re.match(self.spec)
683
686
            if not m or (not m.group('date') and not m.group('time')):
684
687
                raise errors.InvalidRevisionSpec(self.user_spec,
685
688
                                                 branch, 'invalid date')
702
705
                    else:
703
706
                        second = 0
704
707
                else:
705
 
                    hour, minute, second = 0, 0, 0
 
708
                    hour, minute, second = 0,0,0
706
709
            except ValueError:
707
710
                raise errors.InvalidRevisionSpec(self.user_spec,
708
711
                                                 branch, 'invalid date')
709
712
 
710
713
            dt = datetime.datetime(year=year, month=month, day=day,
711
 
                                   hour=hour, minute=minute, second=second)
712
 
        with branch.lock_read():
713
 
            rev = bisect.bisect(_RevListToTimestamps(branch), dt, 1)
714
 
        if rev == branch.revno():
 
714
                    hour=hour, minute=minute, second=second)
 
715
        branch.lock_read()
 
716
        try:
 
717
            rev = bisect.bisect(_RevListToTimestamps(revs, branch), dt)
 
718
        finally:
 
719
            branch.unlock()
 
720
        if rev == len(revs):
715
721
            raise errors.InvalidRevisionSpec(self.user_spec, branch)
716
 
        return RevisionInfo(branch, rev)
 
722
        else:
 
723
            return RevisionInfo(branch, rev + 1)
 
724
 
717
725
 
718
726
 
719
727
class RevisionSpec_ancestor(RevisionSpec):
749
757
    def _find_revision_info(branch, other_location):
750
758
        revision_id = RevisionSpec_ancestor._find_revision_id(branch,
751
759
                                                              other_location)
752
 
        return RevisionInfo(branch, None, revision_id)
 
760
        try:
 
761
            revno = branch.revision_id_to_revno(revision_id)
 
762
        except errors.NoSuchRevision:
 
763
            revno = None
 
764
        return RevisionInfo(branch, revno, revision_id)
753
765
 
754
766
    @staticmethod
755
767
    def _find_revision_id(branch, other_location):
756
 
        from .branch import Branch
 
768
        from bzrlib.branch import Branch
757
769
 
758
 
        with branch.lock_read():
 
770
        branch.lock_read()
 
771
        try:
759
772
            revision_a = revision.ensure_null(branch.last_revision())
760
773
            if revision_a == revision.NULL_REVISION:
761
774
                raise errors.NoCommits(branch)
762
775
            if other_location == '':
763
776
                other_location = branch.get_parent()
764
777
            other_branch = Branch.open(other_location)
765
 
            with other_branch.lock_read():
 
778
            other_branch.lock_read()
 
779
            try:
766
780
                revision_b = revision.ensure_null(other_branch.last_revision())
767
781
                if revision_b == revision.NULL_REVISION:
768
782
                    raise errors.NoCommits(other_branch)
769
783
                graph = branch.repository.get_graph(other_branch.repository)
770
784
                rev_id = graph.find_unique_lca(revision_a, revision_b)
 
785
            finally:
 
786
                other_branch.unlock()
771
787
            if rev_id == revision.NULL_REVISION:
772
788
                raise errors.NoCommonAncestor(revision_a, revision_b)
773
789
            return rev_id
 
790
        finally:
 
791
            branch.unlock()
 
792
 
 
793
 
774
794
 
775
795
 
776
796
class RevisionSpec_branch(RevisionSpec):
788
808
    dwim_catchable_exceptions = (errors.NotBranchError,)
789
809
 
790
810
    def _match_on(self, branch, revs):
791
 
        from .branch import Branch
 
811
        from bzrlib.branch import Branch
792
812
        other_branch = Branch.open(self.spec)
793
813
        revision_b = other_branch.last_revision()
794
814
        if revision_b in (None, revision.NULL_REVISION):
795
815
            raise errors.NoCommits(other_branch)
796
 
        if branch is None:
797
 
            branch = other_branch
798
 
        else:
799
 
            try:
800
 
                # pull in the remote revisions so we can diff
801
 
                branch.fetch(other_branch, revision_b)
802
 
            except errors.ReadOnlyError:
803
 
                branch = other_branch
804
 
        return RevisionInfo(branch, None, revision_b)
 
816
        # pull in the remote revisions so we can diff
 
817
        branch.fetch(other_branch, revision_b)
 
818
        try:
 
819
            revno = branch.revision_id_to_revno(revision_b)
 
820
        except errors.NoSuchRevision:
 
821
            revno = None
 
822
        return RevisionInfo(branch, revno, revision_b)
805
823
 
806
824
    def _as_revision_id(self, context_branch):
807
 
        from .branch import Branch
 
825
        from bzrlib.branch import Branch
808
826
        other_branch = Branch.open(self.spec)
809
827
        last_revision = other_branch.last_revision()
810
828
        last_revision = revision.ensure_null(last_revision)
814
832
        return last_revision
815
833
 
816
834
    def _as_tree(self, context_branch):
817
 
        from .branch import Branch
 
835
        from bzrlib.branch import Branch
818
836
        other_branch = Branch.open(self.spec)
819
837
        last_revision = other_branch.last_revision()
820
838
        last_revision = revision.ensure_null(last_revision)
822
840
            raise errors.NoCommits(other_branch)
823
841
        return other_branch.repository.revision_tree(last_revision)
824
842
 
825
 
    def needs_branch(self):
826
 
        return False
827
 
 
828
 
    def get_branch(self):
829
 
        return self.spec
830
843
 
831
844
 
832
845
class RevisionSpec_submit(RevisionSpec_ancestor):
858
871
            location_type = 'parent branch'
859
872
        if submit_location is None:
860
873
            raise errors.NoSubmitBranch(branch)
861
 
        trace.note(gettext('Using {0} {1}').format(location_type,
862
 
                                                   submit_location))
 
874
        trace.note('Using %s %s', location_type, submit_location)
863
875
        return submit_location
864
876
 
865
877
    def _match_on(self, branch, revs):
866
878
        trace.mutter('matching ancestor: on: %s, %s', self.spec, branch)
867
879
        return self._find_revision_info(branch,
868
 
                                        self._get_submit_location(branch))
 
880
            self._get_submit_location(branch))
869
881
 
870
882
    def _as_revision_id(self, context_branch):
871
883
        return self._find_revision_id(context_branch,
872
 
                                      self._get_submit_location(context_branch))
873
 
 
874
 
 
875
 
class RevisionSpec_annotate(RevisionIDSpec):
876
 
 
877
 
    prefix = 'annotate:'
878
 
 
879
 
    help_txt = """Select the revision that last modified the specified line.
880
 
 
881
 
    Select the revision that last modified the specified line.  Line is
882
 
    specified as path:number.  Path is a relative path to the file.  Numbers
883
 
    start at 1, and are relative to the current version, not the last-
884
 
    committed version of the file.
885
 
    """
886
 
 
887
 
    def _raise_invalid(self, numstring, context_branch):
888
 
        raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
889
 
                                         'No such line: %s' % numstring)
890
 
 
891
 
    def _as_revision_id(self, context_branch):
892
 
        path, numstring = self.spec.rsplit(':', 1)
893
 
        try:
894
 
            index = int(numstring) - 1
895
 
        except ValueError:
896
 
            self._raise_invalid(numstring, context_branch)
897
 
        tree, file_path = workingtree.WorkingTree.open_containing(path)
898
 
        with tree.lock_read():
899
 
            if not tree.has_filename(file_path):
900
 
                raise errors.InvalidRevisionSpec(self.user_spec,
901
 
                                                 context_branch, "File '%s' is not versioned." %
902
 
                                                 file_path)
903
 
            revision_ids = [r for (r, l) in tree.annotate_iter(file_path)]
904
 
        try:
905
 
            revision_id = revision_ids[index]
906
 
        except IndexError:
907
 
            self._raise_invalid(numstring, context_branch)
908
 
        if revision_id == revision.CURRENT_REVISION:
909
 
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch,
910
 
                                             'Line %s has not been committed.' % numstring)
911
 
        return revision_id
912
 
 
913
 
 
914
 
class RevisionSpec_mainline(RevisionIDSpec):
915
 
 
916
 
    help_txt = """Select mainline revision that merged the specified revision.
917
 
 
918
 
    Select the revision that merged the specified revision into mainline.
919
 
    """
920
 
 
921
 
    prefix = 'mainline:'
922
 
 
923
 
    def _as_revision_id(self, context_branch):
924
 
        revspec = RevisionSpec.from_string(self.spec)
925
 
        if revspec.get_branch() is None:
926
 
            spec_branch = context_branch
927
 
        else:
928
 
            spec_branch = _mod_branch.Branch.open(revspec.get_branch())
929
 
        revision_id = revspec.as_revision_id(spec_branch)
930
 
        graph = context_branch.repository.get_graph()
931
 
        result = graph.find_lefthand_merger(revision_id,
932
 
                                            context_branch.last_revision())
933
 
        if result is None:
934
 
            raise errors.InvalidRevisionSpec(self.user_spec, context_branch)
935
 
        return result
 
884
            self._get_submit_location(context_branch))
936
885
 
937
886
 
938
887
# The order in which we want to DWIM a revision spec without any prefix.
939
888
# revno is always tried first and isn't listed here, this is used by
940
889
# RevisionSpec_dwim._match_on
941
 
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_tag)
942
 
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_revid)
943
 
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_date)
944
 
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_branch)
 
890
dwim_revspecs = [
 
891
    RevisionSpec_tag, # Let's try for a tag
 
892
    RevisionSpec_revid, # Maybe it's a revid?
 
893
    RevisionSpec_date, # Perhaps a date?
 
894
    RevisionSpec_branch, # OK, last try, maybe it's a branch
 
895
    ]
 
896
 
945
897
 
946
898
revspec_registry = registry.Registry()
947
 
 
948
 
 
949
899
def _register_revspec(revspec):
950
900
    revspec_registry.register(revspec.prefix, revspec)
951
901
 
952
 
 
953
902
_register_revspec(RevisionSpec_revno)
954
903
_register_revspec(RevisionSpec_revid)
955
904
_register_revspec(RevisionSpec_last)
959
908
_register_revspec(RevisionSpec_ancestor)
960
909
_register_revspec(RevisionSpec_branch)
961
910
_register_revspec(RevisionSpec_submit)
962
 
_register_revspec(RevisionSpec_annotate)
963
 
_register_revspec(RevisionSpec_mainline)
 
911
 
 
912
# classes in this list should have a "prefix" attribute, against which
 
913
# string specs are matched
 
914
SPEC_TYPES = symbol_versioning.deprecated_list(
 
915
    symbol_versioning.deprecated_in((1, 12, 0)), "SPEC_TYPES", [])