← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: James Henstridge
  • Date: 2006-05-05 07:39:20 UTC
  • mto: (1711.2.53 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1786.
  • Revision ID: james.henstridge@canonical.com-20060505073920-b9a7c8914399eb63
move external_diff imports to top of file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
import sys
 
18
import subprocess
 
19
from tempfile import NamedTemporaryFile
 
20
 
17
21
from bzrlib.delta import compare_trees
18
22
from bzrlib.errors import BzrError
19
23
import bzrlib.errors as errors
81
85
    # make sure our own output is properly ordered before the diff
82
86
    to_file.flush()
83
87
 
84
 
    from tempfile import NamedTemporaryFile
85
 
    import subprocess
86
 
 
87
88
    oldtmpf = NamedTemporaryFile()
88
89
    newtmpf = NamedTemporaryFile()
89
90
 
169
170
    supplies any two trees.
170
171
    """
171
172
    if output is None:
172
 
        import sys
173
173
        output = sys.stdout
174
174
 
175
175
    if from_spec is None:
216
216
    The more general form is show_diff_trees(), where the caller
217
217
    supplies any two trees.
218
218
    """
219
 
    import sys
220
219
    output = sys.stdout
221
220
    def spec_tree(spec):
222
221
        revision_id = spec.in_store(tree.branch).rev_id