← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

  • Committer: Martin Pool
  • Date: 2007-10-12 08:00:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012080007-vf80woayyom8s8e1
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
83
83
        tree.add("hello.txt")
84
84
        out,err = self.run_bzr('commit -m added')
85
85
        self.assertEqual('', out)
86
 
        self.assertContainsRe(err, '^Committing to: .*\n'
 
86
        self.assertContainsRe(err, '^Committing revision 1 to ".*"\.\n'
87
87
                              'added hello.txt\n'
88
88
                              'Committed revision 1.\n$',)
89
89
 
102
102
        self.build_tree_contents([('hello.txt', 'new contents')])
103
103
        out, err = self.run_bzr('commit -m modified')
104
104
        self.assertEqual('', out)
105
 
        self.assertContainsRe(err, '^Committing to: .*\n'
 
105
        self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
106
106
                              'modified hello\.txt\n'
107
107
                              'Committed revision 2\.\n$')
108
108
 
112
112
        wt.rename_one('hello.txt', 'gutentag.txt')
113
113
        out, err = self.run_bzr('commit -m renamed')
114
114
        self.assertEqual('', out)
115
 
        self.assertContainsRe(err, '^Committing to: .*\n'
 
115
        self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
116
116
                              'renamed hello\.txt => gutentag\.txt\n'
117
117
                              'Committed revision 2\.$\n')
118
118
 
124
124
        wt.rename_one('hello.txt', 'subdir/hello.txt')
125
125
        out, err = self.run_bzr('commit -m renamed')
126
126
        self.assertEqual('', out)
127
 
        self.assertContainsRe(err, '^Committing to: .*\n'
 
127
        self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
128
128
                              'added subdir\n'
129
129
                              'renamed hello\.txt => subdir/hello\.txt\n'
130
130
                              'Committed revision 2\.\n$')
137
137
        wt.add(['hello.txt'])
138
138
        out,err = self.run_bzr('commit -m added')
139
139
        self.assertEqual('', out)
140
 
        self.assertContainsRe(err, '^Committing to: .*\n'
 
140
        self.assertContainsRe(err, '^Committing revision 1 to ".*"\.\n'
141
141
                              'added hello\.txt\n'
142
142
                              'Committed revision 1\.\n$')
143
143
 
150
150
        tree.add("hello.txt")
151
151
        out,err = self.run_bzr('commit -m added')
152
152
        self.assertEqual('', out)
153
 
        self.assertContainsRe(err, '^Committing to: .*\n'
 
153
        self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
154
154
                              'added hello\.txt\n'
155
155
                              'Committed revision 2\.$\n')
156
156
 
164
164
        b_tree = a_tree.branch.create_checkout('b')
165
165
        expected = "%s/" % (osutils.abspath('a'), )
166
166
        out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
167
 
        self.assertEqual(err, 'Committing to: %s\n'
 
167
        self.assertEqual(err, 'Committing revision 2 to "%s".\n'
168
168
                         'Committed revision 2.\n' % expected)
169
169
 
170
170
    def test_commit_merge_reports_all_modified_files(self):
222
222
        self.assertEqual('', out)
223
223
        expected = '%s/' % (osutils.getcwd(), )
224
224
        self.assertEqualDiff(
225
 
            'Committing to: %s\n'
 
225
            'Committing revision 2 to "%s".\n'
226
226
            'modified filetomodify\n'
227
227
            'added newdir\n'
228
228
            'added newfile\n'
331
331
        self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
332
332
        self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
333
333
 
334
 
    def test_commit_exclude_excludes_modified_files(self):
335
 
        """Commit -x foo should ignore changes to foo."""
336
 
        tree = self.make_branch_and_tree('.')
337
 
        self.build_tree(['a', 'b', 'c'])
338
 
        tree.smart_add(['.'])
339
 
        out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
340
 
        self.assertFalse('added b' in out)
341
 
        self.assertFalse('added b' in err)
342
 
        # If b was excluded it will still be 'added' in status.
343
 
        out, err = self.run_bzr(['added'])
344
 
        self.assertEqual('b\n', out)
345
 
        self.assertEqual('', err)
346
 
 
347
 
    def test_commit_exclude_twice_uses_both_rules(self):
348
 
        """Commit -x foo -x bar should ignore changes to foo and bar."""
349
 
        tree = self.make_branch_and_tree('.')
350
 
        self.build_tree(['a', 'b', 'c'])
351
 
        tree.smart_add(['.'])
352
 
        out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
353
 
        self.assertFalse('added b' in out)
354
 
        self.assertFalse('added c' in out)
355
 
        self.assertFalse('added b' in err)
356
 
        self.assertFalse('added c' in err)
357
 
        # If b was excluded it will still be 'added' in status.
358
 
        out, err = self.run_bzr(['added'])
359
 
        self.assertTrue('b\n' in out)
360
 
        self.assertTrue('c\n' in out)
361
 
        self.assertEqual('', err)
362
 
 
363
334
    def test_commit_respects_spec_for_removals(self):
364
335
        """Commit with a file spec should only commit removals that match"""
365
336
        t = self.make_branch_and_tree('.')
426
397
        output, err = self.run_bzr(
427
398
            'commit -m hello --fixes=lp:23452 tree/hello.txt')
428
399
        self.assertEqual('', output)
429
 
        self.assertContainsRe(err, 'Committing to: .*\n'
 
400
        self.assertContainsRe(err, 'Committing revision 1 to ".*"\.\n'
430
401
                              'added hello\.txt\n'
431
402
                              'Committed revision 1\.\n')
432
403
 
549
520
        tree = self.make_branch_and_tree('tree')
550
521
        self.build_tree(['tree/hello.txt'])
551
522
        tree.add('hello.txt')
552
 
        self.run_bzr(["commit", '-m', 'hello',
553
 
                      '--author', u'John D\xf6 <jdoe@example.com>',
554
 
                     "tree/hello.txt"])
 
523
        self.run_bzr("commit -m hello --author='John Doe <jdoe@example.com>' "
 
524
                     "tree/hello.txt")
555
525
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
556
526
        properties = last_rev.properties
557
 
        self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['author'])
 
527
        self.assertEqual('John Doe <jdoe@example.com>', properties['author'])
558
528
 
559
529
    def test_author_no_email(self):
560
530
        """Author's name without an email address is allowed, too."""