← 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-06 04:45:21 UTC
  • Revision ID: mbp@sourcefrog.net-20050706044521-7dacb2409cf7314c
- don't say runit when running tests under python2.3 dammit

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
80
80
        moved_path = self.add_suffix(target, ".moved")
81
81
        self.conflict("Moved existing %s to %s" % (target, moved_path))
82
82
 
83
 
    def rmdir_non_empty(self, filename):
84
 
        """Handle the case where the dir to be removed still has contents"""
85
 
        self.conflict("Directory %s not removed because it is not empty"\
86
 
            % filename)
87
 
        return "skip"
88
 
 
89
83
    def finalize(self):
90
84
        if not self.ignore_zero:
91
85
            print "%d conflicts encountered.\n" % self.conflicts
127
121
def inventory_map(tree):
128
122
    inventory = {}
129
123
    for file_id in tree.inventory:
 
124
        if not file_exists(tree, file_id):
 
125
            continue
130
126
        path = abspath(tree, file_id)
131
127
        inventory[path] = SourceFile(path, file_id)
132
128
    return inventory
146
142
        self.cached = {}
147
143
 
148
144
    def readonly_path(self, id):
149
 
        if id not in self.tree:
150
 
            return None
151
145
        if self.root is not None:
152
146
            return self.tree.abspath(self.tree.id2path(id))
153
147
        else:
165
159
 
166
160
def merge(other_revision, base_revision,
167
161
          check_clean=True, ignore_zero=False,
168
 
          this_dir=None, backup_files=False, merge_type=ApplyMerge3):
 
162
          this_dir=None):
169
163
    """Merge changes into a tree.
170
164
 
171
165
    base_revision
201
195
            base_revision = ['.', base_revno]
202
196
        base_branch, base_tree = get_tree(base_revision, tempdir, "base")
203
197
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
204
 
                    ignore_zero=ignore_zero, backup_files=backup_files, 
205
 
                    merge_type=merge_type)
 
198
                    ignore_zero=ignore_zero)
206
199
    finally:
207
200
        shutil.rmtree(tempdir)
208
201
 
232
225
 
233
226
 
234
227
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
 
 
 
228
                ignore_zero=False):
243
229
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
244
230
 
245
231
    def get_inventory(tree):
248
234
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
249
235
                             generate_cset_optimized, get_inventory,
250
236
                             MergeConflictHandler(base_tree.root,
251
 
                                                  ignore_zero=ignore_zero),
252
 
                             merge_factory=merge_factory)
 
237
                                                  ignore_zero=ignore_zero))
253
238
 
254
239
    adjust_ids = []
255
240
    for id, path in inv_changes.iteritems():
303
288
    assert len(new_inventory_list) == len(old_entries) + insertions - deletions
304
289
    new_inventory_list.sort()
305
290
    return new_inventory_list
306
 
 
307
 
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
308
 
                     "diff3": (Diff3Merge,  "Merge using external diff3")
309
 
              }
310