1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Tests for the commit CLI of bzr."""
20
from cStringIO import StringIO
26
from bzrlib.branch import Branch
27
import bzrlib.bzrdir as bzrdir
28
from bzrlib.errors import BzrCommandError
29
from bzrlib.tests.blackbox import ExternalBase
30
from bzrlib.workingtree import WorkingTree
33
class TestCommit(ExternalBase):
35
def test_05_empty_commit(self):
36
"""Commit of tree with no versioned files should fail"""
37
# If forced, it should succeed, but this is not tested here.
39
self.build_tree(['hello.txt'])
40
self.runbzr("commit -m empty", retcode=3)
42
def test_10_verbose_commit(self):
43
"""Add one file and examine verbose commit output"""
45
self.build_tree(['hello.txt'])
46
self.runbzr("add hello.txt")
47
out,err = self.run_bzr("commit", "-m", "added")
48
self.assertEqual('', out)
49
self.assertEqual('added hello.txt\n'
50
'Committed revision 1.\n',
53
def test_15_verbose_commit_with_unknown(self):
54
"""Unknown files should not be listed by default in verbose output"""
55
# Is that really the best policy?
57
self.build_tree(['hello.txt', 'extra.txt'])
58
self.runbzr("add hello.txt")
59
out,err = self.run_bzr("commit", "-m", "added")
60
self.assertEqual('', out)
61
self.assertEqual('added hello.txt\n'
62
'Committed revision 1.\n',
65
def test_16_verbose_commit_with_unchanged(self):
66
"""Unchanged files should not be listed by default in verbose output"""
68
self.build_tree(['hello.txt', 'unchanged.txt'])
69
self.runbzr('add unchanged.txt')
70
self.runbzr('commit -m unchanged unchanged.txt')
71
self.runbzr("add hello.txt")
72
out,err = self.run_bzr("commit", "-m", "added")
73
self.assertEqual('', out)
74
self.assertEqual('added hello.txt\n'
75
'Committed revision 2.\n',
78
def test_empty_commit_message(self):
80
file('foo.c', 'wt').write('int main() {}')
81
self.runbzr(['add', 'foo.c'])
82
self.runbzr(["commit", "-m", ""] , retcode=3)
84
def test_other_branch_commit(self):
85
# this branch is to ensure consistent behaviour, whether we're run
86
# inside a branch, or not.
87
os.mkdir('empty_branch')
88
os.chdir('empty_branch')
93
file('foo.c', 'wt').write('int main() {}')
94
file('bar.c', 'wt').write('int main() {}')
96
self.runbzr(['add', 'branch/foo.c'])
97
self.runbzr(['add', 'branch'])
98
# can't commit files in different trees; sane error
99
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
100
self.runbzr('commit -m newstuff branch/foo.c')
101
self.runbzr('commit -m newstuff branch')
102
self.runbzr('commit -m newstuff branch', retcode=3)
104
def test_out_of_date_tree_commit(self):
105
# check we get an error code and a clear message committing with an out
107
self.make_branch_and_tree('branch')
109
self.runbzr('checkout --lightweight branch checkout')
110
# commit to the original branch to make the checkout out of date
111
self.runbzr('commit --unchanged -m message branch')
112
# now commit to the checkout should emit
113
# ERROR: Out of date with the branch, 'bzr update' is suggested
114
output = self.runbzr('commit --unchanged -m checkout_message '
115
'checkout', retcode=3)
116
self.assertEqual(output,
118
"bzr: ERROR: Working tree is out of date, please run "
121
def test_local_commit_unbound(self):
122
# a --local commit on an unbound branch is an error
123
self.make_branch_and_tree('.')
124
out, err = self.run_bzr('commit', '--local', retcode=3)
125
self.assertEqualDiff('', out)
126
self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
127
'on unbound branches.\n', err)
added
removed
bzrlib/tests/blackbox/test_commit.py
