← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to upstream_import.py

  • Committer: Aaron Bentley
  • Date: 2006-08-08 02:29:34 UTC
  • mto: This revision was merged to the branch mainline in revision 425.
  • Revision ID: aaron.bentley@utoronto.ca-20060808022934-c5e50b01aefe43d2
More updates for 0.9

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
9
9
from unittest import makeSuite
10
10
 
11
11
from bzrlib.bzrdir import BzrDir
12
 
from bzrlib.delta import compare_trees
13
12
from bzrlib.errors import NoSuchFile, BzrCommandError, NotBranchError
14
13
from bzrlib.osutils import pathjoin, isdir, file_iterator
15
14
from bzrlib.tests import TestCaseInTempDir
143
142
        tree = WorkingTree.open_containing('.')[0]
144
143
    tree.lock_write()
145
144
    try:
146
 
        if compare_trees(tree, tree.basis_tree()).has_changed():
 
145
        if tree.changes_from(tree.basis_tree()).has_changed():
147
146
            raise BzrCommandError("Working tree has uncommitted changes.")
148
147
 
149
148
        if (source.endswith('.tar') or source.endswith('.tar.gz') or