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
17
from os.path import dirname
19
import bzrlib.errors as errors
20
from bzrlib.inventory import InventoryEntry
17
21
from bzrlib.trace import mutter, note, warning
18
22
from bzrlib.errors import NotBranchError
19
from bzrlib.branch import Branch
20
from bzrlib.osutils import quotefn
23
from bzrlib.branch import is_control_file
25
from bzrlib.workingtree import WorkingTree
22
27
def glob_expand_for_win32(file_list):
25
31
expanded_file_list = []
26
32
for possible_glob in file_list:
27
33
glob_files = glob.glob(possible_glob)
35
41
return expanded_file_list
38
def add_reporter_null(path, kind, entry):
39
"""Absorb add reports and do nothing."""
42
def add_reporter_print(path, kind, entry):
43
"""Print a line to stdout for each file that's added."""
44
print "added", quotefn(path)
46
44
def _prepare_file_list(file_list):
47
45
"""Prepare a file list for use by smart_add_*."""
49
47
if sys.platform == 'win32':
50
48
file_list = glob_expand_for_win32(file_list)
53
51
file_list = list(file_list)
57
def smart_add(file_list, recurse=True, reporter=add_reporter_null):
55
def add_action_null(inv, path, kind):
56
"""Absorb add actions and do nothing."""
59
def add_action_print(inv, path, kind):
60
"""Print a line to stdout for each file that would be added."""
61
print "added", bzrlib.osutils.quotefn(path)
63
def add_action_add(inv, path, kind):
64
"""Add each file to the given inventory. Produce no output."""
65
entry = inv.add_path(path, kind=kind)
66
mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
68
def add_action_add_and_print(inv, path, kind):
69
"""Add each file to the given inventory, and print a line to stdout."""
70
add_action_add(inv, path, kind)
71
add_action_print(inv, path, kind)
74
def smart_add(file_list, recurse=True, action=add_action_add):
58
75
"""Add files to version, optionally recursing into directories.
60
77
This is designed more towards DWIM for humans than API simplicity.
63
80
Returns the number of files added.
65
82
file_list = _prepare_file_list(file_list)
66
b = Branch(file_list[0], find_root=True)
67
return smart_add_branch(b, file_list, recurse, reporter)
83
tree = WorkingTree.open_containing(file_list[0])[0]
84
return smart_add_tree(tree, file_list, recurse, action)
70
def smart_add_branch(branch, file_list, recurse=True, reporter=add_reporter_null):
86
def smart_add_tree(tree, file_list, recurse=True, action=add_action_add):
71
87
"""Add files to version, optionally recursing into directories.
73
89
This is designed more towards DWIM for humans than API simplicity.
74
90
For the specific behaviour see the help for cmd_add().
76
This yields a sequence of (path, kind, file_id) for added files.
92
This calls reporter with each (path, kind, file_id) of added files.
78
94
Returns the number of files added.
82
from bzrlib.osutils import quotefn
83
97
from bzrlib.errors import BadFileKindError, ForbiddenFileError
87
98
assert isinstance(recurse, bool)
89
100
file_list = _prepare_file_list(file_list)
90
101
user_list = file_list[:]
91
inv = branch.read_working_inventory()
92
tree = branch.working_tree()
102
inv = tree.read_working_inventory()
95
106
for f in file_list:
96
rf = branch.relpath(f)
97
af = branch.abspath(rf)
99
kind = bzrlib.osutils.file_kind(af)
101
if kind != 'file' and kind != 'directory':
108
af = tree.abspath(rf)
111
kind = bzrlib.osutils.file_kind(af)
113
if hasattr(e, 'errno') and e.errno == errno.ENOENT:
114
raise errors.NoSuchFile(rf)
117
if not InventoryEntry.versionable_kind(kind):
102
118
if f in user_list:
103
119
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
105
121
warning("skipping %s (can't add file of kind '%s')", f, kind)
108
mutter("smart add of %r, abs=%r" % (f, af))
124
mutter("smart add of %r, abs=%r", f, af)
110
if bzrlib.branch.is_control_file(af):
126
if is_control_file(af):
111
127
raise ForbiddenFileError('cannot add control file %s' % f)
113
129
versioned = (inv.path2id(rf) != None)
115
131
if kind == 'directory':
117
sub_branch = Branch(af, find_root=False)
133
sub_branch = WorkingTree(af)
119
135
except NotBranchError:
137
except errors.UnsupportedFormatError:
125
mutter("branch root doesn't need to be added")
143
mutter("tree root doesn't need to be added")
128
mutter("%r is already versioned" % f)
146
mutter("%r is already versioned", f)
130
mutter("%r is a bzr tree" %f)
148
mutter("%r is a bzr tree", f)
132
entry = inv.add_path(rf, kind=kind)
133
mutter("added %r kind %r file_id={%s}" % (rf, kind, entry.file_id))
135
reporter(rf, kind, entry)
150
added.extend(__add_one(tree, inv, rf, kind, action))
137
152
if kind == 'directory' and recurse and not sub_tree:
138
153
for subf in os.listdir(af):
139
subp = os.path.join(rf, subf)
154
subp = bzrlib.osutils.pathjoin(rf, subf)
140
155
if subf == bzrlib.BZRDIR:
141
mutter("skip control directory %r" % subp)
142
elif tree.is_ignored(subp):
143
mutter("skip ignored sub-file %r" % subp)
156
mutter("skip control directory %r", subp)
145
mutter("queue to add sub-file %r" % subp)
146
file_list.append(branch.abspath(subp))
149
mutter('added %d entries', count)
158
ignore_glob = tree.is_ignored(subp)
159
if ignore_glob is not None:
160
mutter("skip ignored sub-file %r", subp)
161
if ignore_glob not in ignored:
162
ignored[ignore_glob] = []
163
ignored[ignore_glob].append(subp)
165
mutter("queue to add sub-file %r", subp)
166
file_list.append(tree.abspath(subp))
169
mutter('added %d entries', len(added))
152
branch._write_inventory(inv)
172
tree._write_inventory(inv)
174
return added, ignored
176
def __add_one(tree, inv, path, kind, action):
177
"""Add a file or directory, automatically add unversioned parents."""
179
# Nothing to do if path is already versioned.
180
# This is safe from infinite recursion because the tree root is
182
if inv.path2id(path) != None:
186
added = __add_one(tree, inv, dirname(path), 'directory', action)
187
action(inv, path, kind)
189
return added + [path]
added
removed
bzrlib/add.py
