← 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

Merge bzr.dev

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 revision 1 to ".*"\.\n'
 
86
        self.assertContainsRe(err, '^Committing 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 revision 2 to ".*"\.\n'
 
105
        self.assertContainsRe(err, '^Committing 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 revision 2 to ".*"\.\n'
 
115
        self.assertContainsRe(err, '^Committing 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 revision 2 to ".*"\.\n'
 
127
        self.assertContainsRe(err, '^Committing 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 revision 1 to ".*"\.\n'
 
140
        self.assertContainsRe(err, '^Committing 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 revision 2 to ".*"\.\n'
 
153
        self.assertContainsRe(err, '^Committing 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 revision 2 to "%s".\n'
 
167
        self.assertEqual(err, 'Committing 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 revision 2 to "%s".\n'
 
225
            'Committing to: %s\n'
226
226
            'modified filetomodify\n'
227
227
            'added newdir\n'
228
228
            'added newfile\n'
397
397
        output, err = self.run_bzr(
398
398
            'commit -m hello --fixes=lp:23452 tree/hello.txt')
399
399
        self.assertEqual('', output)
400
 
        self.assertContainsRe(err, 'Committing revision 1 to ".*"\.\n'
 
400
        self.assertContainsRe(err, 'Committing to: .*\n'
401
401
                              'added hello\.txt\n'
402
402
                              'Committed revision 1\.\n')
403
403