← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to zap.py

  • Committer: Aaron Bentley
  • Date: 2011-04-15 02:33:36 UTC
  • mto: This revision was merged to the branch mainline in revision 761.
  • Revision ID: aaron@aaronbentley.com-20110415023336-o00049lbrfpmt1ae
Update compatibility-checking code.

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
    )
3
7
from bzrlib.branch import Branch
4
 
from bzrlib.errors import NoWorkingTree, NotLocalUrl, NotBranchError
 
8
from bzrlib.errors import NoWorkingTree, NotBranchError
5
9
from bzrlib.workingtree import WorkingTree
6
10
 
7
 
from errors import (NotCheckout, UncommittedCheckout, ParentMissingRevisions, 
 
11
from errors import (NotCheckout, UncommittedCheckout, ParentMissingRevisions,
8
12
                    NoParent)
9
13
 
10
14
 
11
 
def zap(path, remove_branch=False):
 
15
def zap(path, remove_branch=False, allow_modified=False):
12
16
    try:
13
 
        wt = WorkingTree.open(path)
 
17
        wt = bzrdir.BzrDir.open(path).open_workingtree(path,
 
18
                                                       recommend_upgrade=False)
14
19
    except (NoWorkingTree, NotBranchError):
15
20
        raise NotCheckout(path)
16
21
    tree_base = wt.bzrdir.transport.base
18
23
    branch_base = branch.bzrdir.transport.base
19
24
    if tree_base == branch_base:
20
25
        raise NotCheckout(path)
21
 
    delta = wt.changes_from(wt.basis_tree(), want_unchanged=False)
22
 
    if delta.has_changed():
23
 
        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()
24
30
    if remove_branch:
25
31
        parent_loc = branch.get_parent()
26
32
        if parent_loc is None:
27
33
            raise NoParent()
28
34
        parent = Branch.open(parent_loc)
29
 
        p_ancestry = parent.repository.get_ancestry(parent.last_revision())
30
 
        if branch.last_revision() not in p_ancestry:
 
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):
31
39
            raise ParentMissingRevisions(branch.get_parent())
32
40
    rmtree(path)
33
41
    if remove_branch:
41
49
def test_suite():
42
50
    import os
43
51
    from unittest import makeSuite
44
 
    
45
 
    from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
46
 
    from bzrlib.branch import BranchReferenceFormat
 
52
 
47
53
    from bzrlib.tests import TestCaseInTempDir
48
54
 
49
55
    class TestZap(TestCaseInTempDir):
50
56
 
51
57
        def make_checkout(self):
52
 
            wt = BzrDir.create_standalone_workingtree('source')
53
 
            os.mkdir('checkout')
54
 
            checkout = BzrDirMetaFormat1().initialize('checkout')
55
 
            BranchReferenceFormat().initialize(checkout, wt.branch)
56
 
            return checkout.create_workingtree()
 
58
            wt = bzrdir.BzrDir.create_standalone_workingtree('source')
 
59
            return wt.branch.create_checkout('checkout', lightweight=True)
57
60
 
58
61
        def make_checkout2(self):
59
62
            wt = self.make_checkout()
60
63
            wt2 = wt.branch.bzrdir.sprout('source2').open_workingtree()
61
 
            os.mkdir('checkout2')
62
 
            checkout = BzrDirMetaFormat1().initialize('checkout2')
63
 
            BranchReferenceFormat().initialize(checkout, wt2.branch)
64
 
            return checkout.create_workingtree()
 
64
            return wt2.branch.create_checkout('checkout2', lightweight=True)
65
65
 
66
66
        def test_is_checkout(self):
67
67
            self.assertRaises(NotCheckout, zap, '.')
68
 
            wt = BzrDir.create_standalone_workingtree('.')
 
68
            wt = bzrdir.BzrDir.create_standalone_workingtree('.')
69
69
            self.assertRaises(NotCheckout, zap, '.')
70
70
 
71
71
        def test_zap_works(self):
75
75
            self.assertIs(False, os.path.exists('checkout'))
76
76
            self.assertIs(True, os.path.exists('source'))
77
77
 
78
 
        def test_zap_branch(self):
 
78
        def test_zap_branch(self):
79
79
            self.make_checkout2()
80
80
            base = WorkingTree.open('checkout').branch.base
81
81
            self.assertIs(True, os.path.exists('checkout'))
94
94
            checkout.commit('commit changes to branch')
95
95
            zap('checkout')
96
96
 
 
97
        def test_allow_modified(self):
 
98
            checkout = self.make_checkout()
 
99
            os.mkdir('checkout/foo')
 
100
            checkout.add('foo')
 
101
            self.assertRaises(UncommittedCheckout, zap, 'checkout')
 
102
            zap('checkout', allow_modified=True)
 
103
 
97
104
    return makeSuite(TestZap)