2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2006 Canonical Ltd
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
2 |
# -*- coding: utf-8 -*-
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
3 |
#
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
4 |
# This program is free software; you can redistribute it and/or modify
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
8 |
#
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
9 |
# This program is distributed in the hope that it will be useful,
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
13 |
#
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
14 |
# You should have received a copy of the GNU General Public License
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
||
19 |
"""Tests for the update command of bzr."""
|
|
20 |
||
1711.2.109
by John Arbash Meinel
Add a test for handling a pending merge plus an update. |
21 |
import os |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
22 |
|
1711.2.109
by John Arbash Meinel
Add a test for handling a pending merge plus an update. |
23 |
from bzrlib import branch, bzrdir |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
24 |
from bzrlib.tests import TestSkipped |
25 |
from bzrlib.tests.blackbox import ExternalBase |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
26 |
from bzrlib.workingtree import WorkingTree |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
27 |
|
28 |
||
29 |
class TestUpdate(ExternalBase): |
|
30 |
||
31 |
def test_update_standalone_trivial(self): |
|
32 |
self.runbzr("init") |
|
33 |
out, err = self.runbzr('update') |
|
1830.1.1
by John Arbash Meinel
Print up to date even if bound, also always print out current revno. |
34 |
self.assertEqual('Tree is up to date at revision 0.\n', err) |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
35 |
self.assertEqual('', out) |
36 |
||
1815.3.4
by Stefan (metze) Metzmacher
add simple test for 'bzr up' |
37 |
def test_update_standalone_trivial_with_alias_up(self): |
38 |
self.runbzr("init") |
|
39 |
out, err = self.runbzr('up') |
|
40 |
self.assertEqual('Tree is up to date at revision 0.\n', err) |
|
41 |
self.assertEqual('', out) |
|
42 |
||
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
43 |
def test_update_up_to_date_light_checkout(self): |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
44 |
self.make_branch_and_tree('branch') |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
45 |
self.runbzr('checkout --lightweight branch checkout') |
1534.5.1
by Robert Collins
Give info some reasonable output and tests. |
46 |
out, err = self.runbzr('update checkout') |
1830.1.1
by John Arbash Meinel
Print up to date even if bound, also always print out current revno. |
47 |
self.assertEqual('Tree is up to date at revision 0.\n', err) |
48 |
self.assertEqual('', out) |
|
49 |
||
50 |
def test_update_up_to_date_checkout(self): |
|
51 |
self.make_branch_and_tree('branch') |
|
52 |
self.run_bzr('checkout', 'branch', 'checkout') |
|
53 |
out, err = self.run_bzr('update', 'checkout') |
|
54 |
self.assertEqual('Tree is up to date at revision 0.\n', err) |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
55 |
self.assertEqual('', out) |
56 |
||
57 |
def test_update_out_of_date_standalone_tree(self): |
|
58 |
# FIXME the default format has to change for this to pass
|
|
59 |
# because it currently uses the branch last-revision marker.
|
|
60 |
self.make_branch_and_tree('branch') |
|
61 |
# make a checkout
|
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
62 |
self.runbzr('checkout --lightweight branch checkout') |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
63 |
self.build_tree(['checkout/file']) |
64 |
self.runbzr('add checkout/file') |
|
65 |
self.runbzr('commit -m add-file checkout') |
|
66 |
# now branch should be out of date
|
|
67 |
out,err = self.runbzr('update branch') |
|
1711.2.107
by John Arbash Meinel
re-enable a skipped update test, and clean it up |
68 |
self.assertEqual('', out) |
69 |
self.assertEqual('All changes applied successfully.\n' |
|
70 |
'Updated to revision 1.\n', err) |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
71 |
self.failUnlessExists('branch/file') |
72 |
||
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
73 |
def test_update_out_of_date_light_checkout(self): |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
74 |
self.make_branch_and_tree('branch') |
75 |
# make two checkouts
|
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
76 |
self.runbzr('checkout --lightweight branch checkout') |
77 |
self.runbzr('checkout --lightweight branch checkout2') |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
78 |
self.build_tree(['checkout/file']) |
79 |
self.runbzr('add checkout/file') |
|
80 |
self.runbzr('commit -m add-file checkout') |
|
81 |
# now checkout2 should be out of date
|
|
82 |
out,err = self.runbzr('update checkout2') |
|
83 |
self.assertEqual('All changes applied successfully.\n' |
|
84 |
'Updated to revision 1.\n', |
|
85 |
err) |
|
86 |
self.assertEqual('', out) |
|
87 |
||
88 |
def test_update_conflicts_returns_2(self): |
|
89 |
self.make_branch_and_tree('branch') |
|
90 |
# make two checkouts
|
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
91 |
self.runbzr('checkout --lightweight branch checkout') |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
92 |
self.build_tree(['checkout/file']) |
93 |
self.runbzr('add checkout/file') |
|
94 |
self.runbzr('commit -m add-file checkout') |
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
95 |
self.runbzr('checkout --lightweight branch checkout2') |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
96 |
# now alter file in checkout
|
97 |
a_file = file('checkout/file', 'wt') |
|
98 |
a_file.write('Foo') |
|
99 |
a_file.close() |
|
100 |
self.runbzr('commit -m checnge-file checkout') |
|
101 |
# now checkout2 should be out of date
|
|
102 |
# make a local change to file
|
|
103 |
a_file = file('checkout2/file', 'wt') |
|
104 |
a_file.write('Bar') |
|
105 |
a_file.close() |
|
106 |
out,err = self.runbzr('update checkout2', retcode=1) |
|
107 |
self.assertEqual(['1 conflicts encountered.', |
|
108 |
'Updated to revision 2.'], |
|
109 |
err.split('\n')[1:3]) |
|
1534.7.164
by Aaron Bentley
Updated test to new conflict message |
110 |
self.assertContainsRe(err, 'Text conflict in file\n') |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
111 |
self.assertEqual('', out) |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
112 |
|
113 |
def test_smoke_update_checkout_bound_branch_local_commits(self): |
|
114 |
# smoke test for doing an update of a checkout of a bound
|
|
115 |
# branch with local commits.
|
|
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
116 |
master = self.make_branch_and_tree('master') |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
117 |
# make a bound branch
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
118 |
self.run_bzr('checkout', 'master', 'child') |
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
119 |
# get an object form of child
|
120 |
child = WorkingTree.open('child') |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
121 |
# check that out
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
122 |
self.run_bzr('checkout', '--lightweight', 'child', 'checkout') |
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
123 |
# get an object form of the checkout to manipulate
|
124 |
wt = WorkingTree.open('checkout') |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
125 |
# change master
|
126 |
a_file = file('master/file', 'wt') |
|
127 |
a_file.write('Foo') |
|
128 |
a_file.close() |
|
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
129 |
master.add(['file']) |
130 |
master_tip = master.commit('add file') |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
131 |
# change child
|
132 |
a_file = file('child/file_b', 'wt') |
|
133 |
a_file.write('Foo') |
|
134 |
a_file.close() |
|
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
135 |
child.add(['file_b']) |
136 |
child_tip = child.commit('add file_b', local=True) |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
137 |
# check checkout
|
138 |
a_file = file('checkout/file_c', 'wt') |
|
139 |
a_file.write('Foo') |
|
140 |
a_file.close() |
|
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
141 |
wt.add(['file_c']) |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
142 |
|
143 |
# now, update checkout ->
|
|
144 |
# get all three files and a pending merge.
|
|
1711.2.108
by John Arbash Meinel
Assert that update informs the user about where their local commits went. |
145 |
out, err = self.run_bzr('update', 'checkout') |
146 |
self.assertEqual('', out) |
|
147 |
self.assertContainsRe(err, 'Updated to revision 1.\n' |
|
148 |
'Your local commits will now show as'
|
|
149 |
' pending merges') |
|
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
150 |
self.assertEqual([master_tip, child_tip], wt.get_parent_ids()) |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
151 |
self.failUnlessExists('checkout/file') |
152 |
self.failUnlessExists('checkout/file_b') |
|
153 |
self.failUnlessExists('checkout/file_c') |
|
154 |
self.assertTrue(wt.has_filename('file_c')) |
|
1711.2.109
by John Arbash Meinel
Add a test for handling a pending merge plus an update. |
155 |
|
156 |
def test_update_with_merges(self): |
|
157 |
# Test that 'bzr update' works correctly when you have
|
|
158 |
# an update in the master tree, and a lightweight checkout
|
|
159 |
# which has merged another branch
|
|
160 |
master = self.make_branch_and_tree('master') |
|
161 |
self.build_tree(['master/file']) |
|
162 |
master.add(['file']) |
|
163 |
master.commit('one', rev_id='m1') |
|
164 |
||
165 |
self.build_tree(['checkout1/']) |
|
166 |
checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1') |
|
167 |
branch.BranchReferenceFormat().initialize(checkout_dir, master.branch) |
|
168 |
checkout1 = checkout_dir.create_workingtree('m1') |
|
169 |
||
170 |
# Create a second branch, with an extra commit
|
|
171 |
other = master.bzrdir.sprout('other').open_workingtree() |
|
172 |
self.build_tree(['other/file2']) |
|
173 |
other.add(['file2']) |
|
174 |
other.commit('other2', rev_id='o2') |
|
175 |
||
176 |
# Create a new commit in the master branch
|
|
177 |
self.build_tree(['master/file3']) |
|
178 |
master.add(['file3']) |
|
179 |
master.commit('f3', rev_id='m2') |
|
180 |
||
181 |
# Merge the other branch into checkout
|
|
182 |
os.chdir('checkout1') |
|
183 |
self.run_bzr('merge', '../other') |
|
184 |
||
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
185 |
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:]) |
1711.2.109
by John Arbash Meinel
Add a test for handling a pending merge plus an update. |
186 |
|
187 |
# At this point, 'commit' should fail, because we are out of date
|
|
188 |
self.run_bzr_error(["please run 'bzr update'"], |
|
189 |
'commit', '-m', 'merged') |
|
190 |
||
191 |
# This should not report about local commits being pending
|
|
192 |
# merges, because they were real merges
|
|
193 |
out, err = self.run_bzr('update') |
|
194 |
self.assertEqual('', out) |
|
195 |
self.assertEqual('All changes applied successfully.\n' |
|
196 |
'Updated to revision 2.\n', err) |
|
197 |
||
198 |
# The pending merges should still be there
|
|
1908.6.11
by Robert Collins
Remove usage of tree.pending_merges(). |
199 |
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:]) |
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
200 |
|
201 |
def test_readonly_lightweight_update(self): |
|
202 |
"""Update a light checkout of a readonly branch"""
|
|
203 |
tree = self.make_branch_and_tree('branch') |
|
204 |
readonly_branch = branch.Branch.open(self.get_readonly_url('branch')) |
|
2255.7.55
by Robert Collins
Whitespace fix. |
205 |
checkout = readonly_branch.create_checkout('checkout', |
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
206 |
lightweight=True) |
207 |
tree.commit('empty commit') |
|
208 |
self.runbzr(['update', 'checkout']) |