/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/branch_implementations/test_update.py

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_update.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 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
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
import bzrlib.errors as errors
 
18
from bzrlib import (
 
19
    errors,
 
20
    revision as _mod_revision,
 
21
    )
19
22
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
20
23
 
21
24
 
27
30
    def test_update_unbound_works(self):
28
31
        b = self.make_branch('.')
29
32
        b.update()
30
 
        self.assertEqual(None, b.last_revision())
 
33
        self.assertEqual(_mod_revision.NULL_REVISION,
 
34
                         _mod_revision.ensure_null(b.last_revision()))
31
35
 
32
36
    def test_update_prefix_returns_none(self):
33
37
        # update in a branch when its a prefix of the master should
63
67
        master_tree.commit('bar', rev_id='bar', allow_pointless=True)
64
68
        self.assertEqual('foo', child_tree.branch.update())
65
69
        self.assertEqual(['bar'], child_tree.branch.revision_history())
 
70
 
 
71
 
 
72
class TestUpdateRevisions(TestCaseWithBranch):
 
73
 
 
74
    def test_accepts_graph(self):
 
75
        # An implementation may not use it, but it should allow a 'graph' to be
 
76
        # supplied
 
77
        tree1 = self.make_branch_and_tree('tree1')
 
78
        rev1 = tree1.commit('one')
 
79
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
80
        rev2 = tree2.commit('two')
 
81
 
 
82
        tree1.lock_write()
 
83
        self.addCleanup(tree1.unlock)
 
84
        tree2.lock_read()
 
85
        self.addCleanup(tree2.unlock)
 
86
        graph = tree2.branch.repository.get_graph(tree1.branch.repository)
 
87
 
 
88
        tree1.branch.update_revisions(tree2.branch, graph=graph)
 
89
        self.assertEqual((2, rev2), tree1.branch.last_revision_info())
 
90
 
 
91
    def test_overwrite_ignores_diverged(self):
 
92
        tree1 = self.make_branch_and_tree('tree1')
 
93
        rev1 = tree1.commit('one')
 
94
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
95
        rev2 = tree1.commit('two')
 
96
        rev2b = tree2.commit('alt two')
 
97
 
 
98
        self.assertRaises(errors.DivergedBranches,
 
99
                          tree1.branch.update_revisions,
 
100
                          tree2.branch, overwrite=False)
 
101
        # However, the revision should be copied into the repository
 
102
        self.assertTrue(tree1.branch.repository.has_revision(rev2b))
 
103
 
 
104
        tree1.branch.update_revisions(tree2.branch, overwrite=True)
 
105
        self.assertEqual((2, rev2b), tree1.branch.last_revision_info())
 
106
 
 
107
    def test_ignores_older_unless_overwrite(self):
 
108
        tree1 = self.make_branch_and_tree('tree1')
 
109
        rev1 = tree1.commit('one')
 
110
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
111
        rev2 = tree1.commit('two')
 
112
 
 
113
        tree1.branch.update_revisions(tree2.branch)
 
114
        self.assertEqual((2, rev2), tree1.branch.last_revision_info())
 
115
 
 
116
        tree1.branch.update_revisions(tree2.branch, overwrite=True)
 
117
        self.assertEqual((1, rev1), tree1.branch.last_revision_info())