← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

  • Committer: Robert Collins
  • Date: 2005-10-06 05:13:21 UTC
  • mfrom: (1393.3.3)
  • Revision ID: robertc@robertcollins.net-20051006051321-88f1053c3bf1ca4a
merge in an adjusted version of Jelmer's empty-log detection patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
1
 
# Copyright (C) 2005 by 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
 
import os
18
 
 
19
 
 
20
 
from bzrlib.builtins import merge
21
 
from bzrlib.missing import find_unmerged
22
 
from bzrlib.tests import TestCaseWithTransport
23
 
from bzrlib.workingtree import WorkingTree
24
 
 
25
 
 
26
 
class TestMissing(TestCaseWithTransport):
27
 
 
28
 
    def test_find_unmerged(self):
29
 
        original_tree = self.make_branch_and_tree('original')
30
 
        original = original_tree.branch
31
 
        puller_tree = self.make_branch_and_tree('puller')
32
 
        puller = puller_tree.branch
33
 
        merger_tree = self.make_branch_and_tree('merger')
34
 
        merger = merger_tree.branch
35
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
36
 
        original_tree.commit('a', rev_id='a')
37
 
        self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
38
 
        puller_tree.pull(original)
39
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
40
 
        merger_tree.pull(original)
41
 
        original_tree.commit('b', rev_id='b')
42
 
        original_tree.commit('c', rev_id='c')
43
 
        self.assertEqual(find_unmerged(original, puller), ([(2, u'b'), 
44
 
                                                            (3, u'c')], []))
45
 
 
46
 
        puller_tree.pull(original)
47
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
48
 
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
49
 
                                                            (3, u'c')], []))
50
 
        merge(['original', -1], [None, None], this_dir='merger')
51
 
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
52
 
                                                            (3, u'c')], []))
53
 
        merger_tree.commit('d', rev_id='d')
54
 
        self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))