bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
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  | 
||
| 
1948.4.33
by John Arbash Meinel
 Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)  | 
20  | 
from bzrlib.revisionspec import RevisionSpec  | 
| 
1852.2.1
by Robert Collins
 General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.  | 
21  | 
from bzrlib.status import show_pending_merges, show_tree_status  | 
22  | 
from bzrlib.tests import TestCaseWithTransport  | 
|
23  | 
||
24  | 
||
25  | 
class TestStatus(TestCaseWithTransport):  | 
|
| 
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
 | 
| 
1852.2.1
by Robert Collins
 General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.  | 
29  | 
tree = self.make_branch_and_tree('a')  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
30  | 
tree.commit('empty commit')  | 
| 
1852.2.1
by Robert Collins
 General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.  | 
31  | 
tree2 = self.make_branch_and_tree('b')  | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
32  | 
        # set a left most parent that is not a present commit
 | 
| 
1908.6.11
by Robert Collins
 Remove usage of tree.pending_merges().  | 
33  | 
tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
34  | 
        # do a merge
 | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
35  | 
tree2.merge_from_branch(tree.branch)  | 
| 
1551.6.19
by Aaron Bentley
 Fix pending merge status on empty trees  | 
36  | 
output = StringIO()  | 
37  | 
show_pending_merges(tree2, output)  | 
|
38  | 
self.assertContainsRe(output.getvalue(), 'empty commit')  | 
|
| 
1852.2.1
by Robert Collins
 General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.  | 
39  | 
|
40  | 
def tests_revision_to_revision(self):  | 
|
41  | 
"""doing a status between two revision trees should work."""  | 
|
42  | 
tree = self.make_branch_and_tree('.')  | 
|
43  | 
r1_id = tree.commit('one', allow_pointless=True)  | 
|
44  | 
r2_id = tree.commit('two', allow_pointless=True)  | 
|
45  | 
r2_tree = tree.branch.repository.revision_tree(r2_id)  | 
|
46  | 
output = StringIO()  | 
|
| 
1948.4.29
by John Arbash Meinel
 Remove a few more direct references to RevisionSpec  | 
47  | 
show_tree_status(tree, to_file=output,  | 
| 
1948.4.33
by John Arbash Meinel
 Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)  | 
48  | 
revision=[RevisionSpec.from_string("revid:%s" % r1_id),  | 
49  | 
RevisionSpec.from_string("revid:%s" % r2_id)])  | 
|
| 
1852.2.1
by Robert Collins
 General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.  | 
50  | 
        # return does not matter as long as it did not raise.
 |