← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to zap.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-18 20:37:53 UTC
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: bialix@ukr.net-20060718203753-fa30c2f3cc59316b
don't use curses on win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
zap.py
2
2
 
3
3
from bzrlib.branch import Branch
4
4
from bzrlib.errors import NoWorkingTree, NotLocalUrl, NotBranchError
 
5
from bzrlib.delta import compare_trees
5
6
from bzrlib.workingtree import WorkingTree
6
7
 
7
8
from errors import (NotCheckout, UncommittedCheckout, ParentMissingRevisions, 
18
19
    branch_base = branch.bzrdir.transport.base
19
20
    if tree_base == branch_base:
20
21
        raise NotCheckout(path)
21
 
    delta = wt.changes_from(wt.basis_tree(), want_unchanged=False)
 
22
    delta = compare_trees(wt.basis_tree(), wt, want_unchanged=False)
22
23
    if delta.has_changed():
23
24
        raise UncommittedCheckout()
24
25
    if remove_branch: