/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 10:47:43 UTC
  • mto: (6321.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6322.
  • Revision ID: v.ladeuil+lp@free.fr-20111124104743-rxqwhmzqu5k17f24
First cut at a working plugin to avoid conflicts in .po files by shelling out to msgmerge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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
17
17
 
18
18
import os
19
19
 
20
 
from .. import (
 
20
from bzrlib import (
21
21
    check,
22
22
    osutils,
 
23
    revision as _mod_revision,
23
24
    )
24
 
from ..commit import PointlessCommit
25
 
from . import (
 
25
from bzrlib.errors import PointlessCommit
 
26
from bzrlib.tests import (
26
27
    TestCaseWithTransport,
27
28
    )
28
 
from .features import (
 
29
from bzrlib.tests.features import (
29
30
    SymlinkFeature,
30
31
    )
31
 
from .matchers import RevisionHistoryMatches
32
32
 
33
33
 
34
34
class TestCommitMerge(TestCaseWithTransport):
43
43
        wtx = self.make_branch_and_tree('x')
44
44
        base_rev = wtx.commit('common parent')
45
45
        bx = wtx.branch
46
 
        wty = wtx.controldir.sprout('y').open_workingtree()
 
46
        wty = wtx.bzrdir.sprout('y').open_workingtree()
47
47
        by = wty.branch
48
48
 
49
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
50
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
50
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
51
51
 
52
52
        by.fetch(bx)
53
53
        # just having the history there does nothing
54
54
        self.assertRaises(PointlessCommit,
55
55
                          wty.commit,
56
 
                          'no changes yet', rev_id=b'y@u-0-2',
 
56
                          'no changes yet', rev_id='y@u-0-2',
57
57
                          allow_pointless=False)
58
58
        wty.merge_from_branch(bx)
59
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
 
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
60
60
 
61
 
        self.assertEqual(by.revno(), 3)
 
61
        self.assertEquals(by.revno(), 3)
62
62
        graph = wty.branch.repository.get_graph()
63
63
        self.addCleanup(wty.lock_read().unlock)
64
 
        self.assertThat(by,
65
 
                        RevisionHistoryMatches(
66
 
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
67
 
                        )
68
 
        rev = by.repository.get_revision(b'y@u-0-2')
69
 
        self.assertEqual(rev.parent_ids,
70
 
                         [b'y@u-0-1', b'x@u-0-1'])
 
64
        self.assertEquals(list(
 
65
            graph.iter_lefthand_ancestry(by.last_revision(),
 
66
                [_mod_revision.NULL_REVISION])),
 
67
            ['y@u-0-2', 'y@u-0-1', base_rev])
 
68
        rev = by.repository.get_revision('y@u-0-2')
 
69
        self.assertEquals(rev.parent_ids,
 
70
                          ['y@u-0-1', 'x@u-0-1'])
71
71
 
72
72
    def test_merge_new_file(self):
73
73
        """Commit merge of two trees with no overlapping files."""
75
75
        base_rev = wtx.commit('common parent')
76
76
        bx = wtx.branch
77
77
        wtx.commit('establish root id')
78
 
        wty = wtx.controldir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.path2id(''), wty.path2id(''))
 
78
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
79
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
80
80
        by = wty.branch
81
81
 
82
82
        self.build_tree(['x/ecks', 'y/why'])
83
83
 
84
 
        wtx.add(['ecks'], [b'ecks-id'])
85
 
        wty.add(['why'], [b'why-id'])
 
84
        wtx.add(['ecks'], ['ecks-id'])
 
85
        wty.add(['why'], ['why-id'])
86
86
 
87
 
        wtx.commit('commit one', rev_id=b'x@u-0-1', allow_pointless=True)
88
 
        wty.commit('commit two', rev_id=b'y@u-0-1', allow_pointless=True)
 
87
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
88
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
89
89
 
90
90
        wty.merge_from_branch(bx)
91
91
 
97
97
                          'partial commit', allow_pointless=False,
98
98
                          specific_files=['ecks'])
99
99
 
100
 
        wty.commit('merge from x', rev_id=b'y@u-0-2', allow_pointless=False)
101
 
        tree = by.repository.revision_tree(b'y@u-0-2')
102
 
        self.assertEqual(tree.get_file_revision('ecks'), b'x@u-0-1')
103
 
        self.assertEqual(tree.get_file_revision('why'), b'y@u-0-1')
 
100
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
101
        tree = by.repository.revision_tree('y@u-0-2')
 
102
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
103
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
104
104
 
105
105
        check.check_dwim(bx.base, False, True, True)
106
106
        check.check_dwim(by.base, False, True, True)
111
111
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
112
112
        tree_a.add('link')
113
113
        tree_a.commit('added link')
114
 
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
 
114
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
115
115
        self.build_tree(['tree_a/file'])
116
116
        tree_a.add('file')
117
117
        tree_a.commit('added file')