← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
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
18
18
import os
19
19
import errno
20
20
from tempfile import mkdtemp
21
 
import warnings
22
21
 
 
22
import bzrlib
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.conflicts import ConflictList, Conflict
25
25
from bzrlib.delta import compare_trees
41
41
from bzrlib.osutils import rename, pathjoin, rmtree
42
42
from progress import DummyProgress, ProgressPhase
43
43
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
 
44
from bzrlib.symbol_versioning import *
44
45
from bzrlib.textfile import check_text_lines
45
46
from bzrlib.trace import mutter, warning, note
46
47
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
47
48
                              FinalPaths, create_by_entry, unique_add)
48
49
from bzrlib.versionedfile import WeaveMerge
49
 
from bzrlib import ui
 
50
import bzrlib.ui
50
51
 
51
52
# TODO: Report back as changes are merged in
52
53
 
119
120
            changes = compare_trees(self.other_tree, other_basis_tree)
120
121
            if changes.has_changed():
121
122
                raise WorkingTreeNotRevision(self.this_tree)
122
 
            other_rev_id = self.other_basis
 
123
            other_rev_id = other_basis
123
124
            self.other_tree = other_basis_tree
124
125
 
125
126
    def file_revisions(self, file_id):
367
368
        self.tt = TreeTransform(working_tree, self.pb)
368
369
        try:
369
370
            self.pp.next_phase()
370
 
            child_pb = ui.ui_factory.nested_progress_bar()
 
371
            child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
371
372
            try:
372
373
                for num, file_id in enumerate(all_ids):
373
374
                    child_pb.update('Preparing file merge', num, len(all_ids))
378
379
                child_pb.finished()
379
380
                
380
381
            self.pp.next_phase()
381
 
            child_pb = ui.ui_factory.nested_progress_bar()
 
382
            child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
382
383
            try:
383
384
                fs_conflicts = resolve_conflicts(self.tt, child_pb)
384
385
            finally:
895
896
                     branch.get_revision_tree(base_revision))'
896
897
        """
897
898
    if this_tree is None:
898
 
        warnings.warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
 
899
        warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
899
900
             "bzrlib version 0.8.",
900
901
             DeprecationWarning,
901
902
             stacklevel=2)