← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

Whitespace cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
8
8
from bzrlib.atomicfile import AtomicFile
9
9
from changeset import get_contents
10
10
 
 
11
 
11
12
class ApplyMerge3:
 
13
    """Contents-change wrapper around merge3.Merge3"""
 
14
 
12
15
    history_based = False
13
 
    """Contents-change wrapper around merge3.Merge3"""
 
16
 
14
17
    def __init__(self, file_id, base, other, show_base=False, reprocess=False):
15
18
        self.file_id = file_id
16
19
        self.base = base
71
74
            conflict_handler.merge_conflict(new_file, filename, base_lines,
72
75
                                            other_lines)
73
76
 
 
77
 
74
78
class WeaveMerge:
75
79
    """Contents-change wrapper around weave merge"""
 
80
 
76
81
    history_based = True
 
82
 
77
83
    def __init__(self, weave, this_revision_id, other_revision_id):
78
84
        self.weave = weave
79
85
        self.this_revision_id = this_revision_id
112
118
        else:
113
119
            out_file.commit()
114
120
 
 
121
 
115
122
class BackupBeforeChange:
116
123
    """Contents-change wrapper to back up file first"""
 
124
 
117
125
    def __init__(self, contents_change):
118
126
        self.contents_change = contents_change
119
127
 
177
185
 
178
186
    return new_cset
179
187
 
 
188
 
180
189
class ThreeWayConflict(Exception):
181
190
    def __init__(self, this, base, other):
182
191
        self.this = this
185
194
        msg = "Conflict merging %s %s and %s" % (this, base, other)
186
195
        Exception.__init__(self, msg)
187
196
 
 
197
 
188
198
def threeway_select(this, base, other):
189
199
    """Returns a value selected by the three-way algorithm.
190
200
    Raises ThreewayConflict if the algorithm yields a conflict"""
349
359
                to_mode = current_mode & ~0111
350
360
            os.chmod(filename, to_mode)
351
361
 
 
362