← 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-09-29 13:26:07 UTC
  • mto: (147.2.17)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20050929132607-822df5d29e8e595d
Committed debugging changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
19
19
from bzrlib.commands import Command
20
20
from errors import NoPyBaz
21
21
try:
22
 
    import pybaz
 
22
    from bzrlib.plugins.bzrtools import pybaz
23
23
    import pybaz.errors
24
24
    from pybaz import NameParser as NameParser
25
 
    from pybaz.backends.baz import null_cmd
 
25
    from pybaz.backends.baz import null_cmd, sequence_cmd
26
26
except ImportError:
27
 
    raise NoPyBaz
 
27
    raise
 
28
from fai import iter_new_merges, direct_merges
28
29
import tempfile
29
30
import os
30
31
import os.path
492
493
    unlink_unversioned(branch, revdir)
493
494
 
494
495
def get_direct_merges(revdir, revision):
495
 
    from fai import iter_new_merges, direct_merges
496
496
    if pybaz.WorkingTree(revdir).tree_version != revision.version:
497
497
        pybaz.WorkingTree(revdir).set_tree_version(revision.version)
498
498
    log_path = "%s/{arch}/%s/%s/%s/%s/patch-log/%s" % (revdir,