← 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
  • Date: 2011-08-30 10:54:28 UTC
  • mfrom: (5609.48.9 2.3)
  • mto: (6015.28.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11
Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
33
33
    LockContention,
34
34
    )
35
35
from bzrlib.tests import (
 
36
    SymlinkFeature,
36
37
    TestCaseWithTransport,
37
38
    test_foreign,
38
39
    )
39
 
from bzrlib.tests.features import (
40
 
    SymlinkFeature,
41
 
    )
42
40
from bzrlib.tests.matchers import MatchesAncestry
43
41
 
44
42
 
90
88
        b = wt.branch
91
89
        file('hello', 'w').write('hello world')
92
90
        wt.add('hello')
93
 
        rev1 = wt.commit(message='add hello')
 
91
        wt.commit(message='add hello')
94
92
        file_id = wt.path2id('hello')
95
93
 
96
94
        file('hello', 'w').write('version 2')
97
 
        rev2 = wt.commit(message='commit 2')
 
95
        wt.commit(message='commit 2')
98
96
 
99
97
        eq = self.assertEquals
100
98
        eq(b.revno(), 2)
101
 
        rev = b.repository.get_revision(rev1)
 
99
        rh = b.revision_history()
 
100
        rev = b.repository.get_revision(rh[0])
102
101
        eq(rev.message, 'add hello')
103
102
 
104
 
        tree1 = b.repository.revision_tree(rev1)
 
103
        tree1 = b.repository.revision_tree(rh[0])
105
104
        tree1.lock_read()
106
105
        text = tree1.get_file_text(file_id)
107
106
        tree1.unlock()
108
107
        self.assertEqual('hello world', text)
109
108
 
110
 
        tree2 = b.repository.revision_tree(rev2)
 
109
        tree2 = b.repository.revision_tree(rh[1])
111
110
        tree2.lock_read()
112
111
        text = tree2.get_file_text(file_id)
113
112
        tree2.unlock()
160
159
        wt.commit(message='add hello')
161
160
 
162
161
        os.remove('hello')
163
 
        reporter = CapturingReporter()
164
 
        wt.commit('removed hello', rev_id='rev2', reporter=reporter)
165
 
        self.assertEquals(
166
 
            [('missing', u'hello'), ('deleted', u'hello')],
167
 
            reporter.calls)
 
162
        wt.commit('removed hello', rev_id='rev2')
168
163
 
169
164
        tree = b.repository.revision_tree('rev2')
170
165
        self.assertFalse(tree.has_id('hello-id'))
364
359
            rev_ids.append(rev_id)
365
360
            wt.commit(message='rev %d' % (i+1),
366
361
                     rev_id=rev_id)
 
362
        eq = self.assertEquals
 
363
        eq(b.revision_history(), rev_ids)
367
364
        for i in range(4):
368
365
            self.assertThat(rev_ids[:i+1],
369
366
                MatchesAncestry(b.repository, rev_ids[i]))
462
459
                              rev_id='B',
463
460
                              working_tree=wt)
464
461
            branch = Branch.open(self.get_url('.'))
465
 
            self.assertEqual(branch.last_revision(), 'A')
 
462
            self.assertEqual(branch.revision_history(), ['A'])
466
463
            self.assertFalse(branch.repository.has_revision('B'))
467
464
        finally:
468
465
            bzrlib.gpg.GPGStrategy = oldstrategy