/breezy-builder/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-builder/trunk

« back to all changes in this revision

Viewing changes to backports.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-19 14:06:00 UTC
  • Revision ID: jelmer@jelmer.uk-20180519140600-47c7x7j8wka332cx
Port to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
 
16
16
"""Copies/backports features from more recent versions of packages
17
17
 
18
 
This allows bzr-builder to continue to work with older bzrlib and python-debian
 
18
This allows bzr-builder to continue to work with older breezy and python-debian
19
19
versions while using features from newer versions.
20
20
"""
21
21
 
29
29
import re
30
30
import socket
31
31
 
32
 
from bzrlib.merge import (
 
32
from breezy.merge import (
33
33
    Merger,
34
34
    Merge3Merger,
35
35
    )
36
 
from bzrlib import (
 
36
from breezy import (
37
37
    errors,
38
38
    generate_ids,
39
39
    osutils,
42
42
    ui,
43
43
    )
44
44
 
45
 
# Backport of bzrlib.merge.MergeIntoMerger, introduced in bzr 2.2rc1.
 
45
# Backport of breezy.merge.MergeIntoMerger, introduced in bzr 2.2rc1.
46
46
# (Also backports PathNotInTree, _MergeTypeParameterizer, MergeIntoMergeType)
47
47
class PathNotInTree(errors.BzrError):
48
48
 
151
151
        finally:
152
152
            child_pb.finished()
153
153
        if self.change_reporter is not None:
154
 
            from bzrlib import delta
 
154
            from breezy import delta
155
155
            delta.report_changes(
156
156
                self.tt.iter_changes(), self.change_reporter)
157
157
        self.cook_conflicts(fs_conflicts)
158
 
        from bzrlib import trace
 
158
        from breezy import trace
159
159
        for conflict in self.cooked_conflicts:
160
160
            trace.warning(conflict)
161
161