← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to zap.py

  • Committer: Aaron Bentley
  • Date: 2006-06-27 14:36:32 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060627143632-0f4114d7b0a8d7d9
Fix zap for checkouts of branches with no parents

Show diffs side-by-side

added added

removed removed

Lines of Context:
zap.py
5
5
from bzrlib.delta import compare_trees
6
6
from bzrlib.workingtree import WorkingTree
7
7
 
8
 
from errors import NotCheckout, UncommittedCheckout, ParentMissingRevisions
 
8
from errors import (NotCheckout, UncommittedCheckout, ParentMissingRevisions, 
 
9
                    NoParent)
9
10
 
10
11
 
11
12
def zap(path, remove_branch=False):
22
23
    if delta.has_changed():
23
24
        raise UncommittedCheckout()
24
25
    if remove_branch:
25
 
        parent = Branch.open(branch.get_parent())
 
26
        parent_loc = branch.get_parent()
 
27
        if parent_loc is None:
 
28
            raise NoParent()
 
29
        parent = Branch.open(parent_loc)
26
30
        p_ancestry = parent.repository.get_ancestry(parent.last_revision())
27
31
        if branch.last_revision() not in p_ancestry:
28
32
            raise ParentMissingRevisions(branch.get_parent())
52
56
            BranchReferenceFormat().initialize(checkout, wt.branch)
53
57
            return checkout.create_workingtree()
54
58
 
 
59
        def make_checkout2(self):
 
60
            wt = self.make_checkout()
 
61
            wt2 = wt.branch.bzrdir.sprout('source2').open_workingtree()
 
62
            os.mkdir('checkout2')
 
63
            checkout = BzrDirMetaFormat1().initialize('checkout2')
 
64
            BranchReferenceFormat().initialize(checkout, wt2.branch)
 
65
            return checkout.create_workingtree()
 
66
 
55
67
        def test_is_checkout(self):
56
68
            self.assertRaises(NotCheckout, zap, '.')
57
69
            wt = BzrDir.create_standalone_workingtree('.')
65
77
            self.assertIs(True, os.path.exists('source'))
66
78
 
67
79
        def test_zap_branch(self):
68
 
            self.make_checkout()
 
80
            self.make_checkout2()
69
81
            base = WorkingTree.open('checkout').branch.base
70
82
            self.assertIs(True, os.path.exists('checkout'))
71
 
            zap('checkout', remove_branch=True)
72
 
            self.assertIs(False, os.path.exists('checkout'))
73
 
            self.assertIs(False, os.path.exists('source'))
 
83
            self.assertRaises(NoParent, zap, 'checkout', remove_branch=True)
 
84
            self.assertIs(True, os.path.exists('checkout'))
 
85
            self.assertIs(True, os.path.exists('source'))
 
86
            zap('checkout2', remove_branch=True)
 
87
            self.assertIs(False, os.path.exists('checkout2'))
 
88
            self.assertIs(False, os.path.exists('source2'))
74
89
 
75
90
        def test_checks_modified(self):
76
91
            checkout = self.make_checkout()