← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-04 02:59:56 UTC
  • mfrom: (1172)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050904025956-776ba4f07de97700
Merged mpool's latest changes (~0.0.7)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
import os
 
18
import os.path
19
19
import tempfile
20
20
import shutil
21
21
import errno
27
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
28
from bzrlib.changeset import Inventory, Diff3Merge
29
29
from bzrlib.branch import find_branch
30
 
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
31
 
from bzrlib.errors import NoCommits
 
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
32
31
from bzrlib.delta import compare_trees
33
32
from bzrlib.trace import mutter, warning
34
33
from bzrlib.fetch import greedy_fetch
47
46
    conflict that are not explicitly handled cause an exception and
48
47
    terminate the merge.
49
48
    """
50
 
    def __init__(self, ignore_zero=False):
51
 
        ExceptionConflictHandler.__init__(self)
 
49
    def __init__(self, dir, ignore_zero=False):
 
50
        ExceptionConflictHandler.__init__(self, dir)
52
51
        self.conflicts = 0
53
52
        self.ignore_zero = ignore_zero
54
53
 
257
256
                                            this_branch)
258
257
        if other_revision[1] == -1:
259
258
            other_rev_id = other_branch.last_patch()
260
 
            if other_rev_id is None:
261
 
                raise NoCommits(other_branch)
262
259
            other_basis = other_rev_id
263
260
        elif other_revision[1] is not None:
264
261
            other_rev_id = other_branch.lookup_revision(other_revision[1])
266
263
        else:
267
264
            other_rev_id = None
268
265
            other_basis = other_branch.last_patch()
269
 
            if other_basis is None:
270
 
                raise NoCommits(other_branch)
271
266
        if base_revision == [None, None]:
272
 
            try:
273
 
                base_rev_id = common_ancestor(this_rev_id, other_basis, 
274
 
                                              this_branch)
275
 
            except NoCommonAncestor:
 
267
            base_rev_id = common_ancestor(this_rev_id, other_basis, 
 
268
                                          this_branch)
 
269
            if base_rev_id is None:
276
270
                raise UnrelatedBranches()
277
271
            base_tree = get_revid_tree(this_branch, base_rev_id, tempdir, 
278
272
                                       "base", None)
310
304
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
311
305
                    ignore_zero=ignore_zero, backup_files=backup_files, 
312
306
                    merge_type=merge_type, interesting_ids=interesting_ids)
313
 
        if base_is_ancestor and other_rev_id is not None\
314
 
            and other_rev_id not in this_branch.revision_history():
 
307
        if base_is_ancestor and other_rev_id is not None:
315
308
            this_branch.add_pending_merge(other_rev_id)
316
309
    finally:
317
310
        shutil.rmtree(tempdir)
352
345
 
353
346
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
354
347
                             generate_cset_optimized, get_inventory,
355
 
                             MergeConflictHandler(ignore_zero=ignore_zero),
 
348
                             MergeConflictHandler(base_tree.root,
 
349
                                                  ignore_zero=ignore_zero),
356
350
                             merge_factory=merge_factory, 
357
351
                             interesting_ids=interesting_ids)
358
352
 
362
356
            if path == '.':
363
357
                path = ''
364
358
            else:
365
 
                assert path.startswith('.' + os.sep), "path is %s" % path
 
359
                assert path.startswith('./'), "path is %s" % path
366
360
            path = path[2:]
367
361
        adjust_ids.append((path, id))
368
362
    if len(adjust_ids) > 0: