/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_nick.py

  • Committer: Vincent Ladeuil
  • Date: 2009-10-06 14:40:37 UTC
  • mto: (4728.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4731.
  • Revision ID: v.ladeuil+lp@free.fr-20091006144037-o76rgosv9hj3td0y
Simplify mutable_tree.has_changes() and update call sites.

* bzrlib/workingtree.py:
(WorkingTree.merge_from_branch): Add a force parameter. Replace
the check_basis() call by the corresponding code, taken the new
'force' parameter into account.

* bzrlib/tests/test_status.py:
(TestStatus.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/test_reconfigure.py:
(TestReconfigure): Add a test for pending merges.

* bzrlib/tests/test_msgeditor.py:
(MsgEditorTest.make_multiple_pending_tree): Add force=True on
supplementary merges.

* bzrlib/tests/blackbox/test_uncommit.py:
(TestUncommit.test_uncommit_octopus_merge): Add force=True on
supplementary merges.

* bzrlib/send.py:
(send): Use the simplified has_changes(). Fix typo in comment too.

* bzrlib/reconfigure.py:
(Reconfigure._check): Use the simplified has_changes().

* bzrlib/mutabletree.py:
(MutableTree.has_changes): Make the tree parameter optional but
retain it for tests. Add a pending merges check.

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.file_revisions,
Merger.check_basis, Merger.compare_basis): Deprecate.

* bzrlib/bundle/apply_bundle.py:
(merge_bundle): Replace the check_basis() call by the
corresponding code.

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the
simplified has_changes().
(cmd_merge.run): Replace the check_basis call() by the corresponding
code (minus the alredy done has_changes() check).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_nick.py
30
30
        self.make_branch_and_tree('me.dev')
31
31
        os.chdir('me.dev')
32
32
        nick = self.run_bzr('nick')[0]
33
 
        self.assertEqual('me.dev\n', nick)
 
33
        self.assertEqual(nick, 'me.dev\n')
34
34
        # set the nickname
35
35
        self.run_bzr("nick moo")
36
36
        nick = self.run_bzr('nick')[0]
37
 
        self.assertEqual('moo\n', nick)
 
37
        self.assertEqual(nick, 'moo\n')
38
38
 
39
39
    def test_autonick_urlencoded(self):
40
40
        # https://bugs.launchpad.net/bzr/+bug/66857 -- nick was printed
42
42
        self.make_branch_and_tree('!repo')
43
43
        os.chdir('!repo')
44
44
        nick = self.run_bzr('nick')[0]
45
 
        self.assertEqual('!repo\n', nick)
 
45
        self.assertEqual(nick, '!repo\n')
46
46
 
47
47
    def test_bound_nick(self):
48
48
        """Check that nick works well for checkouts."""
49
49
        base = self.make_branch_and_tree('base')
50
50
        child = self.make_branch_and_tree('child')
51
51
        os.chdir('child')
52
 
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
53
 
        self.assertEqual(False,
54
 
                         child.branch.get_config().has_explicit_nickname())
 
52
        self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
 
53
        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
 
54
            False)
55
55
        self.run_bzr('bind ../base')
56
 
        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
57
 
        self.assertEqual(False,
58
 
                         child.branch.get_config().has_explicit_nickname())
 
56
        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
 
57
        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
 
58
            False)
59
59
 
60
60
        self.run_bzr('unbind')
61
61
        self.run_bzr("nick explicit_nick")
62
 
        self.assertEqual("explicit_nick", self.run_bzr('nick')[0][:-1])
63
 
        self.assertEqual("explicit_nick",
64
 
                         child.branch.get_config()._get_explicit_nickname())
 
62
        self.assertEqual(self.run_bzr('nick')[0][:-1], "explicit_nick")
 
63
        self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
 
64
            "explicit_nick")
65
65
        self.run_bzr('bind ../base')
66
 
        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
67
 
        self.assertEqual(base.branch.nick,
68
 
                         child.branch.get_config()._get_explicit_nickname())
 
66
        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
 
67
        self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
 
68
            base.branch.nick)
69
69
 
70
70
    def test_boundless_nick(self):
71
71
        """Nick defaults to implicit local nick when bound branch is AWOL"""
73
73
        child = self.make_branch_and_tree('child')
74
74
        os.chdir('child')
75
75
        self.run_bzr('bind ../base')
76
 
        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
77
 
        self.assertEqual(False,
78
 
                         child.branch.get_config().has_explicit_nickname())
 
76
        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
 
77
        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
 
78
            False)
79
79
        osutils.rmtree('../base')
80
 
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
 
80
        self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')