← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Aaron Bentley
  • Date: 2006-03-01 13:42:15 UTC
  • mfrom: (319 bzrtools)
  • mto: (147.4.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060301134215-f343b0751787dfb9
Merge push fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
19
19
from bzrlib.errors import BzrError
20
20
from bzrlib.errors import NotBranchError, BzrCommandError, NoSuchRevision
21
21
from bzrlib.branch import Branch
22
 
from bzrlib.clone import copy_branch
23
22
from bzrlib.commit import Commit, NullCommitReporter
24
23
from bzrlib.commands import Command
25
24
from bzrlib.option import _global_option
38
37
import os.path
39
38
import shutil
40
39
import bzrlib
 
40
import bzrlib.builtins
41
41
import bzrlib.trace
42
42
import bzrlib.merge
43
43
import bzrlib.inventory
256
256
            else:
257
257
                raise
258
258
        try:
259
 
            copy_branch(br_from, to_location, revision_id, None)
 
259
            br_from.bzrdir.clone(to_location, revision_id)
 
260
#            copy_branch(br_from, to_location, revision_id, None)
260
261
        except NoSuchRevision:
261
262
            rmtree(to_location)
262
263
            msg = "The branch %s has no revision %s." % (from_location, revision_id)
422
423
                os.rename(bzr_dir, tmp_bzr_dir) # Move the original bzr out of the way
423
424
                os.rename(new_bzr_dir, bzr_dir)
424
425
                try:
425
 
                    bzrlib.merge.merge((output_dir, -1), (output_dir, None), # old_revno), 
426
 
                                       check_clean=False, this_dir=output_dir, 
427
 
                                       ignore_zero=True)
 
426
                    WorkingTree.open_containing(output_dir)[0].revert([])
428
427
                except:
429
428
                    # If something failed, move back the original bzr directory
430
429
                    os.rename(bzr_dir, new_bzr_dir)
433
432
            else:
434
433
                # no imports - perhaps just append_revisions
435
434
                # should not fail:
436
 
                bzrlib.merge.merge((output_dir, -1), (output_dir, None), # old_revno), 
437
 
                                   check_clean=False, this_dir=output_dir, 
438
 
                                   ignore_zero=True)
 
435
                WorkingTree.open_containing(output_dir)[0].revert([])
 
436
                #bzrlib.builtins.merge((output_dir, -1), (output_dir, None), # old_revno), 
 
437
                #                   check_clean=False, this_dir=output_dir, 
 
438
                #                   ignore_zero=True)
439
439
        else:
440
440
            revdir = os.path.join(tempdir, "rd")
441
441
            os.rename(revdir, output_dir)
536
536
        if revdir is None and os.path.exists(output_dir):
537
537
            # check for imported revisions and if present just append immediately
538
538
            branch = Branch.open(output_dir)
539
 
            if branch.has_revision(rev_id):
 
539
            if branch.repository.has_revision(rev_id):
540
540
                branch.append_revision(rev_id)
541
541
                continue
542
542
        if revdir is None: