← 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: 2005-11-10 21:43:13 UTC
  • mfrom: (283 bzrtools)
  • mto: (147.4.24 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: aaron.bentley@utoronto.ca-20051110214313-e0faebb440ec3268
Merged mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
23
23
from bzrlib.commit import Commit, NullCommitReporter
24
24
from bzrlib.commands import Command
25
25
from bzrlib.option import _global_option
26
 
from bzrlib.workingtree import WorkingTree
27
26
from errors import NoPyBaz
28
27
try:
29
28
    import pybaz
590
589
        else:
591
590
            log_message = log_summary
592
591
        branch.lock_write()
593
 
        target_tree = WorkingTree(revdir ,branch=branch)
594
 
        target_tree.lock_write()
595
592
        try:
596
593
            if missing_ancestor:
597
594
                # if we want it to be in revision-history, do that here.
598
 
                target_tree.add_pending_merge(revision_id(missing_ancestor))
 
595
                branch.add_pending_merge(revision_id(missing_ancestor))
599
596
                missing_ancestor = None
600
597
            for merged_rev in direct_merges:
601
 
                target_tree.add_pending_merge(revision_id(merged_rev))
602
 
            target_tree.set_inventory(baz_inv)
 
598
                branch.add_pending_merge(revision_id(merged_rev))
 
599
            branch.working_tree().set_inventory(baz_inv)
603
600
            commitobj = Commit(reporter=ImportCommitReporter(pb))
604
601
            commitobj.commit(branch, log_message.decode('ascii', 'replace'), 
605
602
                             verbose=False, committer=log_creator,
606
603
                             timestamp=timestamp, timezone=0, rev_id=rev_id)
607
604
        finally:
608
 
            target_tree.unlock()
609
605
            branch.unlock()
610
606
    yield Progress("revisions", len(ancestors), len(ancestors))
611
607
    unlink_unversioned(branch, revdir)