« back to all changes in this revision
Viewing changes to bzrlib/add.py
- browse files at revision 1704.2.28
- compare with another revision
- compare with revision 1185.11.1
- download diff
- download tarball
- view history from revision 1704.2.28
- Committer: Martin Pool
- Date: 2006-05-23 10:57:02 UTC
- mfrom: (1725 +trunk)
- mto: This revision was merged to the branch mainline in revision 1726.
- Revision ID: mbp@sourcefrog.net-20060523105702-e5de4664cfdb4e8d
[merge] bzr.dev
- files added:
- bzrlib/benchmarks/bench_checkout.py
- files modified:
- NEWS
added
removed
bzrlib/add.py
20
20
from bzrlib.inventory import InventoryEntry
21
21
from bzrlib.trace import mutter, note, warning
22
22
from bzrlib.errors import NotBranchError
23
from bzrlib.workingtree import is_control_file
24
23
import bzrlib.osutils
25
24
from bzrlib.workingtree import WorkingTree
26
25
52
51
return file_list
53
52
54
53
55
def add_action_null(inv, path, kind):
54
def add_action_null(inv, parent_ie, path, kind):
56
55
"""Absorb add actions and do nothing."""
57
56
pass
58
57
59
def add_action_print(inv, path, kind):
58
59
def add_action_print(inv, parent_ie, path, kind):
60
60
"""Print a line to stdout for each file that would be added."""
61
61
print "added", bzrlib.osutils.quotefn(path)
62
62
63
def add_action_add(inv, path, kind):
63
64
def add_action_add(inv, parent_ie, path, kind):
64
65
"""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))
67
68
69
def add_action_add_and_print(inv, path, kind):
66
if parent_ie is not None:
67
entry = bzrlib.inventory.make_entry(
68
kind, bzrlib.osutils.basename(path), parent_ie.file_id)
69
inv.add(entry)
70
else:
71
entry = inv.add_path(path, kind=kind)
72
# mutter("added %r kind %r file_id={%s}" % (path, kind, entry.file_id))
73
74
75
def add_action_add_and_print(inv, parent_ie, path, kind):
70
76
"""Add each file to the given inventory, and print a line to stdout."""
71
add_action_add(inv, path, kind)
72
add_action_print(inv, path, kind)
77
add_action_add(inv, parent_ie, path, kind)
78
add_action_print(inv, parent_ie, path, kind)
73
79
74
80
75
81
def smart_add(file_list, recurse=True, action=add_action_add):
98
104
import os, errno
99
105
from bzrlib.errors import BadFileKindError, ForbiddenFileError
100
106
assert isinstance(recurse, bool)
101
102
file_list = _prepare_file_list(file_list)
103
user_list = file_list[:]
107
108
prepared_list = _prepare_file_list(file_list)
109
mutter("smart add of %r, originally %r", prepared_list, file_list)
104
110
inv = tree.read_working_inventory()
105
111
added = []
106
112
ignored = {}
107
108
for f in file_list:
109
rf = tree.relpath(f)
110
af = tree.abspath(rf)
111
113
user_files = set()
114
files_to_add = []
115
116
# validate user file paths and convert all paths to tree
117
# relative : its cheaper to make a tree relative path an abspath
118
# than to convert an abspath to tree relative.
119
for filepath in prepared_list:
120
rf = tree.relpath(filepath)
121
user_files.add(rf)
122
files_to_add.append((rf, None))
123
# validate user parameters. Our recursive code avoids adding new files
124
# that need such validation
125
if tree.is_control_filename(rf):
126
raise ForbiddenFileError('cannot add control file %s' % filepath)
127
128
for filepath, parent_ie in files_to_add:
129
# filepath is tree-relative
130
abspath = tree.abspath(filepath)
131
132
# find the kind of the path being added. This is not
133
# currently determined when we list directories
134
# recursively, but in theory we can determine while
135
# doing the directory listing on *some* platformans.
136
# TODO: a safe, portable, clean interface which will
137
# be faster than os.listdir() + stat. Specifically,
138
# readdir - dirent.d_type supplies the file type when
139
# it is defined. (Apparently Mac OSX has the field but
140
# does not fill it in ?!) Robert C, Martin P.
112
141
try:
113
kind = bzrlib.osutils.file_kind(af)
142
kind = bzrlib.osutils.file_kind(abspath)
114
143
except OSError, e:
115
144
if hasattr(e, 'errno') and e.errno == errno.ENOENT:
116
raise errors.NoSuchFile(rf)
145
raise errors.NoSuchFile(abspath)
117
146
raise
118
147
148
# we need to call this to determine the inventory kind to create.
119
149
if not InventoryEntry.versionable_kind(kind):
120
if f in user_list:
121
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
150
if filepath in user_files:
151
raise BadFileKindError("cannot add %s of type %s" % (abspath, kind))
122
152
else:
123
warning("skipping %s (can't add file of kind '%s')", f, kind)
153
warning("skipping %s (can't add file of kind '%s')", abspath, kind)
124
154
continue
125
155
126
mutter("smart add of %r, abs=%r", f, af)
127
128
if tree.is_control_filename(af):
129
raise ForbiddenFileError('cannot add control file %s' % f)
130
131
versioned = (inv.path2id(rf) != None)
156
if parent_ie is not None:
157
versioned = bzrlib.osutils.basename(filepath) in parent_ie.children
158
else:
159
# without the parent ie, use the relatively slower inventory
160
# probing method
161
versioned = inv.has_filename(filepath)
132
162
133
163
if kind == 'directory':
134
164
try:
135
sub_branch = WorkingTree.open(af)
165
sub_branch = bzrlib.bzrdir.BzrDir.open(abspath)
136
166
sub_tree = True
137
167
except NotBranchError:
138
168
sub_tree = False
141
171
else:
142
172
sub_tree = False
143
173
144
if rf == '':
145
mutter("tree root doesn't need to be added")
174
if filepath == '':
175
# mutter("tree root doesn't need to be added")
146
176
sub_tree = False
147
177
elif versioned:
148
mutter("%r is already versioned", f)
178
pass
179
# mutter("%r is already versioned", abspath)
149
180
elif sub_tree:
150
mutter("%r is a bzr tree", f)
181
mutter("%r is a nested bzr tree", abspath)
151
182
else:
152
added.extend(__add_one(tree, inv, rf, kind, action))
183
added.extend(__add_one(tree, inv, parent_ie, filepath, kind, action))
153
184
154
185
if kind == 'directory' and recurse and not sub_tree:
155
for subf in os.listdir(af):
156
subp = bzrlib.osutils.pathjoin(rf, subf)
186
try:
187
if parent_ie is not None:
188
# must be present:
189
this_ie = parent_ie.children[bzrlib.osutils.basename(filepath)]
190
else:
191
# without the parent ie, use the relatively slower inventory
192
# probing method
193
this_id = inv.path2id(filepath)
194
if this_id is None:
195
this_ie = None
196
else:
197
this_ie = inv[this_id]
198
except KeyError:
199
this_ie = None
200
201
for subf in os.listdir(abspath):
202
# here we could use TreeDirectory rather than
203
# string concatenation.
204
subp = bzrlib.osutils.pathjoin(filepath, subf)
205
# TODO: is_control_filename is very slow. Make it faster.
206
# TreeDirectory.is_control_filename could also make this
207
# faster - its impossible for a non root dir to have a
208
# control file.
157
209
if tree.is_control_filename(subp):
158
210
mutter("skip control directory %r", subp)
159
211
else:
212
# ignore while selecting files - if we globbed in the
213
# outer loop we would ignore user files.
160
214
ignore_glob = tree.is_ignored(subp)
161
215
if ignore_glob is not None:
162
mutter("skip ignored sub-file %r", subp)
216
# mutter("skip ignored sub-file %r", subp)
163
217
if ignore_glob not in ignored:
164
218
ignored[ignore_glob] = []
165
219
ignored[ignore_glob].append(subp)
166
220
else:
167
mutter("queue to add sub-file %r", subp)
168
file_list.append(tree.abspath(subp))
221
#mutter("queue to add sub-file %r", subp)
222
files_to_add.append((subp, this_ie))
169
223
170
mutter('added %d entries', len(added))
171
172
224
if len(added) > 0:
173
225
tree._write_inventory(inv)
174
175
226
return added, ignored
176
227
177
228
178
def __add_one(tree, inv, path, kind, action):
179
"""Add a file or directory, automatically add unversioned parents."""
229
def __add_one(tree, inv, parent_ie, path, kind, action):
230
"""Add a new entry to the inventory and automatically add unversioned parents.
231
232
Actual adding of the entry is delegated to the action callback.
233
234
:param inv: Inventory which will receive the new entry.
235
:param parent_ie: Parent inventory entry if known, or None. If
236
None, the parent is looked up by name and used if present, otherwise
237
it is recursively added.
238
:param kind: Kind of new entry (file, directory, etc)
239
:param action: callback(inv, parent_ie, path, kind); return ignored.
240
:returns: A list of paths which have been added.
241
"""
180
242
181
243
# Nothing to do if path is already versioned.
182
244
# This is safe from infinite recursion because the tree root is
183
245
# always versioned.
184
if inv.path2id(path) != None:
185
return []
186
187
# add parent
188
added = __add_one(tree, inv, dirname(path), 'directory', action)
189
action(inv, path, kind)
246
if parent_ie is not None:
247
# we have a parent ie already
248
added = []
249
else:
250
# slower but does not need parent_ie
251
if inv.has_filename(path):
252
return []
253
# add parent
254
added = __add_one(tree, inv, None, dirname(path), 'directory', action)
255
parent_id = inv.path2id(dirname(path))
256
if parent_id is not None:
257
parent_ie = inv[inv.path2id(dirname(path))]
258
else:
259
parent_ie = None
260
action(inv, parent_ie, path, kind)
190
261
191
262
return added + [path]
Loggerhead is a web-based interface for Breezy
Version: 2.0.1