← 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: Canonical.com Patch Queue Manager
  • Date: 2010-04-08 06:17:41 UTC
  • mfrom: (4797.33.16 apport)
  • Revision ID: pqm@pqm.ubuntu.com-20100408061741-m7vl6z97vu33riv7
(robertc) Make sure ExecutablePath and InterpreterPath are set in
        Apport. (Martin Pool, James Westby, lp:528114)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
from StringIO import StringIO
42
42
            tree2.unlock()
43
43
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
44
 
45
 
    def test_multiple_pending(self):
 
45
    def make_multiple_pending_tree(self):
46
46
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
47
47
        tree = self.make_branch_and_tree('a')
48
48
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
53
53
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
54
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
55
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch)
 
56
        tree.merge_from_branch(tree3.branch, force=True)
 
57
        return tree
 
58
 
 
59
    def test_multiple_pending(self):
 
60
        tree = self.make_multiple_pending_tree()
57
61
        output = StringIO()
58
62
        tree.lock_read()
59
63
        self.addCleanup(tree.unlock)
60
64
        show_pending_merges(tree, output)
 
65
        # 2b doesn't appear because it's an ancestor of 3b
 
66
        self.assertEqualDiff(
 
67
            'pending merge tips: (use -v to see all merge revisions)\n'
 
68
            '  Joe Foo 2007-12-04 commit 3b\n'
 
69
            '  Joe Foo 2007-12-04 commit 3c\n',
 
70
            output.getvalue())
 
71
 
 
72
    def test_multiple_pending_verbose(self):
 
73
        tree = self.make_multiple_pending_tree()
 
74
        output = StringIO()
 
75
        tree.lock_read()
 
76
        self.addCleanup(tree.unlock)
 
77
        show_pending_merges(tree, output, verbose=True)
61
78
        # Even though 2b is in the ancestry of 3c, it should only be displayed
62
79
        # under the first merge parent.
63
80
        self.assertEqualDiff('pending merges:\n'
75
92
        self.addCleanup(tree.unlock)
76
93
        output = StringIO()
77
94
        show_pending_merges(tree, output)
78
 
        self.assertEqualDiff('pending merges:\n'
79
 
                             '  (ghost) a-ghost-revision\n',
80
 
                             output.getvalue())
 
95
        self.assertEqualDiff(
 
96
            'pending merge tips: (use -v to see all merge revisions)\n'
 
97
            '  (ghost) a-ghost-revision\n',
 
98
            output.getvalue())
81
99
 
82
100
    def test_pending_with_ghosts(self):
83
101
        """Test when a pending merge's ancestry includes ghosts."""
93
111
        tree.lock_read()
94
112
        self.addCleanup(tree.unlock)
95
113
        output = StringIO()
96
 
        show_pending_merges(tree, output)
 
114
        show_pending_merges(tree, output, verbose=True)
97
115
        self.assertEqualDiff('pending merges:\n'
98
116
                             '  Joe Foo 2007-12-04 another non-ghost\n'
99
 
                             '    Joe Foo 2007-12-04 commit with ghost\n'
 
117
                             '    Joe Foo 2007-12-04 [merge] commit with ghost\n'
100
118
                             '    (ghost) a-ghost-revision\n'
101
119
                             '    Joe Foo 2007-12-04 a non-ghost\n',
102
120
                             output.getvalue())