~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Aaron Bentley
  • Date: 2006-02-28 18:56:52 UTC
  • mto: (147.4.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060228185652-374bb521bcc8dc2d
Got imports working, via a big hammer

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
import os.path
38
38
import shutil
39
39
import bzrlib
 
40
import bzrlib.builtins
40
41
import bzrlib.trace
41
42
import bzrlib.merge
42
43
import bzrlib.inventory
255
256
            else:
256
257
                raise
257
258
        try:
258
 
            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)
259
261
        except NoSuchRevision:
260
262
            rmtree(to_location)
261
263
            msg = "The branch %s has no revision %s." % (from_location, revision_id)
421
423
                os.rename(bzr_dir, tmp_bzr_dir) # Move the original bzr out of the way
422
424
                os.rename(new_bzr_dir, bzr_dir)
423
425
                try:
424
 
                    bzrlib.merge.merge((output_dir, -1), (output_dir, None), # old_revno), 
425
 
                                       check_clean=False, this_dir=output_dir, 
426
 
                                       ignore_zero=True)
 
426
                    WorkingTree.open_containing(output_dir)[0].revert([])
427
427
                except:
428
428
                    # If something failed, move back the original bzr directory
429
429
                    os.rename(bzr_dir, new_bzr_dir)
432
432
            else:
433
433
                # no imports - perhaps just append_revisions
434
434
                # should not fail:
435
 
                bzrlib.merge.merge((output_dir, -1), (output_dir, None), # old_revno), 
436
 
                                   check_clean=False, this_dir=output_dir, 
437
 
                                   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)
438
439
        else:
439
440
            revdir = os.path.join(tempdir, "rd")
440
441
            os.rename(revdir, output_dir)
535
536
        if revdir is None and os.path.exists(output_dir):
536
537
            # check for imported revisions and if present just append immediately
537
538
            branch = Branch.open(output_dir)
538
 
            if branch.has_revision(rev_id):
 
539
            if branch.repository.has_revision(rev_id):
539
540
                branch.append_revision(rev_id)
540
541
                continue
541
542
        if revdir is None: