← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-18 02:33:47 UTC
  • mfrom: (1534.1.24 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060218023347-0952c65f668bfd68
Merge Robert Collins integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
29
29
from tempfile import TemporaryFile
30
30
import codecs
31
31
 
32
 
from bzrlib.clone import copy_branch
33
 
from bzrlib.branch import Branch
34
32
from bzrlib.builtins import merge
35
33
from bzrlib.revisionspec import RevisionSpec
36
34
from bzrlib.status import show_status
37
 
from bzrlib.tests import TestCaseInTempDir
 
35
from bzrlib.tests import TestCaseWithTransport
38
36
from bzrlib.workingtree import WorkingTree
39
37
 
40
38
 
41
 
class BranchStatus(TestCaseInTempDir):
 
39
class BranchStatus(TestCaseWithTransport):
42
40
    
43
41
    def test_branch_status(self): 
44
42
        """Test basic branch status"""
45
 
        wt = WorkingTree.create_standalone('.')
 
43
        wt = self.make_branch_and_tree('.')
46
44
        b = wt.branch
47
45
 
48
46
        # status with nothing
65
63
 
66
64
    def test_branch_status_revisions(self):
67
65
        """Tests branch status with revisions"""
68
 
        wt = WorkingTree.create_standalone('.')
 
66
        wt = self.make_branch_and_tree('.')
69
67
        b = wt.branch
70
68
 
71
69
        tof = StringIO()
112
110
    def test_pending(self):
113
111
        """Pending merges display works, including Unicode"""
114
112
        mkdir("./branch")
115
 
        wt = WorkingTree.create_standalone('branch')
 
113
        wt = self.make_branch_and_tree('branch')
116
114
        b = wt.branch
117
115
        wt.commit("Empty commit 1")
118
 
        b_2 = b.clone('./copy')
 
116
        b_2_dir = b.bzrdir.sprout('./copy')
 
117
        b_2 = b_2_dir.open_branch()
 
118
        wt2 = b_2_dir.open_workingtree()
119
119
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
120
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
121
121
        message = self.status_string(b_2)
122
122
        self.assert_(message.startswith("pending merges:\n"))
123
123
        self.assert_(message.endswith("Empty commit 2\n")) 
124
 
        b_2.working_tree().commit("merged")
 
124
        wt2.commit("merged")
125
125
        # must be long to make sure we see elipsis at the end
126
 
        b.working_tree().commit("Empty commit 3 " + 
127
 
                                "blah blah blah blah " * 10)
 
126
        wt.commit("Empty commit 3 " + 
 
127
                   "blah blah blah blah " * 10)
128
128
        merge(["./branch", -1], [None, None], this_dir = './copy')
129
129
        message = self.status_string(b_2)
130
130
        self.assert_(message.startswith("pending merges:\n"))
133
133
 
134
134
    def test_branch_status_specific_files(self): 
135
135
        """Tests branch status with given specific files"""
136
 
        wt = WorkingTree.create_standalone('.')
 
136
        wt = self.make_branch_and_tree('.')
137
137
        b = wt.branch
138
138
 
139
139
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
173
173
                          ['unknown:\n',
174
174
                           '  dir2\n'
175
175
                           ])
 
176
 
 
177
 
 
178
class TestStatus(TestCaseWithTransport):
 
179
 
 
180
    def test_status(self):
 
181
        self.run_bzr("init")
 
182
        self.build_tree(['hello.txt'])
 
183
        result = self.run_bzr("status")[0]
 
184
        self.assert_("unknown:\n  hello.txt\n" in result, result)
 
185
        self.run_bzr("add", "hello.txt")
 
186
        result = self.run_bzr("status")[0]
 
187
        self.assert_("added:\n  hello.txt\n" in result, result)
 
188
        self.run_bzr("commit", "-m", "added")
 
189
        result = self.run_bzr("status", "-r", "0..1")[0]
 
190
        self.assert_("added:\n  hello.txt\n" in result, result)
 
191
        self.build_tree(['world.txt'])
 
192
        result = self.run_bzr("status", "-r", "0")[0]
 
193
        self.assert_("added:\n  hello.txt\n" \
 
194
                     "unknown:\n  world.txt\n" in result, result)
 
195
 
 
196
        result2 = self.run_bzr("status", "-r", "0..")[0]
 
197
        self.assertEquals(result2, result)
 
198
 
 
199