← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] jam-integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
# TODO: build_working_dir can be built on something simpler than merge()
17
18
 
18
19
import os
19
 
import tempfile
20
 
import shutil
21
20
import errno
22
21
 
23
 
import bzrlib.osutils
24
 
import bzrlib.revision
25
 
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
 
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
27
 
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
 
22
import bzrlib
 
23
from bzrlib._changeset import generate_changeset, ExceptionConflictHandler
 
24
from bzrlib._changeset import Inventory, Diff3Merge, ReplaceContents
 
25
from bzrlib._merge_core import WeaveMerge
 
26
from bzrlib._merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
28
27
from bzrlib.branch import Branch
29
 
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
 
from bzrlib.errors import NoCommits
31
28
from bzrlib.delta import compare_trees
 
29
from bzrlib.errors import (BzrCommandError,
 
30
                           BzrError,
 
31
                           NoCommonAncestor,
 
32
                           NoCommits,
 
33
                           NoSuchRevision,
 
34
                           NotBranchError,
 
35
                           NotVersionedError,
 
36
                           UnrelatedBranches,
 
37
                           WorkingTreeNotRevision,
 
38
                           )
 
39
from bzrlib.fetch import greedy_fetch, fetch
 
40
import bzrlib.osutils
 
41
from bzrlib.osutils import rename, pathjoin
 
42
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
32
43
from bzrlib.trace import mutter, warning, note
33
 
from bzrlib.fetch import greedy_fetch, fetch
34
 
from bzrlib.revision import is_ancestor
35
 
from bzrlib.osutils import rename
36
 
from bzrlib.revision import common_ancestor, MultipleRevisionSources
37
 
from bzrlib.errors import NoSuchRevision
38
 
 
39
 
# TODO: build_working_dir can be built on something simpler than merge()
40
 
 
41
 
# FIXME: merge() parameters seem oriented towards the command line
42
 
# NOTABUG: merge is a helper for commandline functions.  merge_inner is the
43
 
#          the core functionality.
 
44
from bzrlib.workingtree import WorkingTree
 
45
 
 
46
# TODO: Report back as changes are merged in
44
47
 
45
48
# comments from abentley on irc: merge happens in two stages, each
46
49
# of which generates a changeset object
48
51
# stage 1: generate OLD->OTHER,
49
52
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
50
53
 
51
 
class MergeConflictHandler(ExceptionConflictHandler):
 
54
class _MergeConflictHandler(ExceptionConflictHandler):
52
55
    """Handle conflicts encountered while merging.
53
56
 
54
57
    This subclasses ExceptionConflictHandler, so that any types of
83
86
        for line in lines:
84
87
            d_file.write(line)
85
88
 
86
 
    def add_suffix(self, name, suffix, last_new_name=None):
 
89
    def add_suffix(self, name, suffix, last_new_name=None, fix_inventory=True):
87
90
        """Rename a file to append a suffix.  If the new name exists, the
88
91
        suffix is added repeatedly until a non-existant name is found
89
92
 
96
99
        new_name = last_new_name+suffix
97
100
        try:
98
101
            rename(name, new_name)
99
 
            return new_name
 
102
            if fix_inventory is True:
 
103
                try:
 
104
                    relpath = self.this_tree.relpath(name)
 
105
                except NotBranchError:
 
106
                    relpath = None
 
107
                if relpath is not None:
 
108
                    file_id = self.this_tree.path2id(relpath)
 
109
                    if file_id is not None:
 
110
                        new_path = self.this_tree.relpath(new_name)
 
111
                        rename(new_name, name)
 
112
                        self.this_tree.rename_one(relpath, new_path)
 
113
                        assert self.this_tree.id2path(file_id) == new_path
100
114
        except OSError, e:
101
115
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
102
116
                raise
103
 
            return self.add_suffix(name, suffix, last_new_name=new_name)
 
117
            return self.add_suffix(name, suffix, last_new_name=new_name, 
 
118
                                   fix_inventory=fix_inventory)
 
119
        return new_name
104
120
 
105
121
    def conflict(self, text):
106
122
        warning(text)
116
132
        :param base_path: Path to the file text for the BASE tree
117
133
        :param other_path: Path to the file text for the OTHER tree
