/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.py

  • Committer: mernst at mit
  • Date: 2008-10-16 10:57:16 UTC
  • mto: This revision was merged to the branch mainline in revision 3799.
  • Revision ID: mernst@csail.mit.edu-20081016105716-v8x8n5t2pf7f6uds
Improved documentation of stacked and lightweight branches

These patches improve the User Guide's documentation of stacked and
lightweight branches.

Section "1.2.6 Putting the concepts together" should mention stacked
branches and the difference between them and lightweight branches.  It
should also contain links to further details of the common scenarios.

Section "5.3.4 Getting a lightweight checkout" should mention stacked
branches as an option, and should link to all the options, not just some of
them.  It should also clarify that lightweight only applies to checkouts,
not to arbitrary branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Black box tests for the reconcile command."""
 
18
 
 
19
 
 
20
import bzrlib
 
21
import bzrlib.bzrdir as bzrdir
 
22
from bzrlib.inventory import Inventory
 
23
import bzrlib.repository as repository
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.tests import TestUIFactory
 
26
from bzrlib.transport import get_transport
 
27
import bzrlib.ui as ui
 
28
 
 
29
 
 
30
class TrivialTest(TestCaseWithTransport):
 
31
 
 
32
    def setUp(self):
 
33
        super(TrivialTest, self).setUp()
 
34
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
35
        self.old_ui_factory = ui.ui_factory
 
36
        self.addCleanup(self.restoreDefaults)
 
37
        ui.ui_factory = TestUIFactory()
 
38
 
 
39
    def restoreDefaults(self):
 
40
        ui.ui_factory = self.old_ui_factory
 
41
 
 
42
    def test_trivial_reconcile(self):
 
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
44
        (out, err) = self.run_bzr('reconcile')
 
45
        if t.branch.repository._reconcile_backsup_inventory:
 
46
            does_backup_text = "Inventory ok.\n"
 
47
        else:
 
48
            does_backup_text = ""
 
49
        self.assertEqualDiff(out, "Reconciling branch %s\n"
 
50
                                  "revision_history ok.\n"
 
51
                                  "Reconciling repository %s\n"
 
52
                                  "%s"
 
53
                                  "Reconciliation complete.\n" %
 
54
                                  (t.branch.base,
 
55
                                   t.bzrdir.root_transport.base,
 
56
                                   does_backup_text))
 
57
        self.assertEqualDiff(err, "")
 
58
 
 
59
    def test_does_something_reconcile(self):
 
60
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
61
        # an empty inventory with no revision will trigger reconciliation.
 
62
        repo = t.branch.repository
 
63
        inv = Inventory(revision_id='missing')
 
64
        inv.root.revision='missing'
 
65
        repo.lock_write()
 
66
        repo.start_write_group()
 
67
        repo.add_inventory('missing', inv, [])
 
68
        repo.commit_write_group()
 
69
        repo.unlock()
 
70
        (out, err) = self.run_bzr('reconcile')
 
71
        if repo._reconcile_backsup_inventory:
 
72
            does_backup_text = (
 
73
                "Backup Inventory created.\n"
 
74
                "Inventory regenerated.\n")
 
75
        else:
 
76
            does_backup_text = ""
 
77
        expected = ("Reconciling branch %s\n"
 
78
                    "revision_history ok.\n"
 
79
                    "Reconciling repository %s\n"
 
80
                    "%s"
 
81
                    "Reconciliation complete.\n" %
 
82
                    (t.branch.base,
 
83
                     t.bzrdir.root_transport.base,
 
84
                     does_backup_text))
 
85
        self.assertEqualDiff(expected, out)
 
86
        self.assertEqualDiff(err, "")