1551.6.20
by Aaron Bentley
Add copyright and whitespace |
1 |
# Copyright (C) 2005 by Canonical Development Ltd
|
2 |
#
|
|
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.
|
|
7 |
#
|
|
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.
|
|
12 |
#
|
|
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
|
|
16 |
||
17 |
||
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
18 |
from StringIO import StringIO |
19 |
||
20 |
from bzrlib.bzrdir import BzrDir |
|
21 |
from bzrlib.status import show_pending_merges |
|
22 |
from bzrlib.tests import TestCaseInTempDir |
|
23 |
||
1551.6.20
by Aaron Bentley
Add copyright and whitespace |
24 |
|
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
25 |
class TestStatus(TestCaseInTempDir): |
1551.6.20
by Aaron Bentley
Add copyright and whitespace |
26 |
|
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
27 |
def test_pending_none(self): |
1551.6.20
by Aaron Bentley
Add copyright and whitespace |
28 |
# Test whether show_pending_merges works in a tree with no commits
|
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
29 |
tree = BzrDir.create_standalone_workingtree('a') |
30 |
tree.commit('empty commit') |
|
31 |
tree2 = BzrDir.create_standalone_workingtree('b') |
|
32 |
tree2.branch.fetch(tree.branch) |
|
33 |
tree2.set_pending_merges([tree.last_revision()]) |
|
34 |
output = StringIO() |
|
35 |
show_pending_merges(tree2, output) |
|
36 |
self.assertContainsRe(output.getvalue(), 'empty commit') |