118
134
        """
119
 
        self.add_suffix(this_path, ".THIS")
 
135
        self.add_suffix(this_path, ".THIS", fix_inventory=False)
120
136
        self.dump(base_lines, this_path+".BASE")
121
137
        self.dump(other_lines, this_path+".OTHER")
122
138
        rename(new_file, this_path)
123
139
        self.conflict("Diff3 conflict encountered in %s" % this_path)
124
140
 
 
141
    def weave_merge_conflict(self, filename, weave, other_i, out_file):
 
142
        """
 
143
        Handle weave conflicts by producing a .THIS, and .OTHER.  The
 
144
        main file will be a version with diff3-style conflicts.
 
145
        """
 
146
        self.add_suffix(filename, ".THIS", fix_inventory=False)
 
147
        out_file.commit()
 
148
        self.dump(weave.get_iter(other_i), filename+".OTHER")
 
149
        self.conflict("Text conflict encountered in %s" % filename)
 
150
 
125
151
    def new_contents_conflict(self, filename, other_contents):
126
152
        """Conflicting contents for newly added file."""
127
 
        self.copy(other_contents, filename + ".OTHER")
 
153
        other_contents(filename + ".OTHER", self, False)
128
154
        self.conflict("Conflict in newly added file %s" % filename)
129
155
    
130
156
 
140
166
        return "skip"
141
167
 
142
168
    def rem_contents_conflict(self, filename, this_contents, base_contents):
143
 
        base_contents(filename+".BASE", self, False)
144
 
        this_contents(filename+".THIS", self, False)
145
 
        return ReplaceContents(this_contents, None)
146
 
 
147
 
    def rem_contents_conflict(self, filename, this_contents, base_contents):
148
 
        base_contents(filename+".BASE", self, False)
149
 
        this_contents(filename+".THIS", self, False)
 
169
        base_contents(filename+".BASE", self)
 
170
        this_contents(filename+".THIS", self)
150
171
        self.conflict("Other branch deleted locally modified file %s" %
151
172
                      filename)
152
173
        return ReplaceContents(this_contents, None)
153
174
 
154
175
    def abs_this_path(self, file_id):
155
176
        """Return the absolute path for a file_id in the this tree."""
156
 
        relpath = self.this_tree.id2path(file_id)
157
 
        return self.this_tree.tree.abspath(relpath)
 
177
        return self.this_tree.id2abspath(file_id)
158
178
 
159
179
    def add_missing_parents(self, file_id, tree):
160
180
        """If some of the parents for file_id are missing, add them."""
161
 
        entry = tree.tree.inventory[file_id]
 
181
        entry = tree.inventory[file_id]
162
182
        if entry.parent_id not in self.this_tree:
163
183
            return self.create_all_missing(entry.parent_id, tree)
164
184
        else:
166
186
 
167
187
    def create_all_missing(self, file_id, tree):
168
188
        """Add contents for a file_id and all its parents to a tree."""
169
 
        entry = tree.tree.inventory[file_id]
 
189
        entry = tree.inventory[file_id]
170
190
        if entry.parent_id is not None and entry.parent_id not in self.this_tree:
171
191
            abspath = self.create_all_missing(entry.parent_id, tree)
172
192
        else:
173
193
            abspath = self.abs_this_path(entry.parent_id)
174
 
        entry_path = os.path.join(abspath, entry.name)
 
194
        entry_path = pathjoin(abspath, entry.name)
175
195
        if not os.path.isdir(entry_path):
176
196
            self.create(file_id, entry_path, tree)
177
197
        return entry_path
178
198
 
179
 
    def create(self, file_id, path, tree, reverse=False):
 
199
    def create(self, file_id, path, tree):
180
200
        """Uses tree data to create a filesystem object for the file_id"""
181
 
        from merge_core import get_id_contents
182
 
        get_id_contents(file_id, tree)(path, self, reverse)
 
201
        from bzrlib._changeset import get_contents
 
202
        get_contents(tree, file_id)(path, self)
183
203
 
184
204
    def missing_for_merge(self, file_id, other_path):
185
205
        """The file_id doesn't exist in THIS, but does in OTHER and BASE"""
186
206
        self.conflict("Other branch modified locally deleted file %s" %
187
207
                      other_path)
188
208
        parent_dir = self.add_missing_parents(file_id, self.other_tree)
189
 
        stem = os.path.join(parent_dir, os.path.basename(other_path))
 
209
        stem = pathjoin(parent_dir, os.path.basename(other_path))
190
210
        self.create(file_id, stem+".OTHER", self.other_tree)
191
211
        self.create(file_id, stem+".BASE", self.base_tree)
192
212
 
 
213
    def threeway_contents_conflict(filename, this_contents, base_contents,
 
214
                                   other_contents):
 
