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

  • Committer: John Arbash Meinel
  • Date: 2007-11-30 23:18:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3072.
  • Revision ID: john@arbash-meinel.com-20071130231815-0r6ce70307kmv28r
Use a Graph.heads() check to determine if the ancestries are compatible.
Whether we should do nothing because source is already ahead,
raise an exception because we have diverged,
or move forward because the new revision is a tip revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
19
"""Black-box tests for 'bzr unknowns', which shows unknown files."""
20
20
 
21
21
from bzrlib.tests.blackbox import ExternalBase
22
22
 
23
 
 
24
23
class TestUnknowns(ExternalBase):
25
24
 
26
25
    def test_unknowns(self):
34
33
        self.build_tree_contents([('a', 'contents of a\n')])
35
34
        self.assertEquals(self.run_bzr('unknowns')[0], 'a\n')
36
35
 
37
 
        # multiple unknown files, including one with a space in its name
38
 
        self.build_tree(['b', 'c', 'd e'])
39
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\n"d e"\n')
 
36
        # multiple unknown files
 
37
        self.build_tree(['b', 'c'])
 
38
        self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\n')
40
39
 
41
40
        # after add, file no longer shown
42
 
        tree.add(['a', 'd e'])
 
41
        tree.add('a')
43
42
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\nc\n')
44
43
 
45
44
        # after all added, none shown