← 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: Jelmer Vernooij
  • Date: 2012-01-27 21:28:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120127212856-ewnjgn7fyblphcqw
Migrate mail_client to config stacks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
20
20
import bzrlib
21
21
from bzrlib import (
22
22
    bzrdir,
 
23
    config,
23
24
    errors,
24
25
    )
25
26
from bzrlib.branch import Branch
26
27
from bzrlib.bzrdir import BzrDirMetaFormat1
27
28
from bzrlib.commit import Commit, NullCommitReporter
28
 
from bzrlib.config import BranchConfig
29
29
from bzrlib.errors import (
30
30
    PointlessCommit,
31
31
    BzrError,
33
33
    LockContention,
34
34
    )
35
35
from bzrlib.tests import (
36
 
    SymlinkFeature,
37
36
    TestCaseWithTransport,
38
37
    test_foreign,
39
38
    )
 
39
from bzrlib.tests.features import (
 
40
    SymlinkFeature,
 
41
    )
40
42
from bzrlib.tests.matchers import MatchesAncestry
41
43
 
42
44
 
43
45
# TODO: Test commit with some added, and added-but-missing files
44
46
 
45
 
class MustSignConfig(BranchConfig):
46
 
 
47
 
    def signature_needed(self):
48
 
        return True
49
 
 
50
 
    def gpg_signing_command(self):
51
 
        return ['cat', '-']
52
 
 
53
 
 
54
 
class BranchWithHooks(BranchConfig):
55
 
 
56
 
    def post_commit(self):
57
 
        return "bzrlib.ahook bzrlib.ahook"
 
47
class MustSignConfig(config.MemoryStack):
 
48
 
 
49
    def __init__(self):
 
50
        super(MustSignConfig, self).__init__('''
 
51
gpg_signing_command=cat -
 
52
create_signatures=always
 
53
''')
58
54
 
59
55
 
60
56
class CapturingReporter(NullCommitReporter):
88
84
        b = wt.branch
89
85
        file('hello', 'w').write('hello world')
90
86
        wt.add('hello')
91
 
        wt.commit(message='add hello')
 
87
        rev1 = wt.commit(message='add hello')
92
88
        file_id = wt.path2id('hello')
93
89
 
94
90
        file('hello', 'w').write('version 2')
95
 
        wt.commit(message='commit 2')
 
91
        rev2 = wt.commit(message='commit 2')
96
92
 
97
93
        eq = self.assertEquals
98
94
        eq(b.revno(), 2)
99
 
        rh = b.revision_history()
100
 
        rev = b.repository.get_revision(rh[0])
 
95
        rev = b.repository.get_revision(rev1)
101
96
        eq(rev.message, 'add hello')
102
97
 
103
 
        tree1 = b.repository.revision_tree(rh[0])
 
98
        tree1 = b.repository.revision_tree(rev1)
104
99
        tree1.lock_read()
105
100
        text = tree1.get_file_text(file_id)
106
101
        tree1.unlock()
107
102
        self.assertEqual('hello world', text)
108
103
 
109
 
        tree2 = b.repository.revision_tree(rh[1])
 
104
        tree2 = b.repository.revision_tree(rev2)
110
105
        tree2.lock_read()
111
106
        text = tree2.get_file_text(file_id)
112
107
        tree2.unlock()
159
154
        wt.commit(message='add hello')
160
155
 
161
156
        os.remove('hello')
162
 
        wt.commit('removed hello', rev_id='rev2')
 
157
        reporter = CapturingReporter()
 
158
        wt.commit('removed hello', rev_id='rev2', reporter=reporter)
 
159
        self.assertEquals(
 
160
            [('missing', u'hello'), ('deleted', u'hello')],
 
161
            reporter.calls)
163
162
 
164
163
        tree = b.repository.revision_tree('rev2')
165
164
        self.assertFalse(tree.has_id('hello-id'))
359
358
            rev_ids.append(rev_id)
360
359
            wt.commit(message='rev %d' % (i+1),
361
360
                     rev_id=rev_id)
362
 
        eq = self.assertEquals
363
 
        eq(b.revision_history(), rev_ids)
364
361
        for i in range(4):
365
362
            self.assertThat(rev_ids[:i+1],
366
363
                MatchesAncestry(b.repository, rev_ids[i]))
428
425
            from bzrlib.testament import Testament
429
426
            # monkey patch gpg signing mechanism
430
427
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
431
 
            commit.Commit(config=MustSignConfig(branch)).commit(message="base",
432
 
                                                      allow_pointless=True,
433
 
                                                      rev_id='B',
434
 
                                                      working_tree=wt)
 
428
            conf = config.MemoryStack('''
 
429
gpg_signing_command=cat -
 
430
create_signatures=always
 
431
''')
 
432
            commit.Commit(config_stack=conf).commit(
 
433
                message="base", allow_pointless=True, rev_id='B',
 
434
                working_tree=wt)
435
435
            def sign(text):
436
436
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
437
437
            self.assertEqual(sign(Testament.from_revision(branch.repository,
438
 
                             'B').as_short_text()),
 
438
                                                          'B').as_short_text()),
439
439
                             branch.repository.get_signature_text('B'))
440
440
        finally:
441
441
            bzrlib.gpg.GPGStrategy = oldstrategy
451
451
        try:
452
452
            # monkey patch gpg signing mechanism
453
453
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.DisabledGPGStrategy
454
 
            config = MustSignConfig(branch)
 
454
            conf = config.MemoryStack('''
 
455
gpg_signing_command=cat -
 
456
create_signatures=always
 
457
''')
455
458
            self.assertRaises(SigningFailed,
456
 
                              commit.Commit(config=config).commit,
 
459
                              commit.Commit(config_stack=conf).commit,
457
460
                              message="base",
458
461
                              allow_pointless=True,
459
462
                              rev_id='B',
460
463
                              working_tree=wt)
461
464
            branch = Branch.open(self.get_url('.'))
462
 
            self.assertEqual(branch.revision_history(), ['A'])
 
465
            self.assertEqual(branch.last_revision(), 'A')
463
466
            self.assertFalse(branch.repository.has_revision('B'))
464
467
        finally:
465
468
            bzrlib.gpg.GPGStrategy = oldstrategy
473
476
            calls.append('called')
474
477
        bzrlib.ahook = called
475
478
        try:
476
 
            config = BranchWithHooks(branch)
477
 
            commit.Commit(config=config).commit(
478
 
                            message = "base",
479
 
                            allow_pointless=True,
480
 
                            rev_id='A', working_tree = wt)
 
479
            conf = config.MemoryStack('post_commit=bzrlib.ahook bzrlib.ahook')
 
480
            commit.Commit(config_stack=conf).commit(
 
481
                message = "base", allow_pointless=True, rev_id='A',
 
482
                working_tree = wt)
481
483
            self.assertEqual(['called', 'called'], calls)
482
484
        finally:
483
485
            del bzrlib.ahook