215
        self.conflict("Three-way conflict merging %s" % filename)
 
216
 
193
217
    def finalize(self):
194
 
        if not self.ignore_zero:
195
 
            note("%d conflicts encountered.\n" % self.conflicts)
196
 
            
197
 
def get_tree(treespec, temp_root, label, local_branch=None):
 
218
        if self.conflicts == 0:
 
219
            if not self.ignore_zero:
 
220
                note("All changes applied successfully.")
 
221
        else:
 
222
            note("%d conflicts encountered." % self.conflicts)
 
223
 
 
224
def _get_tree(treespec, local_branch=None):
198
225
    location, revno = treespec
199
 
    branch = Branch.open_containing(location)
 
226
    branch = Branch.open_containing(location)[0]
200
227
    if revno is None:
201
228
        revision = None
202
229
    elif revno == -1:
203
230
        revision = branch.last_revision()
204
231
    else:
205
232
        revision = branch.get_rev_id(revno)
206
 
    return branch, get_revid_tree(branch, revision, temp_root, label,
207
 
                                  local_branch)
208
 
 
209
 
def get_revid_tree(branch, revision, temp_root, label, local_branch):
 
233
        if revision is None:
 
234
            revision = NULL_REVISION
 
235
    return branch, _get_revid_tree(branch, revision, local_branch)
 
236
 
 
237
 
 
238
def _get_revid_tree(branch, revision, local_branch):
210
239
    if revision is None:
211
240
        base_tree = branch.working_tree()
212
241
    else:
213
242
        if local_branch is not None:
214
 
            greedy_fetch(local_branch, branch, revision)
215
 
            base_tree = local_branch.revision_tree(revision)
216
 
        else:
217
 
            base_tree = branch.revision_tree(revision)
218
 
    temp_path = os.path.join(temp_root, label)
219
 
    os.mkdir(temp_path)
220
 
    return MergeTree(base_tree, temp_path)
221
 
 
222
 
 
223
 
def file_exists(tree, file_id):
224
 
    return tree.has_filename(tree.id2path(file_id))
225
 
    
226
 
 
227
 
class MergeTree(object):
228
 
    def __init__(self, tree, tempdir):
229
 
        object.__init__(self)
230
 
        if hasattr(tree, "basedir"):
231
 
            self.root = tree.basedir
232
 
        else:
233
 
            self.root = None
234
 
        self.tree = tree
235
 
        self.tempdir = tempdir
236
 
        os.mkdir(os.path.join(self.tempdir, "texts"))
237
 
        os.mkdir(os.path.join(self.tempdir, "symlinks"))
238
 
        self.cached = {}
239
 
 
240
 
    def __iter__(self):
241
 
        return self.tree.__iter__()
242
 
 
243
 
    def __contains__(self, file_id):
244
 
        return file_id in self.tree
245
 
 
246
 
    def get_file(self, file_id):
247
 
        return self.tree.get_file(file_id)
248
 
 
249
 
    def get_file_sha1(self, id):
250
 
        return self.tree.get_file_sha1(id)
251
 
 
252
 
    def is_executable(self, id):
253
 
        return self.tree.is_executable(id)
254
 
 
255
 
    def id2path(self, file_id):
256
 
        return self.tree.id2path(file_id)
257
 
 
258
 
    def has_id(self, file_id):
259
 
        return self.tree.has_id(file_id)
260
 
 
261
 
    def has_or_had_id(self, file_id):
262
 
        if file_id == self.tree.inventory.root.file_id:
263
 
            return True
264
 
        return self.tree.inventory.has_id(file_id)
265
 
 
266
 
    def has_or_had_id(self, file_id):
267
 
        if file_id == self.tree.inventory.root.file_id:
268
 
            return True
269
 
        return self.tree.inventory.has_id(file_id)
270
 
 
271
 
    def readonly_path(self, id):
272
 
        if id not in self.tree:
273
 
            return None
274
 
        if self.root is not None:
275
 
            return self.tree.abspath(self.tree.id2path(id))
276
 
        else:
277
 
            kind = self.tree.inventory[id].kind
278
 
            if kind in ("directory", "root_directory"):
279
 
                return self.tempdir
280
 
            if not self.cached.has_key(id):
281
 
                if kind == "file":
282
 
                    path = os.path.join(self.tempdir, "texts", id)
283
 
                    outfile = file(path, "wb")
284
 
                    outfile.write(self.tree.get_file(id).read())
