← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz_import.py

  • Committer: Robert Collins
  • Date: 2005-09-14 11:27:20 UTC
  • mto: (147.2.6) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20050914112720-c66a21de86eafa6e
trim fai cribbage

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz_import.py
492
492
    unlink_unversioned(branch, revdir)
493
493
 
494
494
def get_direct_merges(revdir, revision):
495
 
    from fai.cmdutil import pylon, direct_merges
 
495
    from fai.cmdutil 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, 
500
500
        revision.version.nonarch, revision.archive, revision.patchlevel)
501
501
    temp_path = tempfile.mktemp()
502
502
    os.rename(log_path, temp_path)
503
 
    merges = list(pylon.iter_new_merges(revdir, revision.version))
 
503
    merges = list(iter_new_merges(revdir, revision.version))
504
504
    direct = direct_merges (merges)
505
505
    os.rename(temp_path, log_path)
506
506
    return direct