~bzr-pqm/bzr/bzr.dev : contents of bzrlib/tests/blackbox/test

~bzr-pqm/bzr/bzr.dev : (revision 4708.1.2)

# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#

"""Tests of the 'bzr add' command."""

import os

from bzrlib import osutils
from bzrlib.tests import (
    condition_isinstance,
    split_suite_by_condition,
    multiply_tests,
    SymlinkFeature
    )
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature


def load_tests(standard_tests, module, loader):
    """Parameterize tests for view-aware vs not."""
    to_adapt, result = split_suite_by_condition(
        standard_tests, condition_isinstance(TestAdd))
    scenarios = [
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
        ]
    return multiply_tests(to_adapt, scenarios, result)


class TestAdd(ExternalBase):

    def make_branch_and_tree(self, dir):
        return ExternalBase.make_branch_and_tree(self, dir,
            format=self.branch_tree_format)

    def test_add_reports(self):
        """add command prints the names of added files."""
        tree = self.make_branch_and_tree('.')
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
        out = self.run_bzr('add')[0]
        # the ordering is not defined at the moment
        results = sorted(out.rstrip('\n').split('\n'))
        self.assertEquals(['adding .bzrignore',
                           'adding dir',
                           'adding dir/sub.txt',
                           'adding top.txt'],
                          results)
        out = self.run_bzr('add -v')[0]
        results = sorted(out.rstrip('\n').split('\n'))
        self.assertEquals(['ignored CVS matching "CVS"'],
                          results)

    def test_add_quiet_is(self):
        """add -q does not print the names of added files."""
        tree = self.make_branch_and_tree('.')
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
        out = self.run_bzr('add -q')[0]
        # the ordering is not defined at the moment
        results = sorted(out.rstrip('\n').split('\n'))
        self.assertEquals([''], results)

    def test_add_in_unversioned(self):
        """Try to add a file in an unversioned directory.

        "bzr add" should add the parent(s) as necessary.
        """
        tree = self.make_branch_and_tree('.')
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
        self.run_bzr('add inertiatic/esp')
        self.assertEquals(self.run_bzr('unknowns')[0], '')

        # Multiple unversioned parents
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
        self.run_bzr('add veil/cerpin/taxt')
        self.assertEquals(self.run_bzr('unknowns')[0], '')

        # Check whacky paths work
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
        self.run_bzr('add inertiatic/../cicatriz/esp')
        self.assertEquals(self.run_bzr('unknowns')[0], '')

    def test_add_in_versioned(self):
        """Try to add a file in a versioned directory.

        "bzr add" should do this happily.
        """
        tree = self.make_branch_and_tree('.')
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
        self.run_bzr('add --no-recurse inertiatic')
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
        self.run_bzr('add inertiatic/esp')
        self.assertEquals(self.run_bzr('unknowns')[0], '')

    def test_subdir_add(self):
        """Add in subdirectory should add only things from there down"""
        from bzrlib.workingtree import WorkingTree

        eq = self.assertEqual
        ass = self.assertTrue
        chdir = os.chdir

        t = self.make_branch_and_tree('.')
        b = t.branch
        self.build_tree(['src/', 'README'])

        eq(sorted(t.unknowns()),
           ['README', 'src'])

        self.run_bzr('add src')

        self.build_tree(['src/foo.c'])

        # add with no arguments in a subdirectory gets only files below that
        # subdirectory
        chdir('src')
        self.run_bzr('add')
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
        # reopen to see the new changes
        t = t.bzrdir.open_workingtree()
        versioned = [path for path, entry in t.iter_entries_by_dir()]
        self.assertEquals(versioned,
            ['', 'src', 'src/foo.c'])

        # add from the parent directory should pick up all file names
        chdir('..')
        self.run_bzr('add')
        self.assertEquals(self.run_bzr('unknowns')[0], '')
        self.run_bzr('check')

    def test_add_missing(self):
        """bzr add foo where foo is missing should error."""
        self.make_branch_and_tree('.')
        self.run_bzr('add missing-file', retcode=3)

    def test_add_from(self):
        base_tree = self.make_branch_and_tree('base')
        self.build_tree(['base/a', 'base/b/', 'base/b/c'])
        base_tree.add(['a', 'b', 'b/c'])
        base_tree.commit('foo')

        new_tree = self.make_branch_and_tree('new')
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])

        os.chdir('new')
        out, err = self.run_bzr('add --file-ids-from ../base')
        self.assertEqual('', err)
        self.assertEqualDiff('adding a w/ file id from a\n'
                             'adding b w/ file id from b\n'
                             'adding b/c w/ file id from b/c\n',
                             out)
        new_tree = new_tree.bzrdir.open_workingtree()
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
        self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))

    def test_add_from_subdir(self):
        base_tree = self.make_branch_and_tree('base')
        self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
        base_tree.add(['a', 'b', 'b/c', 'b/d'])
        base_tree.commit('foo')

        new_tree = self.make_branch_and_tree('new')
        self.build_tree(['new/c', 'new/d'])

        os.chdir('new')
        out, err = self.run_bzr('add --file-ids-from ../base/b')
        self.assertEqual('', err)
        self.assertEqualDiff('adding c w/ file id from b/c\n'
                             'adding d w/ file id from b/d\n',
                             out)

        new_tree = new_tree.bzrdir.open_workingtree()
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))

    def test_add_dry_run(self):
        """Test a dry run add, make sure nothing is added."""
        wt = self.make_branch_and_tree('.')
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
        self.run_bzr('add --dry-run')
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])

    def test_add_control_dir(self):
        """The control dir and its content should be refused."""
        self.make_branch_and_tree('.')
        err = self.run_bzr('add .bzr', retcode=3)[1]
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
        err = self.run_bzr('add .bzr/README', retcode=3)[1]
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
        self.build_tree(['.bzr/crescent'])
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')

    def test_add_with_wildcards(self):
        self.requireFeature(NeedsGlobExpansionFeature)
        self.make_branch_and_tree('.')
        self.build_tree(['a1', 'a2', 'b', 'c33'])
        self.run_bzr(['add', 'a?', 'c*'])
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')

    def test_add_with_wildcards_unicode(self):
        self.requireFeature(NeedsGlobExpansionFeature)
        self.make_branch_and_tree('.')
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')

    def test_add_via_symlink(self):
        self.requireFeature(SymlinkFeature)
        self.make_branch_and_tree('source')
        self.build_tree(['source/top.txt'])
        os.symlink('source', 'link')
        out = self.run_bzr(['add', 'link/top.txt'])[0]
        self.assertEquals(out, 'adding top.txt\n')

    def test_add_symlink_to_abspath(self):
        self.requireFeature(SymlinkFeature)
        self.make_branch_and_tree('tree')
        os.symlink(osutils.abspath('target'), 'tree/link')
        out = self.run_bzr(['add', 'tree/link'])[0]
        self.assertEquals(out, 'adding link\n')