285
 
                    assert(bzrlib.osutils.lexists(path))
286
 
                    if self.tree.is_executable(id):
287
 
                        os.chmod(path, 0755)
288
 
                else:
289
 
                    assert kind == "symlink"
290
 
                    path = os.path.join(self.tempdir, "symlinks", id)
291
 
                    target = self.tree.get_symlink_target(id)
292
 
                    os.symlink(target, path)
293
 
                self.cached[id] = path
294
 
            return self.cached[id]
 
243
            if local_branch.base != branch.base:
 
244
                greedy_fetch(local_branch, branch, revision)
 
245
            base_tree = local_branch.repository.revision_tree(revision)
 
246
        else:
 
247
            base_tree = branch.repository.revision_tree(revision)
 
248
    return base_tree
295
249
 
296
250
 
297
251
def build_working_dir(to_dir):
304
258
    eventually be done by just building the tree directly calling into 
305
259
    lower-level code (e.g. constructing a changeset).
306
260
    """
307
 
    merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
308
 
          check_clean=False, ignore_zero=True)
309
 
 
310
 
 
311
 
def merge(other_revision, base_revision,
312
 
          check_clean=True, ignore_zero=False,
313
 
          this_dir=None, backup_files=False, merge_type=ApplyMerge3,
314
 
          file_list=None):
315
 
    """Merge changes into a tree.
316
 
 
317
 
    base_revision
318
 
        tuple(path, revision) Base for three-way merge.
319
 
    other_revision
320
 
        tuple(path, revision) Other revision for three-way merge.
321
 
    this_dir
322
 
        Directory to merge changes into; '.' by default.
323
 
    check_clean
324
 
        If true, this_dir must have no uncommitted changes before the
325
 
        merge begins.
326
 
    ignore_zero - If true, suppress the "zero conflicts" message when 
327
 
        there are no conflicts; should be set when doing something we expect
328
 
        to complete perfectly.
329
 
 
330
 
    All available ancestors of other_revision and base_revision are
331
 
    automatically pulled into the branch.
332
 
    """
333
 
    tempdir = tempfile.mkdtemp(prefix="bzr-")
334
 
    try:
335
 
        if this_dir is None:
336
 
            this_dir = '.'
337
 
        this_branch = Branch.open_containing(this_dir)
338
 
        this_rev_id = this_branch.last_revision()
339
 
        if this_rev_id is None:
 
261
    # RBC 20051019 is this not just 'export' ?
 
262
    # AB Well, export doesn't take care of inventory...
 
263
    this_branch = Branch.open_containing(to_dir)[0]
 
264
    transform_tree(this_branch.working_tree(), this_branch.basis_tree())
 
265
 
 
266
 
 
267
def transform_tree(from_tree, to_tree, interesting_ids=None):
 
268
    merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
 
269
                interesting_ids=interesting_ids)
 
270
 
 
271
 
 
272
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
 
273
                backup_files=False, 
 
274
                merge_type=ApplyMerge3, 
 
275
                interesting_ids=None, 
 
276
                show_base=False, 
 
277
                reprocess=False, 
 
278
                other_rev_id=None,
 
279
                interesting_files=None,
 
280
                this_tree=None):
 
281
    """Primary interface for merging. 
 
282
 
 
283
        typical use is probably 
 
284
        'merge_inner(branch, branch.get_revision_tree(other_revision),
 
285
                     branch.get_revision_tree(base_revision))'
 
