← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
1
 
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
80
80
    basis = tree.basis_tree()
81
81
    tt = TransformPreview(basis)
82
82
    testcase.addCleanup(tt.finalize)
83
 
    pp = progress.ProgressPhase('', 1, progress.DummyProgress())
84
83
    tree.lock_read()
85
84
    testcase.addCleanup(tree.unlock)
86
 
    transform._prepare_revert_transform(basis, tree, tt, None, False, pp,
 
85
    pp = None
 
86
    transform._prepare_revert_transform(basis, tree, tt, None, False, None,
87
87
                                        basis, {})
88
88
    preview_tree = tt.get_preview_tree()
89
89
    preview_tree.set_parent_ids(tree.get_parent_ids())