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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
# Copyright (C) 2006 by Canonical Ltd
# -*- coding: utf-8 -*-
# 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
"""Tests for the update command of bzr."""
from bzrlib.tests import TestSkipped
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.workingtree import WorkingTree
class TestUpdate(ExternalBase):
def test_update_standalone_trivial(self):
self.runbzr("init")
out, err = self.runbzr('update')
self.assertEqual('Tree is up to date.\n', err)
self.assertEqual('', out)
def test_update_up_to_date_light_checkout(self):
self.make_branch_and_tree('branch')
self.runbzr('checkout --lightweight branch checkout')
out, err = self.runbzr('update checkout')
self.assertEqual('Tree is up to date.\n', err)
self.assertEqual('', out)
def test_update_out_of_date_standalone_tree(self):
# FIXME the default format has to change for this to pass
# because it currently uses the branch last-revision marker.
raise TestSkipped('default format too old')
self.make_branch_and_tree('branch')
# make a checkout
self.runbzr('checkout --lightweight branch checkout')
self.build_tree(['checkout/file'])
self.runbzr('add checkout/file')
self.runbzr('commit -m add-file checkout')
# now branch should be out of date
out,err = self.runbzr('update branch')
self.assertEqual('Updated to revision 1.\n', out)
self.assertEqual('', err)
self.failUnlessExists('branch/file')
def test_update_out_of_date_light_checkout(self):
self.make_branch_and_tree('branch')
# make two checkouts
self.runbzr('checkout --lightweight branch checkout')
self.runbzr('checkout --lightweight branch checkout2')
self.build_tree(['checkout/file'])
self.runbzr('add checkout/file')
self.runbzr('commit -m add-file checkout')
# now checkout2 should be out of date
out,err = self.runbzr('update checkout2')
self.assertEqual('All changes applied successfully.\n'
'Updated to revision 1.\n',
err)
self.assertEqual('', out)
def test_update_conflicts_returns_2(self):
self.make_branch_and_tree('branch')
# make two checkouts
self.runbzr('checkout --lightweight branch checkout')
self.build_tree(['checkout/file'])
self.runbzr('add checkout/file')
self.runbzr('commit -m add-file checkout')
self.runbzr('checkout --lightweight branch checkout2')
# now alter file in checkout
a_file = file('checkout/file', 'wt')
a_file.write('Foo')
a_file.close()
self.runbzr('commit -m checnge-file checkout')
# now checkout2 should be out of date
# make a local change to file
a_file = file('checkout2/file', 'wt')
a_file.write('Bar')
a_file.close()
out,err = self.runbzr('update checkout2', retcode=1)
self.assertEqual(['1 conflicts encountered.',
'Updated to revision 2.'],
err.split('\n')[1:3])
self.assertContainsRe(err, 'Text conflict in file\n')
self.assertEqual('', out)
def test_smoke_update_checkout_bound_branch_local_commits(self):
# smoke test for doing an update of a checkout of a bound
# branch with local commits.
self.make_branch_and_tree('master')
# make a bound branch
self.run_bzr('checkout', 'master', 'child')
# check that out
self.run_bzr('checkout', '--lightweight', 'child', 'checkout')
# change master
a_file = file('master/file', 'wt')
a_file.write('Foo')
a_file.close()
self.run_bzr('add', 'master')
self.run_bzr('commit', '-m', 'add file', 'master')
# change child
a_file = file('child/file_b', 'wt')
a_file.write('Foo')
a_file.close()
self.run_bzr('add', 'child')
self.run_bzr('commit', '--local', '-m', 'add file_b', 'child')
# check checkout
a_file = file('checkout/file_c', 'wt')
a_file.write('Foo')
a_file.close()
self.run_bzr('add', 'checkout')
# now, update checkout ->
# get all three files and a pending merge.
self.run_bzr('update', 'checkout')
wt = WorkingTree.open('checkout')
self.assertNotEqual([], wt.pending_merges())
self.failUnlessExists('checkout/file')
self.failUnlessExists('checkout/file_b')
self.failUnlessExists('checkout/file_c')
self.assertTrue(wt.has_filename('file_c'))
|