286
        """
 
287
    if this_tree is None:
 
288
        this_tree = this_branch.working_tree()
 
289
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree)
 
290
    merger.backup_files = backup_files
 
291
    merger.merge_type = merge_type
 
292
    merger.interesting_ids = interesting_ids
 
293
    if interesting_files:
 
294
        assert not interesting_ids, ('Only supply interesting_ids'
 
295
                                     ' or interesting_files')
 
296
        merger._set_interesting_files(interesting_files)
 
297
    merger.show_base = show_base 
 
298
    merger.reprocess = reprocess
 
299
    merger.conflict_handler = _MergeConflictHandler(merger.this_tree, 
 
300
                                                    base_tree, other_tree,
 
301
                                                    ignore_zero=ignore_zero)
 
302
    merger.other_rev_id = other_rev_id
 
303
    merger.other_basis = other_rev_id
 
304
    return merger.do_merge()
 
305
 
 
306
 
 
307
class Merger(object):
 
308
    def __init__(self, this_branch, other_tree=None, base_tree=None, this_tree=None):
 
309
        object.__init__(self)
 
310
        assert this_tree is not None, "this_tree is required"
 
311
        self.this_branch = this_branch
 
312
        self.this_basis = this_branch.last_revision()
 
313
        self.this_rev_id = None
 
314
        self.this_tree = this_tree
 
315
        self.this_revision_tree = None
 
316
        self.this_basis_tree = None
 
317
        self.other_tree = other_tree
 
318
        self.base_tree = base_tree
 
319
        self.ignore_zero = False
 
320
        self.backup_files = False
 
321
        self.interesting_ids = None
 
322
        self.show_base = False
 
323
        self.reprocess = False
 
324
        self.conflict_handler = _MergeConflictHandler(self.this_tree, 
 
325
                                                      base_tree, other_tree)
 
326
 
 
327
    def revision_tree(self, revision_id):
 
328
        return self.this_branch.repository.revision_tree(revision_id)
 
329
 
 
330
    def ensure_revision_trees(self):
 
331
        if self.this_revision_tree is None:
 
332
            self.this_basis_tree = self.this_branch.repository.revision_tree(
 
333
                self.this_basis)
 
334
            if self.this_basis == self.this_rev_id:
 
335
                self.this_revision_tree = self.this_basis_tree
 
336
 
 
337
        if self.other_rev_id is None:
 
338
            other_basis_tree = self.revision_tree(self.other_basis)
 
339
            changes = compare_trees(self.other_tree, other_basis_tree)
 
340
            if changes.has_changed():
 
341
                raise WorkingTreeNotRevision(self.this_tree)
 
342
            other_rev_id = other_basis
 
343
            self.other_tree = other_basis_tree
 
344
 
 
345
    def file_revisions(self, file_id):
 
346
        self.ensure_revision_trees()
 
347
        def get_id(tree, file_id):
 
348
            revision_id = tree.inventory[file_id].revision
 
349
            assert revision_id is not None
 
350
            return revision_id
 
351
        if self.this_rev_id is None:
 
352
            if self.this_basis_tree.get_file_sha1(file_id) != \
 
353
                self.this_tree.get_file_sha1(file_id):
 
354
                raise WorkingTreeNotRevision(self.this_tree)
 
355
 
 
356
        trees = (self.this_basis_tree, self.other_tree)
 
357
        return [get_id(tree, file_id) for tree in trees]
 
358
 
 
359
    def merge_factory(self, file_id, base, other):
 
360
        if self.merge_type.history_based:
 
361
            if self.show_base is True:
 
362
                raise BzrError("Cannot show base for hisory-based merges")
 
363
            if self.reprocess is True:
 
364
                raise BzrError("Cannot reprocess history-based merges")
 
365
                
 
366
            t_revid, o_revid = self.file_revisions(file_id)
 
367
            weave = self.this_basis_tree.get_weave(file_id)
 
368
            contents_change = self.merge_type(weave, t_revid, o_revid)
 
369
        else:
 
370
            if self.show_base is True or self.reprocess is True:
 
371
                contents_change = self.merge_type(file_id, base, other, 
 
372
                                                  show_base=self.show_base, 
 
373
                                                  reprocess=self.reprocess)
 
374
            else:
 
375
                contents_change = self.merge_type(file_id, base, other)
 
376
        if self.backup_files:
 
377
            contents_change = BackupBeforeChange(contents_change)
 
378
        return contents_change
 
379
 
 
380
    def check_basis(self, check_clean):
 
381
        if self.this_basis is None:
340
382
            raise BzrCommandError("This branch has no commits")
341
383
        if check_clean:
342
 
            changes = compare_trees(this_branch.working_tree(), 
343
 
                                    this_branch.basis_tree(), False)
344
 
            if changes.has_changed():
 
384
            self.compare_basis()
 
385
            if self.this_basis != self.this_rev_id:
345
386
                raise BzrCommandError("Working tree has uncommitted changes.")
346
 
        other_branch, other_tree = get_tree(other_revision, tempdir, "other",
347
 
                                            this_branch)
 
387
 
 
388
    def compare_basis(self):
 
389
        changes = compare_trees(self.this_tree, 
 
390
                                self.this_branch.basis_tree(), False)
 
391
        if not changes.has_changed():
 
392
            self.this_rev_id = self.this_basis
 
393
 
 
394
    def set_interesting_files(self, file_list):
 
395
        try:
 
396
            self._set_interesting_files(file_list)
 
397
        except NotVersionedError, e:
 
398
            raise BzrCommandError("%s is not a source file in any"
 
399
                                      " tree." % e.path)
 
400
 
 
401
    def _set_interesting_files(self, file_list):
 
402
        """Set the list of interesting ids from a list of files."""
 
403
        if file_list is None:
 
404
            self.interesting_ids = None
 
405
            return
 
406
 
 
407
        interesting_ids = set()
 
408
        for path in file_list:
 
409
            found_id = False
 
410
            for tree in (self.this_tree, self.base_tree, self.other_tree):
 
411
                file_id = tree.inventory.path2id(path)
 
412
                if file_id is not None:
 
413
                    interesting_ids.add(file_id)
 
414
                    found_id = True
 
415
            if not found_id:
 
416
                raise NotVersionedError(path=path)
 
417
        self.interesting_ids = interesting_ids
 
418
 
 
419
    def set_pending(self):
 
420
        if not self.base_is_ancestor:
 
421
            return
 
422
        if self.other_rev_id is None:
 
423
            return
 
424
        ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
 
425
        if self.other_rev_id in ancestry:
 
426
            return
 
427
        self.this_tree.add_pending_merge(self.other_rev_id)
 
428
 
 
429
    def set_other(self, other_revision):
 
430
        other_branch, self.other_tree = _get_tree(other_revision, 
 
431
                                                  self.this_branch)
348
432
        if other_revision[1] == -1:
349
 
            other_rev_id = other_branch.last_revision()
350
 
            if other_rev_id is None:
 
433
            self.other_rev_id = other_branch.last_revision()
 
434
            if self.other_rev_id is None:
351
435
                raise NoCommits(other_branch)
352
 
            other_basis = other_rev_id
 
436
            self.other_basis = self.other_rev_id
353
437
        elif other_revision[1] is not None:
354
 
            other_rev_id = other_branch.get_rev_id(other_revision[1])
355
 
            other_basis = other_rev_id
 
438
            self.other_rev_id = other_branch.get_rev_id(other_revision[1])
 
439
            self.other_basis = self.other_rev_id
356
440
        else:
357
 
            other_rev_id = None
358
 
            other_basis = other_branch.last_revision()
359
 
            if other_basis is None:
 
441
            self.other_rev_id = None
 
442
            self.other_basis = other_branch.last_revision()
 
443
            if self.other_basis is None:
360
444
                raise NoCommits(other_branch)
 
445
        if other_branch.base != self.this_branch.base:
 
446
            fetch(from_branch=other_branch, to_branch=self.this_branch, 
 
447
                  last_revision=self.other_basis)
 
448
 
 
449
    def set_base(self, base_revision):
 
450
        mutter("doing merge() with no base_revision specified")
361
451
        if base_revision == [None, None]:
362
452
            try:
363
 
                base_rev_id = common_ancestor(this_rev_id, other_basis, 
364
 
                                              this_branch)
 
453
                self.base_rev_id = common_ancestor(self.this_basis, 
 
454
                                                   self.other_basis, 
 
455
                                                   self.this_branch.repository)
365
456
            except NoCommonAncestor:
366
457
                raise UnrelatedBranches()
367
 
            base_tree = get_revid_tree(this_branch, base_rev_id, tempdir, 
368
 
                                       "base", None)
369
 
            base_is_ancestor = True
 
458
            self.base_tree = _get_revid_tree(self.this_branch, self.base_rev_id,
 
459
                                            None)
 
460
            self.base_is_ancestor = True
370
461
        else:
371
 
            base_branch, base_tree = get_tree(base_revision, tempdir, "base")
 
462
            base_branch, self.base_tree = _get_tree(base_revision)
372
463
            if base_revision[1] == -1:
373
 
                base_rev_id = base_branch.last_revision()
 
464
                self.base_rev_id = base_branch.last_revision()
374
465
            elif base_revision[1] is None:
375
 
                base_rev_id = None
376
 
            else:
377
 
                base_rev_id = base_branch.get_rev_id(base_revision[1])
378
 
            fetch(from_branch=base_branch, to_branch=this_branch)
379
 
            base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
380
 
                                           this_branch)
381
 
        if file_list is None:
382
 
            interesting_ids = None
383
 
        else:
384
 
            interesting_ids = set()
385
 
            this_tree = this_branch.working_tree()
386
 
            for fname in file_list:
387
 
                path = this_branch.relpath(fname)
388
 
                found_id = False
389
 
                for tree in (this_tree, base_tree.tree, other_tree.tree):
390
 
                    file_id = tree.inventory.path2id(path)
391
 
                    if file_id is not None:
392
 
                        interesting_ids.add(file_id)
393
 
                        found_id = True
394
 
                if not found_id:
395
 
                    raise BzrCommandError("%s is not a source file in any"
396
 
                                          " tree." % fname)
397
 
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
398
 
                    ignore_zero=ignore_zero, backup_files=backup_files, 
399
 
                    merge_type=merge_type, interesting_ids=interesting_ids)
400
 
        if base_is_ancestor and other_rev_id is not None\
401
 
            and other_rev_id not in this_branch.revision_history():
402
 
            this_branch.add_pending_merge(other_rev_id)
403
 
    finally:
404
 
        shutil.rmtree(tempdir)
405
 
 
406
 
 
407
 
def set_interesting(inventory_a, inventory_b, interesting_ids):
408
 
    """Mark files whose ids are in interesting_ids as interesting
