← 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-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

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.path
19
 
import tempfile
20
 
import shutil
21
 
import errno
22
 
from fetch import greedy_fetch
23
 
 
24
 
import bzrlib.osutils
25
 
import bzrlib.revision
26
18
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
19
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
20
from bzrlib.changeset import Inventory, Diff3Merge
29
21
from bzrlib.branch import find_branch
 
22
import bzrlib.osutils
30
23
from bzrlib.errors import BzrCommandError, UnrelatedBranches
31
24
from bzrlib.delta import compare_trees
32
 
from bzrlib.trace import mutter, warning
33
 
from bzrlib.fetch import greedy_fetch
34
 
from bzrlib.revision import is_ancestor
 
25
from trace import mutter, warning
 
26
import os.path
 
27
import tempfile
 
28
import shutil
 
29
import errno
 
30
from fetch import greedy_fetch
 
31
 
35
32
 
36
33
# comments from abentley on irc: merge happens in two stages, each
37
34
# of which generates a changeset object
196
193
            return True
197
194
        return self.tree.inventory.has_id(file_id)
198
195
 
199
 
    def has_or_had_id(self, file_id):
200
 
        if file_id == self.tree.inventory.root.file_id:
201
 
            return True
202
 
        return self.tree.inventory.has_id(file_id)
203
 
 
204
196
    def readonly_path(self, id):
205
197
        if id not in self.tree:
206
198
            return None
226
218
    """Merge changes into a tree.
227
219
 
228
220
    base_revision
229
 
        tuple(path, revision) Base for three-way merge.
 
221
        Base for three-way merge.
230
222
    other_revision
231
 
        tuple(path, revision) Other revision for three-way merge.
 
223
        Other revision for three-way merge.
232
224
    this_dir
233
225
        Directory to merge changes into; '.' by default.
234
226
    check_clean
264
256
            other_rev_id = None
265
257
            other_basis = other_branch.last_patch()
266
258
        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:
 
259
            if other_revision[1] == -1:
 
260
                o_revno = None
 
261
            else:
 
262
                o_revno = other_revision[1]
270
263
                raise UnrelatedBranches()
271
 
            base_tree = get_revid_tree(this_branch, base_rev_id, tempdir, 
272
 
                                       "base", None)
 
264
            try:
 
265
                base_revision = this_branch.get_revision(base_rev_id)
 
266
                base_branch = this_branch
 
267
            except NoSuchRevision:
 
268
                base_branch = other_branch
 
269
            base_tree = get_revid_tree(base_branch, base_rev_id, tempdir, 
 
270
                                       "base")
273
271
            base_is_ancestor = True
274
272
        else:
275
273
            base_branch, base_tree = get_tree(base_revision, tempdir, "base")
281
279
                base_rev_id = base_branch.lookup_revision(base_revision[1])
282
280
            if base_rev_id is not None:
283
281
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
284
 
                                               MultipleRevisionSources(this_branch, 
285
 
                                                                       base_branch))
 
282
                                               MultipleRevisionSources(
 
283
                                               this_branch, 
 
284
                                               base_branch))
286
285
            else:
287
286
                base_is_ancestor = False
288
287
        if file_list is None:
304
303
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
305
304
                    ignore_zero=ignore_zero, backup_files=backup_files, 
306
305
                    merge_type=merge_type, interesting_ids=interesting_ids)
307
 
        if base_is_ancestor and other_rev_id is not None\
308
 
            and other_rev_id not in this_branch.revision_history():
 
306
        if base_is_ancestor and other_rev_id is not None:
309
307
            this_branch.add_pending_merge(other_rev_id)
310
308
    finally:
311
309
        shutil.rmtree(tempdir)