← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

[merge] update from bzr.dev

Show diffs side-by-side

added added

removed removed

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