← 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] improved 'missing' command from aaron

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
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):
 
23
    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')
 
30
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
31
        original.working_tree().commit('a', rev_id='a')
 
32
        self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
 
33
        puller.pull(original)
 
34
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
35
        merger.pull(original)
 
36
        original.working_tree().commit('b', rev_id='b')
 
37
        original.working_tree().commit('c', rev_id='c')
 
38
        self.assertEqual(find_unmerged(original, puller), ([(2, u'b'), 
 
39
                                                            (3, u'c')], []))
 
40
 
 
41
        puller.pull(original)
 
42
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
43
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
 
44
                                                            (3, u'c')], []))
 
45
        merge(['original', -1], [None, None], this_dir='merger')
 
46
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
 
47
                                                            (3, u'c')], []))
 
48
        merger.working_tree().commit('d', rev_id='d')
 
49
        self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))