← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
 
20
20
import bzrlib
21
21
from bzrlib import (
 
22
    bzrdir,
22
23
    errors,
23
24
    lockdir,
24
25
    osutils,
95
96
        eq(rev.message, 'add hello')
96
97
 
97
98
        tree1 = b.repository.revision_tree(rh[0])
 
99
        tree1.lock_read()
98
100
        text = tree1.get_file_text(file_id)
99
 
        eq(text, 'hello world')
 
101
        tree1.unlock()
 
102
        self.assertEqual('hello world', text)
100
103
 
101
104
        tree2 = b.repository.revision_tree(rh[1])
102
 
        eq(tree2.get_file_text(file_id), 'version 2')
 
105
        tree2.lock_read()
 
106
        text = tree2.get_file_text(file_id)
 
107
        tree2.unlock()
 
108
        self.assertEqual('version 2', text)
103
109
 
104
110
    def test_delete_commit(self):
105
111
        """Test a commit with a deleted file"""
115
121
        tree = b.repository.revision_tree('rev2')
116
122
        self.assertFalse(tree.has_id('hello-id'))
117
123
 
 
124
    def test_partial_commit_move(self):
 
125
        """Test a partial commit where a file was renamed but not committed.
 
126
 
 
127
        https://bugs.launchpad.net/bzr/+bug/83039
 
128
        
 
129
        If not handled properly, commit will try to snapshot
 
130
        dialog.py with olive/ as a parent, while 
 
131
        olive/ has not been snapshotted yet.
 
132
        """
 
133
        wt = self.make_branch_and_tree('.')
 
134
        b = wt.branch
 
135
        self.build_tree(['annotate/', 'annotate/foo.py',
 
136
                         'olive/', 'olive/dialog.py'
 
137
                        ])
 
138
        wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
 
139
        wt.commit(message='add files')
 
140
        wt.rename_one("olive/dialog.py", "aaa")
 
141
        self.build_tree_contents([('annotate/foo.py', 'modified\n')])
 
142
        wt.commit('renamed hello', specific_files=["annotate"])
 
143
 
118
144
    def test_pointless_commit(self):
119
145
        """Commit refuses unless there are changes or it's forced."""
120
146
        wt = self.make_branch_and_tree('.')
168
194
        eq(b.revno(), 3)
169
195
 
170
196
        tree2 = b.repository.revision_tree('test@rev-2')
 
197
        tree2.lock_read()
 
198
        self.addCleanup(tree2.unlock)
171
199
        self.assertTrue(tree2.has_filename('hello'))
172
200
        self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
173
201
        self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
174
202
        
175
203
        tree3 = b.repository.revision_tree('test@rev-3')
 
204
        tree3.lock_read()
 
205
        self.addCleanup(tree3.unlock)
176
206
        self.assertFalse(tree3.has_filename('hello'))
177
207
        self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
178
208
 
189
219
 
190
220
        eq = self.assertEquals
191
221
        tree1 = b.repository.revision_tree('test@rev-1')
 
222
        tree1.lock_read()
 
223
        self.addCleanup(tree1.unlock)
192
224
        eq(tree1.id2path('hello-id'), 'hello')
193
225
        eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
194
226
        self.assertFalse(tree1.has_filename('fruity'))
197
229
        eq(ie.revision, 'test@rev-1')
198
230
 
199
231
        tree2 = b.repository.revision_tree('test@rev-2')
 
232
        tree2.lock_read()
 
233
        self.addCleanup(tree2.unlock)
200
234
        eq(tree2.id2path('hello-id'), 'fruity')
201
235
        eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
202
236
        self.check_inventory_shape(tree2.inventory, ['fruity'])
430
464
        bound = master.sprout('bound')
431
465
        wt = bound.open_workingtree()
432
466
        wt.branch.set_bound_location(os.path.realpath('master'))
433
 
 
434
 
        orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
435
467
        master_branch.lock_write()
436
468
        try:
437
 
            lockdir._DEFAULT_TIMEOUT_SECONDS = 1
438
469
            self.assertRaises(LockContention, wt.commit, 'silly')
439
470
        finally:
440
 
            lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
441
471
            master_branch.unlock()
442
472
 
443
473
    def test_commit_bound_merge(self):
727
757
        rev = tree.branch.repository.get_revision(rev_id)
728
758
        self.assertEqual('John Doe <jdoe@example.com>',
729
759
                         rev.properties['author'])
 
760
 
 
761
    def test_commit_with_checkout_and_branch_sharing_repo(self):
 
762
        repo = self.make_repository('repo', shared=True)
 
763
        # make_branch_and_tree ignores shared repos
 
764
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
765
        tree2 = branch.create_checkout('repo/tree2')
 
766
        tree2.commit('message', rev_id='rev1')
 
767
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))