409
 
    """
410
 
    for inventory in (inventory_a, inventory_b):
411
 
        for path, source_file in inventory.iteritems():
412
 
             source_file.interesting = source_file.id in interesting_ids
413
 
 
414
 
 
415
 
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
416
 
                ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
417
 
                interesting_ids=None):
418
 
 
419
 
    def merge_factory(file_id, base, other):
420
 
        contents_change = merge_type(file_id, base, other)
421
 
        if backup_files:
422
 
            contents_change = BackupBeforeChange(contents_change)
423
 
        return contents_change
424
 
 
425
 
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
426
 
 
427
 
    def get_inventory(tree):
428
 
        return tree.tree.inventory
429
 
 
430
 
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
431
 
                             generate_changeset, get_inventory,
432
 
                             MergeConflictHandler(this_tree, base_tree,
433
 
                             other_tree, ignore_zero=ignore_zero),
434
 
                             merge_factory=merge_factory, 
435
 
                             interesting_ids=interesting_ids)
436
 
 
437
 
    adjust_ids = []
438
 
    for id, path in inv_changes.iteritems():
439
 
        if path is not None:
440
 
            if path == '.':
441
 
                path = ''
442
 
            else:
443
 
                assert path.startswith('.' + os.sep), "path is %s" % path
444
 
            path = path[2:]
445
 
        adjust_ids.append((path, id))
446
 
    if len(adjust_ids) > 0:
447
 
        this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
448
 
                                                  adjust_ids))
449
 
 
450
 
 
451
 
def regen_inventory(this_branch, root, new_entries):
452
 
    old_entries = this_branch.read_working_inventory()
453
 
    new_inventory = {}
454
 
    by_path = {}
455
 
    new_entries_map = {} 
456
 
    for path, file_id in new_entries:
457
 
        if path is None:
458
 
            continue
459
 
        new_entries_map[file_id] = path
460
 
 
461
 
    def id2path(file_id):
462
 
        path = new_entries_map.get(file_id)
463
 
        if path is not None:
464
 
            return path
465
 
        entry = old_entries[file_id]
466
 
        if entry.parent_id is None:
467
 
            return entry.name
468
 
        return os.path.join(id2path(entry.parent_id), entry.name)
469
 
        
470
 
    for file_id in old_entries:
471
 
        entry = old_entries[file_id]
472
 
        path = id2path(file_id)
473
 
        new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
474
 
        by_path[path] = file_id
475
 
    
476
 
    deletions = 0
477
 
    insertions = 0
478
 
    new_path_list = []
479
 
    for path, file_id in new_entries:
480
 
        if path is None:
481
 
            del new_inventory[file_id]
482
 
            deletions += 1
483
 
        else:
484
 
            new_path_list.append((path, file_id))
485
 
            if file_id not in old_entries:
486
 
                insertions += 1
487
 
    # Ensure no file is added before its parent
488
 
    new_path_list.sort()
489
 
    for path, file_id in new_path_list:
490
 
        if path == '':
491
 
            parent = None
492
 
        else:
493
 
            parent = by_path[os.path.dirname(path)]
494
 
        kind = bzrlib.osutils.file_kind(os.path.join(root, path))
495
 
        new_inventory[file_id] = (path, file_id, parent, kind)
496
 
        by_path[path] = file_id 
497
 
 
498
 
    # Get a list in insertion order
499
 
    new_inventory_list = new_inventory.values()
500
 
    mutter ("""Inventory regeneration:
