← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 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
 
import shutil
20
19
 
 
20
from bzrlib import (
 
21
    check,
 
22
    osutils,
 
23
    )
 
24
from bzrlib.errors import PointlessCommit
21
25
from bzrlib.tests import (
22
26
    TestCaseWithTransport,
23
 
    TestSkipped,
24
 
    )
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.errors import PointlessCommit, BzrError
27
 
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib import osutils
 
27
    )
 
28
from bzrlib.tests.features import (
 
29
    SymlinkFeature,
 
30
    )
 
31
from bzrlib.tests.matchers import RevisionHistoryMatches
29
32
 
30
33
 
31
34
class TestCommitMerge(TestCaseWithTransport):
42
45
        bx = wtx.branch
43
46
        wty = wtx.bzrdir.sprout('y').open_workingtree()
44
47
        by = wty.branch
45
 
        
 
48
 
46
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
50
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
48
51
 
49
 
        self.assertEqual((1, []), by.fetch(bx))
 
52
        by.fetch(bx)
50
53
        # just having the history there does nothing
51
54
        self.assertRaises(PointlessCommit,
52
55
                          wty.commit,
55
58
        wty.merge_from_branch(bx)
56
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
60
 
58
 
        self.assertEquals(by.revno(), 3)
59
 
        self.assertEquals(list(by.revision_history()),
60
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
61
        self.assertEqual(by.revno(), 3)
 
62
        graph = wty.branch.repository.get_graph()
 
63
        self.addCleanup(wty.lock_read().unlock)
 
64
        self.assertThat(by,
 
65
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
61
67
        rev = by.repository.get_revision('y@u-0-2')
62
 
        self.assertEquals(rev.parent_ids,
 
68
        self.assertEqual(rev.parent_ids,
63
69
                          ['y@u-0-1', 'x@u-0-1'])
64
70
 
65
71
    def test_merge_new_file(self):
89
95
                          wty.commit,
90
96
                          'partial commit', allow_pointless=False,
91
97
                          specific_files=['ecks'])
92
 
        
 
98
 
93
99
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
100
        tree = by.repository.revision_tree('y@u-0-2')
95
 
        inv = tree.inventory
96
 
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
 
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
 
101
        self.assertEqual(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
102
        self.assertEqual(tree.get_file_revision('why-id'), 'y@u-0-1')
98
103
 
99
 
        bx.check()
100
 
        by.check()
101
 
        bx.repository.check([bx.last_revision()])
102
 
        by.repository.check([by.last_revision()])
 
104
        check.check_dwim(bx.base, False, True, True)
 
105
        check.check_dwim(by.base, False, True, True)
103
106
 
104
107
    def test_merge_with_symlink(self):
105
 
        if not osutils.has_symlinks():
106
 
            raise TestSkipped('Symlinks are not supported on this platform')
 
108
        self.requireFeature(SymlinkFeature)
107
109
        tree_a = self.make_branch_and_tree('tree_a')
108
110
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
109
111
        tree_a.add('link')