← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_pull.py

  • Committer: Aaron Bentley
  • Date: 2008-10-16 21:27:10 UTC
  • mfrom: (0.15.26 unshelve)
  • mto: (0.16.74 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081016212710-h9av3nhk76dvmsv5
Merge with unshelve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_pull.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
# Authors:  Robert Collins <robert.collins@canonical.com>
 
3
#
 
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.
 
8
#
 
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.
 
13
#
 
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
from cStringIO import StringIO
 
19
import os
 
20
 
 
21
from bzrlib import errors
 
22
from bzrlib.errors import NotBranchError, NotVersionedError
 
23
from bzrlib.osutils import basename
 
24
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
25
from bzrlib.trace import mutter
 
26
from bzrlib.transport import get_transport
 
27
 
 
28
 
 
29
class TestPull(TestCaseWithWorkingTree):
 
30
 
 
31
    def get_pullable_trees(self):
 
32
        self.build_tree(['from/', 'from/file', 'to/'])
 
33
        tree = self.make_branch_and_tree('from')
 
34
        tree.add('file')
 
35
        tree.commit('foo', rev_id='A')
 
36
        tree_b = self.make_branch_and_tree('to')
 
37
        return tree, tree_b
 
38
 
 
39
    def test_pull(self):
 
40
        tree_a, tree_b = self.get_pullable_trees()
 
41
        tree_b.pull(tree_a.branch)
 
42
        self.failUnless(tree_b.branch.repository.has_revision('A'))
 
43
        self.assertEqual(['A'], tree_b.get_parent_ids())
 
44
 
 
45
    def test_pull_overwrites(self):
 
46
        tree_a, tree_b = self.get_pullable_trees()
 
47
        tree_b.commit('foo', rev_id='B')
 
48
        self.assertEqual(['B'], tree_b.branch.revision_history())
 
49
        tree_b.pull(tree_a.branch, overwrite=True)
 
50
        self.failUnless(tree_b.branch.repository.has_revision('A'))
 
51
        self.failUnless(tree_b.branch.repository.has_revision('B'))
 
52
        self.assertEqual(['A'], tree_b.get_parent_ids())
 
53
 
 
54
    def test_pull_merges_tree_content(self):
 
55
        tree_a, tree_b = self.get_pullable_trees()
 
56
        tree_b.pull(tree_a.branch)
 
57
        self.assertFileEqual('contents of from/file\n', 'to/file')
 
58