← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remerge.py

  • Committer: Launchpad Translations on behalf of bzr-core
  • Date: 2012-08-15 04:30:44 UTC
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120815043044-gz33c0m7judhpvyq
Launchpad automatic translations update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
import os
19
19
 
20
 
from bzrlib.tests.blackbox import ExternalBase
 
20
from bzrlib.tests import TestCaseWithTransport
21
21
from bzrlib.workingtree import WorkingTree
22
22
 
23
23
 
24
 
class TestRemerge(ExternalBase):
 
24
class TestRemerge(TestCaseWithTransport):
25
25
 
26
26
    def make_file(self, name, contents):
27
 
        f = open(name, 'wb')
28
 
        try:
 
27
        with open(name, 'wb') as f:
29
28
            f.write(contents)
30
 
        finally:
31
 
            f.close()
32
29
 
33
30
    def create_conflicts(self):
34
31
        """Create a conflicted tree"""
35
32
        os.mkdir('base')
36
 
        os.chdir('base')
37
 
        self.make_file('hello', "hi world")
38
 
        self.make_file('answer', "42")
39
 
        self.run_bzr('init')
40
 
        self.run_bzr('add')
41
 
        self.run_bzr('commit -m base')
42
 
        self.run_bzr('branch . ../other')
43
 
        self.run_bzr('branch . ../this')
44
 
        os.chdir('../other')
45
 
        self.make_file('hello', "Hello.")
46
 
        self.make_file('answer', "Is anyone there?")
47
 
        self.run_bzr('commit -m other')
48
 
        os.chdir('../this')
49
 
        self.make_file('hello', "Hello, world")
50
 
        self.run_bzr('mv answer question')
51
 
        self.make_file('question', "What do you get when you multiply six"
52
 
                                   "times nine?")
53
 
        self.run_bzr('commit -m this')
 
33
        self.make_file('base/hello', "hi world")
 
34
        self.make_file('base/answer', "42")
 
35
        self.run_bzr('init', working_dir='base')
 
36
        self.run_bzr('add', working_dir='base')
 
37
        self.run_bzr('commit -m base', working_dir='base')
 
38
        self.run_bzr('branch base other')
 
39
        self.run_bzr('branch base this')
 
40
        self.make_file('other/hello', "Hello.")
 
41
        self.make_file('other/answer', "Is anyone there?")
 
42
        self.run_bzr('commit -m other', working_dir='other')
 
43
        self.make_file('this/hello', "Hello, world")
 
44
        self.run_bzr('mv answer question', working_dir='this')
 
45
        self.make_file('this/question',
 
46
                       "What do you get when you multiply sixtimes nine?")
 
47
        self.run_bzr('commit -m this', working_dir='this')
54
48
 
55
49
    def test_remerge(self):
56
50
        """Remerge command works as expected"""
57
51
        self.create_conflicts()
58
 
        self.run_bzr('merge ../other --show-base', retcode=1)
59
 
        conflict_text = open('hello').read()
 
52
        self.run_bzr('merge ../other --show-base',
 
53
                     retcode=1, working_dir='this')
 
54
        conflict_text = open('this/hello').read()
60
55
        self.assertTrue('|||||||' in conflict_text)
61
56
        self.assertTrue('hi world' in conflict_text)
62
57
 
63
 
        self.run_bzr_error(['conflicts encountered'], 'remerge', retcode=1)
64
 
        conflict_text = open('hello').read()
 
58
        self.run_bzr_error(['conflicts encountered'], 'remerge',
 
59
                           retcode=1, working_dir='this')
 
60
        with open('this/hello') as f:
 
61
            conflict_text = f.read()
65
62
        self.assertFalse('|||||||' in conflict_text)
66
63
        self.assertFalse('hi world' in conflict_text)
67
64
 
68
 
        os.unlink('hello.OTHER')
69
 
        os.unlink('question.OTHER')
 
65
        os.unlink('this/hello.OTHER')
 
66
        os.unlink('this/question.OTHER')
70
67
 
71
68
        self.run_bzr_error(['jello is not versioned'],
72
 
                     'remerge jello --merge-type weave')
 
69
                     'remerge jello --merge-type weave', working_dir='this')
