← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-18 02:33:47 UTC
  • mfrom: (1534.1.24 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060218023347-0952c65f668bfd68
Merge Robert Collins 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()
18
17
 
19
18
import os
20
19
import errno
41
40
from bzrlib.osutils import rename, pathjoin
42
41
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
43
42
from bzrlib.trace import mutter, warning, note
44
 
from bzrlib.workingtree import WorkingTree
45
43
 
46
44
# TODO: Report back as changes are merged in
47
45
 
237
235
 
238
236
def _get_revid_tree(branch, revision, local_branch):
239
237
    if revision is None:
240
 
        base_tree = branch.working_tree()
 
238
        base_tree = branch.bzrdir.open_workingtree()
241
239
    else:
242
240
        if local_branch is not None:
243
241
            if local_branch.base != branch.base:
248
246
    return base_tree
249
247
 
250
248
 
251
 
def build_working_dir(to_dir):
252
 
    """Build a working directory in an empty directory.
253
 
 
254
 
    to_dir is a directory containing branch metadata but no working files,
255
 
    typically constructed by cloning an existing branch. 
256
 
 
257
 
    This is split out as a special idiomatic case of merge.  It could
258
 
    eventually be done by just building the tree directly calling into 
259
 
    lower-level code (e.g. constructing a changeset).
260
 
    """
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
249
def transform_tree(from_tree, to_tree, interesting_ids=None):
268
250
    merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
269
251
                interesting_ids=interesting_ids)
285
267
                     branch.get_revision_tree(base_revision))'
286
268
        """
287
269
    if this_tree is None:
288
 
        this_tree = this_branch.working_tree()
 
270
        this_tree = this_branch.bzrdir.open_workingtree()
289
271
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree)
290
272
    merger.backup_files = backup_files
291
273
    merger.merge_type = merge_type
387
369
 
388
370
    def compare_basis(self):
389
371
        changes = compare_trees(self.this_tree, 
390
 
                                self.this_branch.basis_tree(), False)
 
372
                                self.this_tree.basis_tree(), False)
391
373
        if not changes.has_changed():
392
374
            self.this_rev_id = self.this_basis
393
375