← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

PEP8 fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
39
39
from bzrlib.revision import is_ancestor, NULL_REVISION
40
40
from bzrlib.trace import mutter, note
41
41
 
 
42
 
42
43
def _get_tree(treespec, local_branch=None):
43
44
    location, revno = treespec
44
45
    branch = Branch.open_containing(location)[0]
52
53
            revision = NULL_REVISION
53
54
    return branch, _get_revid_tree(branch, revision, local_branch)
54
55
 
 
56
 
55
57
def _get_revid_tree(branch, revision, local_branch):
56
58
    if revision is None:
57
59
        base_tree = branch.working_tree()
146
148
    merger.set_pending()
147
149
    return conflicts
148
150
 
 
151
 
149
152
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
150
153
                backup_files=False, 
151
154
                merge_type=ApplyMerge3, 
207
210
            if self.this_basis == self.this_rev_id:
208
211
                self.this_revision_tree = self.this_basis_tree
209
212
 
210
 
 
211
213
        if self.other_rev_id is None:
212
214
            other_basis_tree = self.revision_tree(self.other_basis)
213
215
            changes = compare_trees(self.other_tree, other_basis_tree)
431
433
        new_inventory_list.sort()
432
434
        return new_inventory_list
433
435
 
 
436
 
434
437
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
435
438
                     "diff3": (Diff3Merge,  "Merge using external diff3"),
436
439
                     'weave': (WeaveMerge, "Weave-based merge")
437
440
              }
438