/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 breezy/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repository.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
from breezy.lazy_import import lazy_import
 
19
from .lazy_import import lazy_import
20
20
lazy_import(globals(), """
21
21
import itertools
22
22
import time
39
39
from breezy.i18n import gettext
40
40
""")
41
41
 
42
 
from breezy import (
 
42
from . import (
43
43
    bzrdir,
44
44
    errors,
45
45
    registry,
46
46
    symbol_versioning,
47
47
    ui,
48
48
    )
49
 
from breezy.decorators import needs_read_lock, needs_write_lock, only_raises
50
 
from breezy.inter import InterObject
51
 
from breezy.lock import _RelockDebugMixin, LogicalLockResult
52
 
from breezy.trace import (
 
49
from .decorators import needs_read_lock, needs_write_lock, only_raises
 
50
from .inter import InterObject
 
51
from .lock import _RelockDebugMixin, LogicalLockResult
 
52
from .trace import (
53
53
    log_exception_quietly, note, mutter, mutter_callsite, warning)
54
54
 
55
55
 
280
280
                (self._write_group, self.get_transaction()))
281
281
        try:
282
282
            self._abort_write_group()
283
 
        except Exception, exc:
 
283
        except Exception as exc:
284
284
            self._write_group = None
285
285
            if not suppress_errors:
286
286
                raise
964
964
        try:
965
965
            _iter_for_revno(
966
966
                self, partial_history, stop_index=distance_from_known)
967
 
        except errors.RevisionNotPresent, err:
 
967
        except errors.RevisionNotPresent as err:
968
968
            if err.revision_id == known_revid:
969
969
                # The start revision (known_revid) wasn't found.
970
970
                raise
988
988
    @needs_write_lock
989
989
    def reconcile(self, other=None, thorough=False):
990
990
        """Reconcile this repository."""
991
 
        from breezy.reconcile import RepoReconciler
 
991
        from .reconcile import RepoReconciler
992
992
        reconciler = RepoReconciler(self, thorough=thorough)
993
993
        reconciler.reconcile()
994
994
        return reconciler
1449
1449
        raise NotImplementedError(self.open)
1450
1450
 
1451
1451
    def _run_post_repo_init_hooks(self, repository, controldir, shared):
1452
 
        from breezy.controldir import ControlDir, RepoInitHookParams
 
1452
        from .controldir import ControlDir, RepoInitHookParams
1453
1453
        hooks = ControlDir.hooks['post_repo_init']
1454
1454
        if not hooks:
1455
1455
            return
1694
1694
        try:
1695
1695
            InterRepository._assert_same_model(source, target)
1696
1696
            return True
1697
 
        except errors.IncompatibleRepositories, e:
 
1697
        except errors.IncompatibleRepositories as e:
1698
1698
            return False
1699
1699
 
1700
1700
    @staticmethod