4595.1.1 by Jason Spashett Further tweaks to bzr add	1	# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	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
4183.7.1 by Sabin Iacob update FSF mailing address	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	16	#
	17
	18	"""Tests of the 'bzr add' command."""
	19
	20	import os
	21
4301.2.4 by Aaron Bentley Further cleanups	22	from bzrlib import osutils
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	23	from bzrlib.tests import (
	24	condition_isinstance,
	25	split_suite_by_condition,
	26	multiply_tests,
4301.1.1 by Geoff Bache Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link	27	SymlinkFeature
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	28	)
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	29	from bzrlib.tests.blackbox import ExternalBase
2617.5.8 by Kuno Meyer Extended tests for unicode chars outside of the iso-8859-* range	30	from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	31
	32
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	33	def load_tests(standard_tests, module, loader):
	34	"""Parameterize tests for view-aware vs not."""
	35	to_adapt, result = split_suite_by_condition(
	36	standard_tests, condition_isinstance(TestAdd))
	37	scenarios = [
	38	('pre-views', {'branch_tree_format': 'pack-0.92'}),
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)	39	('view-aware', {'branch_tree_format': 'development6-rich-root'}),
4163.2.2 by Ian Clatworthy use multiply_tests rather than subclassing	40	]
	41	return multiply_tests(to_adapt, scenarios, result)
	42
	43
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	44	class TestAdd(ExternalBase):
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	45
4163.2.1 by Ian Clatworthy Fix add in trees supports views	46	def make_branch_and_tree(self, dir):
	47	return ExternalBase.make_branch_and_tree(self, dir,
	48	format=self.branch_tree_format)
	49
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	50	def test_add_reports(self):
	51	"""add command prints the names of added files."""
2664.3.1 by Daniel Watkins tests.blackbox.test_add now uses internals where appropriate.	52	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	53	self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
1765.1.1 by Robert Collins Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.	54	self.build_tree_contents([('.bzrignore', 'CVS\n')])
2581.1.2 by Martin Pool Remove unnecessary retcode=0 to run_bzr calls	55	out = self.run_bzr('add')[0]
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	56	# the ordering is not defined at the moment
	57	results = sorted(out.rstrip('\n').split('\n'))
