← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to zap.py

  • Committer: Aaron Bentley
  • Date: 2009-04-10 20:07:41 UTC
  • Revision ID: aaron@aaronbentley.com-20090410200741-qg98vn5l50mcwzd1
Get conflict-diff under test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
zap.py
1
1
from shutil import rmtree
2
2
 
 
3
from bzrlib import (
 
4
    bzrdir,
 
5
    revision as _mod_revision,
 
6
    )
 
7
from bzrlib.branch import Branch
3
8
from bzrlib.errors import NoWorkingTree, NotLocalUrl, NotBranchError
4
 
from bzrlib.delta import compare_trees
5
9
from bzrlib.workingtree import WorkingTree
6
10
 
7
 
from errors import NotCheckout, UncommittedCheckout
8
 
 
9
 
 
10
 
def zap(path, remove_branch=False):
 
11
from errors import (NotCheckout, UncommittedCheckout, ParentMissingRevisions,
 
12
                    NoParent)
 
13
 
 
14
 
 
15
def zap(path, remove_branch=False, allow_modified=False):
11
16
    try:
12
 
        wt = WorkingTree.open(path)
 
17
        wt = bzrdir.BzrDir.open(path).open_workingtree(path,
 
18
                                                       recommend_upgrade=False)
13
19
    except (NoWorkingTree, NotBranchError):
14
20
        raise NotCheckout(path)
15
21
    tree_base = wt.bzrdir.transport.base
17
23
    branch_base = branch.bzrdir.transport.base
18
24
    if tree_base == branch_base:
19
25
        raise NotCheckout(path)
20
 
    delta = compare_trees(wt.basis_tree(), wt, want_unchanged=False)
21
 
    if delta.has_changed():
22
 
        raise UncommittedCheckout()
 
26
    if not allow_modified:
 
27
        delta = wt.changes_from(wt.basis_tree(), want_unchanged=False)
 
28
        if delta.has_changed():
 
29
            raise UncommittedCheckout()
 
30
    if remove_branch:
 
31
        parent_loc = branch.get_parent()
 
32
        if parent_loc is None:
 
33
            raise NoParent()
 
34
        parent = Branch.open(parent_loc)
 
35
        last_revision = _mod_revision.ensure_null(parent.last_revision())
 
36
        p_ancestry = parent.repository.get_ancestry(last_revision)
 
37
        if (last_revision != _mod_revision.NULL_REVISION and
 
38
            branch.last_revision() not in p_ancestry):
 
39
            raise ParentMissingRevisions(branch.get_parent())
23
40
    rmtree(path)
24
41
    if remove_branch:
25
42
        t = branch.bzrdir.transport
32
49
def test_suite():
33
50
    import os
34
51
    from unittest import makeSuite
35
 
    
 
52
 
36
53
    from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
37
54
    from bzrlib.branch import BranchReferenceFormat
38
55
    from bzrlib.tests import TestCaseInTempDir
46
63
            BranchReferenceFormat().initialize(checkout, wt.branch)
47
64
            return checkout.create_workingtree()
48
65
 
 
66
        def make_checkout2(self):
 
67
            wt = self.make_checkout()
 
68
            wt2 = wt.branch.bzrdir.sprout('source2').open_workingtree()
 
69
            os.mkdir('checkout2')
 
70
            checkout = BzrDirMetaFormat1().initialize('checkout2')
 
71
            BranchReferenceFormat().initialize(checkout, wt2.branch)
 
72
            return checkout.create_workingtree()
 
73
 
49
74
        def test_is_checkout(self):
50
75
            self.assertRaises(NotCheckout, zap, '.')
51
76
            wt = BzrDir.create_standalone_workingtree('.')
59
84
            self.assertIs(True, os.path.exists('source'))
60
85
 
61
86
        def test_zap_branch(self):
62
 
            self.make_checkout()
 
87
            self.make_checkout2()
63
88
            base = WorkingTree.open('checkout').branch.base
64
89
            self.assertIs(True, os.path.exists('checkout'))
65
 
            zap('checkout', remove_branch=True)
66
 
            self.assertIs(False, os.path.exists('checkout'))
67
 
            self.assertIs(False, os.path.exists('source'))
 
90
            self.assertRaises(NoParent, zap, 'checkout', remove_branch=True)
 
91
            self.assertIs(True, os.path.exists('checkout'))
 
92
            self.assertIs(True, os.path.exists('source'))
 
93
            zap('checkout2', remove_branch=True)
 
94
            self.assertIs(False, os.path.exists('checkout2'))
 
95
            self.assertIs(False, os.path.exists('source2'))
68
96
 
69
97
        def test_checks_modified(self):
70
98
            checkout = self.make_checkout()
74
102
            checkout.commit('commit changes to branch')
75
103
            zap('checkout')
76
104
 
 
105
        def test_allow_modified(self):
 
106
            checkout = self.make_checkout()
 
107
            os.mkdir('checkout/foo')
 
108
            checkout.add('foo')
 
109
            self.assertRaises(UncommittedCheckout, zap, 'checkout')
 
110
            zap('checkout', allow_modified=True)
 
111
 
77
112
    return makeSuite(TestZap)