← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_update.py

  • Committer: Martin Pool
  • Date: 2010-07-02 07:29:40 UTC
  • mfrom: (129.1.7 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100702072940-hpzq5elg8wjve8rh
http://bugs.debian.org/452024
http://bugs.debian.org/464688
http://bugs.debian.org/523595
http://bugs.debian.org/526233
http://bugs.debian.org/537708
http://bugs.debian.org/555336
http://bugs.debian.org/555343
https://launchpad.net/bugs/249452
https://launchpad.net/bugs/385074
* PPA rebuild.
* PPA rebuild for Karmic.
* PPA rebuild for Jaunty.
* PPA rebuild for Hardy.
* From postinst, actually remove the example bash completion scripts.
  (LP: #249452)
* New upstream release.
* New upstream release.
* New upstream release.
* Revert change to Build-depends: Dapper does not have python-central.
  Should be python-support..
* Target ppa..
* Target ppa..
* Target ppa..
* Target ppa..
* New upstream release.
* Switch to dpkg-source 3.0 (quilt) format.
* Bump standards version to 3.8.4.
* Remove embedded copy of python-configobj. Closes: #555336
* Remove embedded copy of python-elementtree. Closes: #555343
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* debian/control: Fix obsolete-relation-form-in-source
  lintian warning. 
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split out docs into bzr-doc package.
* New upstream release.
* Added John Francesco Ferlito to Uploaders.
* Fix install path to quick-reference guide
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again, again.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to path changes.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Bump standards version to 3.8.3.
* Remove unused patch system.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix copy and paste tab error in .install file
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
 + Fixes compatibility with Python 2.4. Closes: #537708
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream version.
* Bump standards version to 3.8.2.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add python-pyrex to build-deps to ensure C extensions are always build.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix API compatibility version. (Closes: #526233)
* New upstream release.
  + Fixes default format for upgrade command. (Closes: #464688)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add missing dependency on zlib development library. (Closes:
  #523595)
* Add zlib build-depends.
* Add zlib build-depends.
* Add zlib build-depends.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Move to section vcs.
* Bump standards version to 3.8.1.
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Recommend ca-certificates. (Closes: #452024)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Update watch file. bazaar now uses launchpad to host its sources.
* Remove patch for inventory root revision copy, applied upstream.
* New upstream release.
* New upstream release.
* New upstream release
* Force removal of files installed in error to /etc/bash_completion.d/
  (LP: #249452)
* New upstream release.
* New upstream release
* New upstream release.
* Bump standards version.
* Include patch for inventory root revision copy, required for bzr-svn.
* New upstream release.
* Remove unused lintian overrides.
* Correct the package version not to be native.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Final 1.5 release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add myself as a co-maintainer.
* Add a Dm-Upload-Allowed: yes header.
* New upstream bugfix release.
* New upstream release.
* Final 1.3 release.
* New upstream release.
* First release candidate of the upcoming 1.3 release.
* Rebuild to fix the problem caused by a build with a broken python-central.
* New upstream release.
* Rebuild for dapper PPA.
* Apply Lamont's patches to fix build-dependencies on dapper.
  (See: https://bugs.launchpad.net/bzr/+bug/189915)

Show diffs side-by-side

added added

removed removed

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