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