73
70
        self.run_bzr_error(['conflicts encountered'],
74
71
                           'remerge hello --merge-type weave',
75
 
                           retcode=1)
76
 
 
77
 
        self.failUnlessExists('hello.OTHER')
78
 
        self.failIfExists('question.OTHER')
79
 
 
80
 
        file_id = self.run_bzr('file-id hello')[0]
 
72
                           retcode=1, working_dir='this')
 
73
 
 
74
        self.assertPathExists('this/hello.OTHER')
 
75
        self.assertPathDoesNotExist('this/question.OTHER')
 
76
 
 
77
        file_id = self.run_bzr('file-id hello', working_dir='this')[0]
81
78
        self.run_bzr_error(['hello.THIS is not versioned'],
82
 
                           'file-id hello.THIS')
 
79
                           'file-id hello.THIS', working_dir='this')
83
80
 
84
81
        self.run_bzr_error(['conflicts encountered'],
85
 
                           'remerge --merge-type weave', retcode=1)
 
82
                           'remerge --merge-type weave',
 
83
                           retcode=1, working_dir='this')
86
84
 
87
 
        self.failUnlessExists('hello.OTHER')
88
 
        self.failIfExists('hello.BASE')
 
85
        self.assertPathExists('this/hello.OTHER')
 
86
        self.assertTrue('this/hello.BASE')
 
87
        with open('this/hello') as f:
 
88
            conflict_text = f.read()
89
89
        self.assertFalse('|||||||' in conflict_text)
90
90
        self.assertFalse('hi world' in conflict_text)
91
91
 
92
92
        self.run_bzr_error(['Showing base is not supported.*Weave'],
93
 
                           'remerge . --merge-type weave --show-base')
94
 
        self.run_bzr_error(['Can\'t reprocess and show base'],
95
 
                           'remerge . --show-base --reprocess')
 
93
                           'remerge . --merge-type weave --show-base',
 
94
                           working_dir='this')
 
95
        self.run_bzr_error(["Can't reprocess and show base"],
 
96
                           'remerge . --show-base --reprocess',
 
97
                           working_dir='this')
96
98
        self.run_bzr_error(['conflicts encountered'],
97
99
                           'remerge . --merge-type weave --reprocess',
98
 
                           retcode=1)
 
100
                           retcode=1, working_dir='this')
99
101
        self.run_bzr_error(['conflicts encountered'],
100
102
                           'remerge hello --show-base',
101
 
                           retcode=1)
 
103
                           retcode=1, working_dir='this')
102
104
        self.run_bzr_error(['conflicts encountered'],
103
 
                           'remerge hello --reprocess', retcode=1)
 
105
                           'remerge hello --reprocess',
 
106
                           retcode=1, working_dir='this')
104
107
 
105
 
        self.run_bzr('resolve --all')
106
 
        self.run_bzr('commit -m done')
 
108
        self.run_bzr('resolve --all', working_dir='this')
 
109
        self.run_bzr('commit -m done', working_dir='this')
107
110
 
108
111
        self.run_bzr_error(['remerge only works after normal merges',
109
112
                            'Not cherrypicking or multi-merges'],
110
 
                           'remerge')
 
113
                           'remerge', working_dir='this')
111
114
 
112
115
    def test_conflicts(self):
113
116
        self.create_conflicts()
114
 
        self.run_bzr('merge ../other', retcode=1)
115
 
        wt = WorkingTree.open('.')
116
 
        self.assertEqual(2, len(wt.conflicts()))
117
 
        self.run_bzr('remerge', retcode=1)
118
 
        wt = WorkingTree.open('.')
119
 
        self.assertEqual(2, len(wt.conflicts()))
120
 
        self.run_bzr('remerge hello', retcode=1)
 
117
        self.run_bzr('merge ../other', retcode=1, working_dir='this')
 
118
        wt = WorkingTree.open('this')
 
119
        self.assertEqual(2, len(wt.conflicts()))
 
120
        self.run_bzr('remerge', retcode=1, working_dir='this')
 
121
        wt = WorkingTree.open('this')
 
122
        self.assertEqual(2, len(wt.conflicts()))
 
123
        self.run_bzr('remerge hello', retcode=1, working_dir='this')
 
124
        wt = WorkingTree.open('this')
121
125
        self.assertEqual(2, len(wt.conflicts()))