4595.1.1 by Jason Spashett Further tweaks to bzr add	58	self.assertEquals(['adding .bzrignore',
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	59	'adding dir',
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	60	'adding dir/sub.txt',
4595.1.1 by Jason Spashett Further tweaks to bzr add	61	'adding top.txt'],
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	62	results)
2581.1.2 by Martin Pool Remove unnecessary retcode=0 to run_bzr calls	63	out = self.run_bzr('add -v')[0]
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	64	results = sorted(out.rstrip('\n').split('\n'))
4595.1.1 by Jason Spashett Further tweaks to bzr add	65	self.assertEquals(['ignored CVS matching "CVS"'],
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	66	results)
	67
	68	def test_add_quiet_is(self):
	69	"""add -q does not print the names of added files."""
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	70	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	71	self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
2581.1.2 by Martin Pool Remove unnecessary retcode=0 to run_bzr calls	72	out = self.run_bzr('add -q')[0]
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	73	# the ordering is not defined at the moment
	74	results = sorted(out.rstrip('\n').split('\n'))
	75	self.assertEquals([''], results)
	76
	77	def test_add_in_unversioned(self):
	78	"""Try to add a file in an unversioned directory.
	79
	80	"bzr add" should add the parent(s) as necessary.
	81	"""
2664.3.1 by Daniel Watkins tests.blackbox.test_add now uses internals where appropriate.	82	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	83	self.build_tree(['inertiatic/', 'inertiatic/esp'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	84	self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	85	self.run_bzr('add inertiatic/esp')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	86	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	87
	88	# Multiple unversioned parents
	89	self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	90	self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	91	self.run_bzr('add veil/cerpin/taxt')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	92	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	93
	94	# Check whacky paths work
	95	self.build_tree(['cicatriz/', 'cicatriz/esp'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	96	self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	97	self.run_bzr('add inertiatic/../cicatriz/esp')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	98	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	99
	100	def test_add_in_versioned(self):
	101	"""Try to add a file in a versioned directory.
	102
	103	"bzr add" should do this happily.
	104	"""
2664.3.1 by Daniel Watkins tests.blackbox.test_add now uses internals where appropriate.	105	tree = self.make_branch_and_tree('.')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	106	self.build_tree(['inertiatic/', 'inertiatic/esp'])
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	107	self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	108	self.run_bzr('add --no-recurse inertiatic')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	109	self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	110	self.run_bzr('add inertiatic/esp')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	111	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	112
	113	def test_subdir_add(self):
	114	"""Add in subdirectory should add only things from there down"""
	115	from bzrlib.workingtree import WorkingTree
1836.1.16 by John Arbash Meinel Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.	116
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	117	eq = self.assertEqual
1836.1.16 by John Arbash Meinel Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.	118	ass = self.assertTrue
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	119	chdir = os.chdir
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	120
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	121	t = self.make_branch_and_tree('.')
	122	b = t.branch
	123	self.build_tree(['src/', 'README'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	124
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	125	eq(sorted(t.unknowns()),
	126	['README', 'src'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	127
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	128	self.run_bzr('add src')
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	129
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	130	self.build_tree(['src/foo.c'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	131
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	132	# add with no arguments in a subdirectory gets only files below that
	133	# subdirectory
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	134	chdir('src')
	135	self.run_bzr('add')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	136	self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
2255.2.176 by Martin Pool Merge dirstate and some small cleanups	137	# reopen to see the new changes
	138	t = t.bzrdir.open_workingtree()
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	139	versioned = [path for path, entry in t.iter_entries_by_dir()]
	140	self.assertEquals(versioned,
	141	['', 'src', 'src/foo.c'])
3943.8.1 by Marius Kruger remove all trailing whitespace from bzr source	142
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	143	# add from the parent directory should pick up all file names
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	144	chdir('..')
	145	self.run_bzr('add')
2552.2.2 by Vincent Ladeuil Enforce run_bzr(string) where possible.	146	self.assertEquals(self.run_bzr('unknowns')[0], '')
1711.1.3 by Robert Collins Add new test_add file - should have been in last commit.	147	self.run_bzr('check')
1757.2.1 by Robert Collins Add an explicit test that adding a missing file barfs.	148
	149	def test_add_missing(self):
	150	"""bzr add foo where foo is missing should error."""
	151	self.make_branch_and_tree('.')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	152	self.run_bzr('add missing-file', retcode=3)
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	153
	154	def test_add_from(self):
	155	base_tree = self.make_branch_and_tree('base')
	156	self.build_tree(['base/a', 'base/b/', 'base/b/c'])
	157	base_tree.add(['a', 'b', 'b/c'])
	158	base_tree.commit('foo')
	159
	160	new_tree = self.make_branch_and_tree('new')
	161	self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
	162
	163	os.chdir('new')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	164	out, err = self.run_bzr('add --file-ids-from ../base')
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	165	self.assertEqual('', err)
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	166	self.assertEqualDiff('adding a w/ file id from a\n'
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	167	'adding b w/ file id from b\n'
4075.1.1 by Robert Collins add should not print 'add completed' unnecessarily.	168	'adding b/c w/ file id from b/c\n',
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	169	out)
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	170	new_tree = new_tree.bzrdir.open_workingtree()
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	171	self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
	172	self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
	173	self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
	174
	175	def test_add_from_subdir(self):
	176	base_tree = self.make_branch_and_tree('base')
	177	self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
	178	base_tree.add(['a', 'b', 'b/c', 'b/d'])
	179	base_tree.commit('foo')
	180
	181	new_tree = self.make_branch_and_tree('new')
	182	self.build_tree(['new/c', 'new/d'])
	183
	184	os.chdir('new')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	185	out, err = self.run_bzr('add --file-ids-from ../base/b')
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	186	self.assertEqual('', err)
3985.2.1 by Daniel Watkins Updated tests for new behaviour.	187	self.assertEqualDiff('adding c w/ file id from b/c\n'
4075.1.1 by Robert Collins add should not print 'add completed' unnecessarily.	188	'adding d w/ file id from b/d\n',
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	189	out)
	190
2255.2.171 by Martin Pool Fix up blackbox test_add to avoid depending on inventory not being held in memory	191	new_tree = new_tree.bzrdir.open_workingtree()
1911.3.2 by John Arbash Meinel Adding the AddFromBaseAction, which tries to reuse file ids from another tree	192	self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
	193	self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
1928.1.1 by Alexander Belchenko blackbox test for 'bzr add --dry-run'	194
	195	def test_add_dry_run(self):
2568.2.4 by Robert Collins * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now	196	"""Test a dry run add, make sure nothing is added."""
	197	wt = self.make_branch_and_tree('.')
	198	self.build_tree(['inertiatic/', 'inertiatic/esp'])
	199	self.assertEqual(list(wt.unknowns()), ['inertiatic'])
	200	self.run_bzr('add --dry-run')
	201	self.assertEqual(list(wt.unknowns()), ['inertiatic'])
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	202
	203	def test_add_control_dir(self):
	204	"""The control dir and its content should be refused."""
2279.6.1 by Alexander Belchenko Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron).	205	self.make_branch_and_tree('.')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	206	err = self.run_bzr('add .bzr', retcode=3)[1]
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	207	self.assertContainsRe(err, r'ERROR:.\.bzr.control file')
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	208	err = self.run_bzr('add .bzr/README', retcode=3)[1]
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	209	self.assertContainsRe(err, r'ERROR:.\.bzr.control file')
	210	self.build_tree(['.bzr/crescent'])
2530.3.3 by Martin Pool Clean up some callers that use varargs syntax for run_bzr, but don't	211	err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
2279.5.1 by Matthias Rahlf FastPath objects can now be printed nicely	212	self.assertContainsRe(err, r'ERROR:.\.bzr.control file')
2617.5.3 by Kuno Meyer Blackbox test for adding with wildcards (Win32).	213
	214	def test_add_with_wildcards(self):
2617.5.8 by Kuno Meyer Extended tests for unicode chars outside of the iso-8859-* range	215	self.requireFeature(NeedsGlobExpansionFeature)
2617.5.4 by Kuno Meyer Included feedback on initial patch.	216	self.make_branch_and_tree('.')
2617.5.3 by Kuno Meyer Blackbox test for adding with wildcards (Win32).	217	self.build_tree(['a1', 'a2', 'b', 'c33'])
2617.5.4 by Kuno Meyer Included feedback on initial patch.	218	self.run_bzr(['add', 'a?', 'c*'])
2617.5.3 by Kuno Meyer Blackbox test for adding with wildcards (Win32).	219	self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
2617.5.8 by Kuno Meyer Extended tests for unicode chars outside of the iso-8859-* range	220
	221	def test_add_with_wildcards_unicode(self):
	222	self.requireFeature(NeedsGlobExpansionFeature)
	223	self.make_branch_and_tree('.')
	224	self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
	225	self.run_bzr(['add', u'\u1234?', u'\u1235*'])
	226	self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
4301.1.1 by Geoff Bache Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link	227
	228	def test_add_via_symlink(self):
	229	self.requireFeature(SymlinkFeature)
	230	self.make_branch_and_tree('source')
	231	self.build_tree(['source/top.txt'])
	232	os.symlink('source', 'link')
	233	out = self.run_bzr(['add', 'link/top.txt'])[0]
	234	self.assertEquals(out, 'adding top.txt\n')
	235
	236	def test_add_symlink_to_abspath(self):
	237	self.requireFeature(SymlinkFeature)
4301.2.4 by Aaron Bentley Further cleanups	238	self.make_branch_and_tree('tree')
	239	os.symlink(osutils.abspath('target'), 'tree/link')
	240	out = self.run_bzr(['add', 'tree/link'])[0]
4301.1.1 by Geoff Bache Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link	241	self.assertEquals(out, 'adding link\n')