1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
# Copyright (C) 2006 by Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import bzrlib.errors as errors
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
"""Tests for branch.update()"""
class TestUpdate(TestCaseWithBranch):
def test_update_unbound_works(self):
b = self.make_branch('.')
b.update()
self.assertEqual(None, b.last_revision())
def test_update_prefix_returns_none(self):
# update in a branch when its a prefix of the master should
# indicate that no local changes were present.
master_tree = self.make_branch_and_tree('master')
child_tree = self.make_branch_and_tree('child')
try:
child_tree.branch.bind(master_tree.branch)
except errors.UpgradeRequired:
# old branch, cant test.
return
# commit to the child to make the last rev not-None.
child_tree.commit('foo', rev_id='foo', allow_pointless=True)
# update the master so we can commit there.
master_tree.update()
# commit to the master making the child tree out of date and a prefix.
master_tree.commit('bar', rev_id='bar', allow_pointless=True)
self.assertEqual(None, child_tree.branch.update())
def test_update_local_commits_returns_old_tip(self):
# update in a branch when its not a prefix of the master should
# return the previous tip and reset the revision history.
master_tree = self.make_branch_and_tree('master')
child_tree = self.make_branch_and_tree('child')
try:
child_tree.branch.bind(master_tree.branch)
except errors.UpgradeRequired:
# old branch, cant test.
return
# commit to the child to make the last rev not-None and skew it from master.
child_tree.commit('foo', rev_id='foo', allow_pointless=True, local=True)
# commit to the master making the child tree out of date and not a prefix.
master_tree.commit('bar', rev_id='bar', allow_pointless=True)
self.assertEqual('foo', child_tree.branch.update())
self.assertEqual(['bar'], child_tree.branch.revision_history())
|
