/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

  • Committer: Robert Collins
  • Date: 2007-09-19 05:14:14 UTC
  • mto: (2835.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2836.
  • Revision ID: robertc@robertcollins.net-20070919051414-2tgjqteg7k3ps4h0
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
  repository index errors that occured as a result of the Weave disk format.
  Instead the ``reconcile`` command needs to be run to correct those
  problems if they exist (and it has been able to fix most such problems
  since bzr 0.8). Some new problems have been identified during this release
  and you should run ``bzr check`` once on every repository to see if you
  need to reconcile. If you cannot ``pull`` or ``merge`` from a remote
  repository due to mismatched parent errors - a symptom of index errors -
  you should simply take a full copy of that remote repository to a clean
  directory outside any local repositories, then run reconcile on it, and
  finally pull from it locally. (And naturally email the repositories owner
  to ask them to upgrade and run reconcile).
  (Robert Collins)

* ``VersionedFile.fix_parents`` has been removed as a harmful API.
  ``VersionedFile.join`` will no longer accept different parents on either
  side of a join - it will either ignore them, or error, depending on the
  implementation. See notes when upgrading for more information.
  (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
import os
 
18
 
 
19
from bzrlib import merge, tests, transform, workingtree
 
20
 
 
21
 
 
22
class TestRevert(tests.TestCaseWithTransport):
 
23
    """Ensure that revert behaves as expected"""
 
24
 
 
25
    def test_revert_merged_dir(self):
 
26
        """Reverting a merge that adds a directory deletes the directory"""
 
27
        source_tree = self.make_branch_and_tree('source')
 
28
        source_tree.commit('empty tree')
 
29
        target_tree = source_tree.bzrdir.sprout('target').open_workingtree()
 
30
        self.build_tree(['source/dir/', 'source/dir/contents'])
 
31
        source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
 
32
        source_tree.commit('added dir')
 
33
        merge.merge_inner(target_tree.branch, source_tree.basis_tree(), 
 
34
                          target_tree.basis_tree(), this_tree=target_tree)
 
35
        self.failUnlessExists('target/dir')
 
36
        self.failUnlessExists('target/dir/contents')
 
37
        target_tree.revert()
 
38
        self.failIfExists('target/dir/contents')
 
39
        self.failIfExists('target/dir')
 
40
 
 
41
    def test_revert_new(self):
 
42
        """Only locally-changed new files should be preserved when reverting
 
43
 
 
44
        When a file isn't present in revert's target tree:
 
45
        If a file hasn't been committed, revert should unversion it, but not
 
46
        delete it.
 
47
        If a file has local changes, revert should unversion it, but not
 
48
        delete it.
 
49
        If a file has no changes from the last commit, revert should delete it.
 
50
        If a file has changes due to a merge, revert should delete it.
 
51
        """
 
52
        tree = self.make_branch_and_tree('tree')
 
53
        tree.commit('empty tree')
 
54
        merge_target = tree.bzrdir.sprout('merge_target').open_workingtree()
 
55
        self.build_tree(['tree/new_file'])
 
56
 
 
57
        # newly-added files should not be deleted
 
58
        tree.add('new_file')
 
59
        basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
 
60
        tree.revert()
 
61
        self.failUnlessExists('tree/new_file')
 
62
 
 
63
        # unchanged files should be deleted
 
64
        tree.add('new_file')
 
65
        tree.commit('add new_file')
 
66
        tree.revert(old_tree=basis_tree)
 
67
        self.failIfExists('tree/new_file')
 
68
        
 
69
        # files should be deleted if their changes came from merges
 
70
        merge_target.merge_from_branch(tree.branch)
 
71
        self.failUnlessExists('merge_target/new_file')
 
72
        merge_target.revert()
 
73
        self.failIfExists('merge_target/new_file')
 
74
 
 
75
        # files should not be deleted if changed after a merge
 
76
        merge_target.merge_from_branch(tree.branch)
 
77
        self.failUnlessExists('merge_target/new_file')
 
78
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
 
79
        merge_target.revert()
 
80
        self.failUnlessExists('merge_target/new_file')
 
81
 
 
82
    def tree_with_executable(self):
 
83
        tree = self.make_branch_and_tree('tree')
 
84
        tt = transform.TreeTransform(tree)
 
85
        tt.new_file('newfile', tt.root, 'helooo!', 'newfile-id', True)
 
86
        tt.apply()
 
87
        self.assertTrue(tree.is_executable('newfile-id'))
 
88
        tree.commit('added newfile')
 
89
        return tree
 
90
 
 
91
    def test_preserve_execute(self):
 
92
        tree = self.tree_with_executable()
 
93
        tt = transform.TreeTransform(tree)
 
94
        newfile = tt.trans_id_tree_file_id('newfile-id')
 
95
        tt.delete_contents(newfile)
 
96
        tt.create_file('Woooorld!', newfile)
 
97
        tt.apply()
 
98
        tree = workingtree.WorkingTree.open('tree')
 
99
        self.assertTrue(tree.is_executable('newfile-id'))
 
100
        transform.revert(tree, tree.basis_tree(), None, backups=True)
 
101
        self.assertEqual('helooo!', tree.get_file('newfile-id').read())
 
102
        self.assertTrue(tree.is_executable('newfile-id'))
 
103
 
 
104
    def test_revert_executable(self):
 
105
        tree = self.tree_with_executable()
 
106
        tt = transform.TreeTransform(tree)
 
107
        newfile = tt.trans_id_tree_file_id('newfile-id')
 
108
        tt.set_executability(False, newfile)
 
109
        tt.apply()
 
110
        transform.revert(tree, tree.basis_tree(), None)
 
111
        self.assertTrue(tree.is_executable('newfile-id'))
 
112
 
 
113
    def test_revert_deletes_files_from_revert(self):
 
114
        tree = self.make_branch_and_tree('.')
 
115
        self.build_tree(['file'])
 
116
        tree.add('file')
 
117
        tree.commit('added file', rev_id='rev1')
 
118
        os.unlink('file')
 
119
        tree.commit('removed file')
 
120
        self.failIfExists('file')
 
121
        tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
 
122
        self.failUnlessExists('file')
 
123
        tree.revert()
 
124
        self.failIfExists('file')
 
125
        self.assertEqual({}, tree.merge_modified())
 
126
 
 
127
    def test_empty_deprecated(self):
 
128
        tree = self.make_branch_and_tree('.')
 
129
        self.build_tree(['file'])
 
130
        tree.add('file')
 
131
        self.callDeprecated(['Using [] to revert all files is deprecated'
 
132
            ' as of bzr 0.91.  Please use None (the default) instead.'],
 
133
            tree.revert, [])
 
134
        self.assertIs(None, tree.path2id('file'))