← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-09-28 05:25:54 UTC
  • mfrom: (1185.1.42)
  • mto: (1092.2.18)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050928052554-beb985505f77ea6a
update symlink branch to integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
26
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
28
from bzrlib.changeset import Inventory, Diff3Merge
29
 
from bzrlib.branch import find_branch
30
 
from bzrlib.errors import BzrCommandError, UnrelatedBranches
 
29
from bzrlib.branch import Branch
 
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
 
31
from bzrlib.errors import NoCommits
31
32
from bzrlib.delta import compare_trees
32
33
from bzrlib.trace import mutter, warning
33
34
from bzrlib.fetch import greedy_fetch
34
35
from bzrlib.revision import is_ancestor
 
36
from bzrlib.osutils import rename
 
37
 
35
38
 
36
39
# comments from abentley on irc: merge happens in two stages, each
37
40
# of which generates a changeset object
46
49
    conflict that are not explicitly handled cause an exception and
47
50
    terminate the merge.
48
51
    """
49
 
    def __init__(self, dir, ignore_zero=False):
50
 
        ExceptionConflictHandler.__init__(self, dir)
 
52
    def __init__(self, ignore_zero=False):
 
53
        ExceptionConflictHandler.__init__(self)
51
54
        self.conflicts = 0
52
55
        self.ignore_zero = ignore_zero
53
56
 
83
86
            last_new_name = name
84
87
        new_name = last_new_name+suffix
85
88
        try:
86
 
            os.rename(name, new_name)
 
89
            rename(name, new_name)
87
90
            return new_name
88
91
        except OSError, e:
89
92
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
107
110
        self.add_suffix(this_path, ".THIS")
108
111
        self.dump(base_lines, this_path+".BASE")
109
112
        self.dump(other_lines, this_path+".OTHER")
110
 
        os.rename(new_file, this_path)
 
113
        rename(new_file, this_path)
111
114
        self.conflict("Diff3 conflict encountered in %s" % this_path)
112
115
 
113
116
    def new_contents_conflict(self, filename, other_contents):
133
136
            
134
137
def get_tree(treespec, temp_root, label, local_branch=None):
135
138
    location, revno = treespec
136
 
    branch = find_branch(location)
 
139
    branch = Branch.open_containing(location)
137
140
    if revno is None:
138
141
        revision = None
139
142
    elif revno == -1:
140
143
        revision = branch.last_patch()
141
144
    else:
142
 
        revision = branch.lookup_revision(revno)
 
145
        revision = branch.get_rev_id(revno)
143
146
    return branch, get_revid_tree(branch, revision, temp_root, label,
144
147
                                  local_branch)
145
148
 
243
246
    try:
244
247
        if this_dir is None:
245
248
            this_dir = '.'
246
 
        this_branch = find_branch(this_dir)
 
249
        this_branch = Branch.open_containing(this_dir)
247
250
        this_rev_id = this_branch.last_patch()
248
251
        if this_rev_id is None:
249
252
            raise BzrCommandError("This branch has no commits")
256
259
                                            this_branch)
257
260
        if other_revision[1] == -1:
258
261
            other_rev_id = other_branch.last_patch()
 
262
            if other_rev_id is None:
 
263
                raise NoCommits(other_branch)
259
264
            other_basis = other_rev_id
260
265
        elif other_revision[1] is not None:
261
 
            other_rev_id = other_branch.lookup_revision(other_revision[1])
 
266
            other_rev_id = other_branch.get_rev_id(other_revision[1])
262
267
            other_basis = other_rev_id
263
268
        else:
264
269
            other_rev_id = None
265
270
            other_basis = other_branch.last_patch()
 
271
            if other_basis is None:
 
272
                raise NoCommits(other_branch)
266
273
        if base_revision == [None, None]:
267
 
            base_rev_id = common_ancestor(this_rev_id, other_basis, 
268
 
                                          this_branch)
269
 
            if base_rev_id is None:
 
274
            try:
 
275
                base_rev_id = common_ancestor(this_rev_id, other_basis, 
 
276
                                              this_branch)
 
277
            except NoCommonAncestor:
270
278
                raise UnrelatedBranches()
271
279
            base_tree = get_revid_tree(this_branch, base_rev_id, tempdir, 
272
280
                                       "base", None)
278
286
            elif base_revision[1] is None:
279
287
                base_rev_id = None
280
288
            else:
281
 
                base_rev_id = base_branch.lookup_revision(base_revision[1])
282
 
            if base_rev_id is not None:
283
 
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
284
 
                                               MultipleRevisionSources(this_branch, 
285
 
                                                                       base_branch))
286
 
            else:
287
 
                base_is_ancestor = False
 
289
                base_rev_id = base_branch.get_rev_id(base_revision[1])
 
290
            multi_source = MultipleRevisionSources(this_branch, base_branch)
 
291
            base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
 
292
                                           multi_source)
288
293
        if file_list is None:
289
294
            interesting_ids = None
290
295
        else:
346
351
 
347
352
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
348
353
                             generate_cset_optimized, get_inventory,
349
 
                             MergeConflictHandler(base_tree.root,
350
 
                                                  ignore_zero=ignore_zero),
 
354
                             MergeConflictHandler(ignore_zero=ignore_zero),
351
355
                             merge_factory=merge_factory, 
352
356
                             interesting_ids=interesting_ids)
353
357