/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: Lukáš Lalinský
  • Date: 2008-08-28 13:41:15 UTC
  • mto: (3732.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3733.
  • Revision ID: lalinsky@gmail.com-20080828134115-265uyumclq5qvetg
https://launchpad.net/bugs/144421
Fix `bzr st -rbranch:PATH_TO_BRANCH`

* Add RevisionSpec.as_tree which returns a tree representation of the revision specifier. This might return a remote revision tree.
* Make status use this new method and not require RevisionSpec.as_revision_id, which for RevisionSpec_branch fetches data to the local repository.
* Refactor common code for getting either a revision tree or a tree/branch's basis tree into a private function _get_revision_tree and make it use RevisionSpec.as_tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_nick.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Black-box tests for bzr nick."""
18
18
 
19
19
import os
20
20
 
21
21
import bzrlib
22
 
from bzrlib import osutils
23
22
from bzrlib.tests.blackbox import ExternalBase
24
23
 
25
24
 
30
29
        self.make_branch_and_tree('me.dev')
31
30
        os.chdir('me.dev')
32
31
        nick = self.run_bzr('nick')[0]
33
 
        self.assertEqual('me.dev\n', nick)
 
32
        self.assertEqual(nick, 'me.dev\n')
34
33
        # set the nickname
35
34
        self.run_bzr("nick moo")
36
35
        nick = self.run_bzr('nick')[0]
37
 
        self.assertEqual('moo\n', nick)
 
36
        self.assertEqual(nick, 'moo\n')
38
37
 
39
38
    def test_autonick_urlencoded(self):
40
39
        # https://bugs.launchpad.net/bzr/+bug/66857 -- nick was printed
42
41
        self.make_branch_and_tree('!repo')
43
42
        os.chdir('!repo')
44
43
        nick = self.run_bzr('nick')[0]
45
 
        self.assertEqual('!repo\n', nick)
46
 
 
47
 
    def test_bound_nick(self):
48
 
        """Check that nick works well for checkouts."""
49
 
        base = self.make_branch_and_tree('base')
50
 
        child = self.make_branch_and_tree('child')
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())
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())
59
 
 
60
 
        self.run_bzr('unbind')
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())
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())
69
 
 
70
 
    def test_boundless_nick(self):
71
 
        """Nick defaults to implicit local nick when bound branch is AWOL"""
72
 
        base = self.make_branch_and_tree('base')
73
 
        child = self.make_branch_and_tree('child')
74
 
        os.chdir('child')
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())
79
 
        osutils.rmtree('../base')
80
 
        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
 
44
        self.assertEqual(nick, '!repo\n')