← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Aaron Bentley
  • Date: 2007-07-17 20:04:13 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2639.
  • Revision ID: abentley@panoramicfeedback.com-20070717200413-jpganazttxzryrx8
Deprecate RevisionTree.get_weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
 
1
# Copyright (C) 2005 Canonical 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
 
 
18
from StringIO import StringIO
 
19
 
 
20
from bzrlib.revisionspec import RevisionSpec
 
21
from bzrlib.status import show_pending_merges, show_tree_status
 
22
from bzrlib.tests import TestCaseWithTransport
 
23
 
 
24
 
 
25
class TestStatus(TestCaseWithTransport):
 
26
 
 
27
    def test_pending_none(self):
 
28
        # Test whether show_pending_merges works in a tree with no commits
 
29
        tree = self.make_branch_and_tree('a')
 
30
        tree.commit('empty commit')
 
31
        tree2 = self.make_branch_and_tree('b')
 
32
        # set a left most parent that is not a present commit
 
33
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
 
34
        # do a merge
 
35
        tree2.merge_from_branch(tree.branch)
 
36
        output = StringIO()
 
37
        show_pending_merges(tree2, output)
 
38
        self.assertContainsRe(output.getvalue(), 'empty commit')
 
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()
 
47
        show_tree_status(tree, to_file=output,
 
48
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
49
                               RevisionSpec.from_string("revid:%s" % r2_id)])
 
50
        # return does not matter as long as it did not raise.