501
 
old length: %i insertions: %i deletions: %i new_length: %i"""\
502
 
        % (len(old_entries), insertions, deletions, len(new_inventory_list)))
503
 
    assert len(new_inventory_list) == len(old_entries) + insertions - deletions
504
 
    new_inventory_list.sort()
505
 
    return new_inventory_list
 
466
                self.base_rev_id = None
 
467
            else:
 
468
                self.base_rev_id = base_branch.get_rev_id(base_revision[1])
 
469
            fetch(from_branch=base_branch, to_branch=self.this_branch)
 
470
            self.base_is_ancestor = is_ancestor(self.this_basis, 
 
471
                                                self.base_rev_id,
 
472
                                                self.this_branch)
 
473
 
 
474
    def do_merge(self):
 
475
        def get_inventory(tree):
 
476
            return tree.inventory
 
477
        
 
478
        inv_changes = merge_flex(self.this_tree, self.base_tree, 
 
479
                                 self.other_tree,
 
480
                                 generate_changeset, get_inventory,
 
481
                                 self.conflict_handler,
 
482
                                 merge_factory=self.merge_factory, 
 
483
                                 interesting_ids=self.interesting_ids)
 
484
 
 
485
        adjust_ids = []
 
486
        for id, path in inv_changes.iteritems():
 
487
            if path is not None:
 
488
                if path == u'.':
 
489
                    path = u''
 
490
                else:
 
491
                    assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
 
492
                path = path[2:]
 
493
            adjust_ids.append((path, id))
 
494
        if len(adjust_ids) > 0:
 
495
            self.this_tree.set_inventory(self.regen_inventory(adjust_ids))
 
496
        conflicts = self.conflict_handler.conflicts
 
497
        self.conflict_handler.finalize()
 
498
        return conflicts
 
499
 
 
500
    def regen_inventory(self, new_entries):
 
501
        old_entries = self.this_tree.read_working_inventory()
 
502
        new_inventory = {}
 
503
        by_path = {}
 
504
        new_entries_map = {} 
 
505
        for path, file_id in new_entries:
 
506
            if path is None:
 
507
                continue
 
508
            new_entries_map[file_id] = path
 
509
 
 
510
        def id2path(file_id):
 
511
            path = new_entries_map.get(file_id)
 
512
            if path is not None:
 
513
                return path
 
514
            entry = old_entries[file_id]
 
515
            if entry.parent_id is None:
 
516
                return entry.name
 
517
            return pathjoin(id2path(entry.parent_id), entry.name)
 
518
            
 
519
        for file_id in old_entries:
 
520
            entry = old_entries[file_id]
 
521
            path = id2path(file_id)
 
522
            new_inventory[file_id] = (path, file_id, entry.parent_id, 
 
523
                                      entry.kind)
 
524
            by_path[path] = file_id
 
525
        
 
526
        deletions = 0
 
527
        insertions = 0
 
528
        new_path_list = []
 
529
        for path, file_id in new_entries:
 
530
            if path is None:
 
531
                del new_inventory[file_id]
 
532
                deletions += 1
 
533
            else:
 
534
                new_path_list.append((path, file_id))
 
535
                if file_id not in old_entries:
 
536
                    insertions += 1
 
537
        # Ensure no file is added before its parent
 
538
        new_path_list.sort()
 
539
        for path, file_id in new_path_list:
 
540
            if path == '':
 
541
                parent = None
 
542
            else:
 
543
                parent = by_path[os.path.dirname(path)]
 
544
            abspath = pathjoin(self.this_tree.basedir, path)
 
545
            kind = bzrlib.osutils.file_kind(abspath)
 
546
            new_inventory[file_id] = (path, file_id, parent, kind)
 
547
            by_path[path] = file_id 
 
548
 
 
549
        # Get a list in insertion order
 
550
        new_inventory_list = new_inventory.values()
 
551
        mutter ("""Inventory regeneration:
 
552
    old length: %i insertions: %i deletions: %i new_length: %i"""\
 
553
            % (len(old_entries), insertions, deletions, 
 
554
               len(new_inventory_list)))
 
555
        assert len(new_inventory_list) == len(old_entries) + insertions\
 
556
            - deletions
 
557
        new_inventory_list.sort()
 
558
        return new_inventory_list
 
559
 
506
560
 
507
561
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
508
 
                     "diff3": (Diff3Merge,  "Merge using external diff3")
 
562
                     "diff3": (Diff3Merge,  "Merge using external diff3"),
 
563
                     'weave': (WeaveMerge, "Weave-based merge")
509
564
              }
510