14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
from osutils import quotefn, appendpath
21
from errors import bailout
22
from trace import mutter, note
24
def smart_add(file_list, verbose=False, recurse=True):
25
"""Add files to version, optionall recursing into directories.
27
This is designed more towards DWIM for humans than API simplicity.
28
For the specific behaviour see the help for cmd_add().
31
assert not isinstance(file_list, basestring)
32
b = bzrlib.branch.Branch(file_list[0], find_root=True)
33
inv = b.read_working_inventory()
34
tree = b.working_tree()
17
from os.path import dirname
19
import bzrlib.errors as errors
20
from bzrlib.inventory import InventoryEntry
21
from bzrlib.trace import mutter, note, warning
22
from bzrlib.errors import NotBranchError
23
from bzrlib.branch import Branch
24
from bzrlib.osutils import quotefn
26
def glob_expand_for_win32(file_list):
28
expanded_file_list = []
29
for possible_glob in file_list:
30
glob_files = glob.glob(possible_glob)
33
# special case to let the normal code path handle
34
# files that do not exists
35
expanded_file_list.append(possible_glob)
37
expanded_file_list += glob_files
38
return expanded_file_list
41
def add_reporter_null(path, kind, entry):
42
"""Absorb add reports and do nothing."""
45
def add_reporter_print(path, kind, entry):
46
"""Print a line to stdout for each file that's added."""
47
print "added", quotefn(path)
49
def _prepare_file_list(file_list):
50
"""Prepare a file list for use by smart_add_*."""
52
if sys.platform == 'win32':
53
file_list = glob_expand_for_win32(file_list)
56
file_list = list(file_list)
60
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
61
"""Add files to version, optionally recursing into directories.
63
This is designed more towards DWIM for humans than API simplicity.
64
For the specific behaviour see the help for cmd_add().
66
Returns the number of files added.
68
file_list = _prepare_file_list(file_list)
69
b = Branch.open_containing(file_list[0])[0]
70
return smart_add_branch(b, file_list, recurse, reporter)
73
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
74
"""Add files to version, optionally recursing into directories.
76
This is designed more towards DWIM for humans than API simplicity.
77
For the specific behaviour see the help for cmd_add().
79
This yields a sequence of (path, kind, file_id) for added files.
81
Returns the number of files added.
84
from bzrlib.errors import BadFileKindError, ForbiddenFileError
87
assert isinstance(recurse, bool)
89
file_list = _prepare_file_list(file_list)
90
user_list = file_list[:]
91
inv = branch.read_working_inventory()
92
tree = branch.working_tree()
37
95
for f in file_list:
41
## TODO: It's OK to add root but only in recursive mode
43
bzrlib.mutter("smart add of %r" % f)
97
af = branch.abspath(rf)
99
kind = bzrlib.osutils.file_kind(af)
101
if not InventoryEntry.versionable_kind(kind):
103
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
105
warning("skipping %s (can't add file of kind '%s')", f, kind)
108
mutter("smart add of %r, abs=%r" % (f, af))
45
110
if bzrlib.branch.is_control_file(af):
46
bailout("cannot add control file %r" % af)
48
kind = bzrlib.osutils.file_kind(f)
50
if kind != 'file' and kind != 'directory':
51
bailout("can't add file of kind %r" % kind)
111
raise ForbiddenFileError('cannot add control file %s' % f)
53
113
versioned = (inv.path2id(rf) != None)
115
if kind == 'directory':
117
sub_branch = Branch.open(af)
119
except NotBranchError:
121
except errors.UnsupportedFormatError:
56
127
mutter("branch root doesn't need to be added")
58
130
mutter("%r is already versioned" % f)
132
mutter("%r is a bzr tree" %f)
60
file_id = bzrlib.branch.gen_file_id(rf)
61
inv.add_path(rf, kind=kind, file_id=file_id)
62
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
65
bzrlib.textui.show_status('A', kind, quotefn(f))
134
count += __add_one(branch, inv, rf, kind, reporter)
67
if kind == 'directory' and recurse:
136
if kind == 'directory' and recurse and not sub_tree:
68
137
for subf in os.listdir(af):
69
subp = appendpath(rf, subf)
138
subp = os.path.join(rf, subf)
70
139
if subf == bzrlib.BZRDIR:
71
140
mutter("skip control directory %r" % subp)
72
141
elif tree.is_ignored(subp):
73
142
mutter("skip ignored sub-file %r" % subp)
75
mutter("queue to add sub-file %r" % (subp))
76
file_list.append(subp)
144
mutter("queue to add sub-file %r" % subp)
145
file_list.append(branch.abspath(subp))
148
mutter('added %d entries', count)
80
note('added %d' % count)
81
b._write_inventory(inv)
151
branch._write_inventory(inv)
155
def __add_one(branch, inv, path, kind, reporter):
156
"""Add a file or directory, automatically add unversioned parents."""
158
# Nothing to do if path is already versioned.
159
# This is safe from infinite recursion because the branch root is
161
if inv.path2id(path) != None:
165
count = __add_one(branch, inv, dirname(path), 'directory', reporter)
167
entry = inv.add_path(path, kind=kind)
168
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
169
reporter(path, kind, entry)
added
removed
bzrlib/add.py
