← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-07-07 10:31:36 UTC
  • Revision ID: mbp@sourcefrog.net-20050707103135-9b4d911d8df6e880
- fix pwk help

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
 
from merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
 
1
from merge_core import merge_flex
2
2
from changeset import generate_changeset, ExceptionConflictHandler
3
 
from changeset import Inventory, Diff3Merge
 
3
from changeset import Inventory
4
4
from bzrlib import find_branch
5
5
import bzrlib.osutils
6
6
from bzrlib.errors import BzrCommandError
165
165
 
166
166
def merge(other_revision, base_revision,
167
167
          check_clean=True, ignore_zero=False,
168
 
          this_dir=None, backup_files=False, merge_type=ApplyMerge3):
 
168
          this_dir=None):
169
169
    """Merge changes into a tree.
170
170
 
171
171
    base_revision
201
201
            base_revision = ['.', base_revno]
202
202
        base_branch, base_tree = get_tree(base_revision, tempdir, "base")
203
203
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
204
 
                    ignore_zero=ignore_zero, backup_files=backup_files, 
205
 
                    merge_type=merge_type)
 
204
                    ignore_zero=ignore_zero)
206
205
    finally:
207
206
        shutil.rmtree(tempdir)
208
207
 
232
231
 
233
232
 
234
233
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
235
 
                ignore_zero=False, merge_type=ApplyMerge3, backup_files=False):
236
 
 
237
 
    def merge_factory(base_file, other_file):
238
 
        contents_change = merge_type(base_file, other_file)
239
 
        if backup_files:
240
 
            contents_change = BackupBeforeChange(contents_change)
241
 
        return contents_change
242
 
 
 
234
                ignore_zero=False):
243
235
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
244
236
 
245
237
    def get_inventory(tree):
248
240
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
249
241
                             generate_cset_optimized, get_inventory,
250
242
                             MergeConflictHandler(base_tree.root,
251
 
                                                  ignore_zero=ignore_zero),
252
 
                             merge_factory=merge_factory)
 
243
                                                  ignore_zero=ignore_zero))
253
244
 
254
245
    adjust_ids = []
255
246
    for id, path in inv_changes.iteritems():
303
294
    assert len(new_inventory_list) == len(old_entries) + insertions - deletions
304
295
    new_inventory_list.sort()
305
296
    return new_inventory_list
306
 
 
307
 
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
308
 
                     "diff3": (Diff3Merge,  "Merge using external diff3")
309
 
              }
310