1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1685.1.80
by Wouter van Heyst
more code cleanup |
2 |
#
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
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.
|
|
1685.1.80
by Wouter van Heyst
more code cleanup |
7 |
#
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
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.
|
|
1685.1.80
by Wouter van Heyst
more code cleanup |
12 |
#
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
17 |
"""Helper functions for adding files to working trees."""
|
18 |
||
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
19 |
import errno |
20 |
import os |
|
21 |
from os.path import dirname |
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
22 |
import sys |
1185.1.53
by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors |
23 |
|
2094.3.5
by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used |
24 |
import bzrlib.bzrdir |
1185.1.53
by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors |
25 |
import bzrlib.errors as errors |
1399.1.1
by Robert Collins
move checks for versionability of file kinds into InventoryEntry |
26 |
from bzrlib.inventory import InventoryEntry |
1128
by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather |
27 |
from bzrlib.trace import mutter, note, warning |
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
28 |
from bzrlib.errors import NotBranchError |
1508.1.10
by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins) |
29 |
import bzrlib.osutils |
30 |
from bzrlib.workingtree import WorkingTree |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
31 |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
32 |
|
686
by Martin Pool
- glob expand add arguments on win32 |
33 |
def glob_expand_for_win32(file_list): |
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
34 |
"""Replacement for glob expansion by the shell.
|
35 |
||
36 |
Win32's cmd.exe does not do glob expansion (eg ``*.py``), so we do our own
|
|
37 |
here.
|
|
38 |
||
39 |
:param file_list: A list of filenames which may include shell globs.
|
|
40 |
:return: An expanded list of filenames.
|
|
41 |
"""
|
|
1185.23.2
by Aaron Bentley
win32 glob expansion fix from Belchenko |
42 |
if not file_list: |
43 |
return
|
|
686
by Martin Pool
- glob expand add arguments on win32 |
44 |
import glob |
45 |
expanded_file_list = [] |
|
46 |
for possible_glob in file_list: |
|
47 |
glob_files = glob.glob(possible_glob) |
|
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
48 |
|
686
by Martin Pool
- glob expand add arguments on win32 |
49 |
if glob_files == []: |
50 |
# special case to let the normal code path handle
|
|
51 |
# files that do not exists
|
|
52 |
expanded_file_list.append(possible_glob) |
|
53 |
else: |
|
54 |
expanded_file_list += glob_files |
|
55 |
return expanded_file_list |
|
56 |
||
1128
by Martin Pool
- smart_add routine now doesn't print filenames directly, but rather |
57 |
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
58 |
def _prepare_file_list(file_list): |
59 |
"""Prepare a file list for use by smart_add_*."""
|
|
60 |
if sys.platform == 'win32': |
|
61 |
file_list = glob_expand_for_win32(file_list) |
|
62 |
if not file_list: |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
63 |
file_list = [u'.'] |
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
64 |
file_list = list(file_list) |
65 |
return file_list |
|
66 |
||
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
67 |
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
68 |
class AddAction(object): |
69 |
"""A class which defines what action to take when adding a file."""
|
|
70 |
||
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
71 |
def __init__(self, to_file=None, should_print=None): |
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
72 |
"""Initialize an action which prints added files to an output stream.
|
73 |
||
74 |
:param to_file: The stream to write into. This is expected to take
|
|
75 |
Unicode paths. If not supplied, it will default to ``sys.stdout``.
|
|
76 |
:param should_print: If False, printing will be supressed.
|
|
77 |
"""
|
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
78 |
self._to_file = to_file |
79 |
if to_file is None: |
|
80 |
self._to_file = sys.stdout |
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
81 |
self.should_print = False |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
82 |
if should_print is not None: |
83 |
self.should_print = should_print |
|
84 |
||
1757.2.15
by Robert Collins
Consolidate writes of adds to one write per file - drops encoding overhead by 1/3. |
85 |
def __call__(self, inv, parent_ie, path, kind, _quote=bzrlib.osutils.quotefn): |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
86 |
"""Add path to inventory.
|
87 |
||
88 |
The default action does nothing.
|
|
89 |
||
90 |
:param inv: The inventory we are working with.
|
|
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
91 |
:param path: The FastPath being added
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
92 |
:param kind: The kind of the object being added.
|
93 |
"""
|
|
1911.3.1
by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id. |
94 |
if self.should_print: |
95 |
self._to_file.write('added %s\n' % _quote(path.raw_path)) |
|
96 |
return None |
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
97 |
|
98 |
||
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
99 |
class AddFromBaseAction(AddAction): |
100 |
"""This class will try to extract file ids from another tree."""
|
|
101 |
||
102 |
def __init__(self, base_tree, base_path, to_file=None, should_print=None): |
|
103 |
super(AddFromBaseAction, self).__init__(to_file=to_file, |
|
104 |
should_print=should_print) |
|
105 |
self.base_tree = base_tree |
|
106 |
self.base_path = base_path |
|
107 |
||
108 |
def __call__(self, inv, parent_ie, path, kind): |
|
109 |
# Place the parent call
|
|
110 |
# Now check to see if we can extract an id for this file
|
|
111 |
file_id, base_path = self._get_base_file_id(path, parent_ie) |
|
112 |
if file_id is not None: |
|
113 |
if self.should_print: |
|
114 |
self._to_file.write('added %s w/ file id from %s\n' |
|
115 |
% (path.raw_path, base_path)) |
|
116 |
else: |
|
117 |
# we aren't doing anything special, so let the default
|
|
118 |
# reporter happen
|
|
119 |
file_id = super(AddFromBaseAction, self).__call__( |
|
120 |
inv, parent_ie, path, kind) |
|
121 |
return file_id |
|
122 |
||
123 |
def _get_base_file_id(self, path, parent_ie): |
|
124 |
"""Look for a file id in the base branch.
|
|
125 |
||
126 |
First, if the base tree has the parent directory,
|
|
127 |
we look for a file with the same name in that directory.
|
|
128 |
Else, we look for an entry in the base tree with the same path.
|
|
129 |
"""
|
|
130 |
||
131 |
if (parent_ie.file_id in self.base_tree): |
|
132 |
base_parent_ie = self.base_tree.inventory[parent_ie.file_id] |
|
133 |
base_child_ie = base_parent_ie.children.get(path.base_path) |
|
134 |
if base_child_ie is not None: |
|
135 |
return (base_child_ie.file_id, |
|
136 |
self.base_tree.id2path(base_child_ie.file_id)) |
|
137 |
full_base_path = bzrlib.osutils.pathjoin(self.base_path, path.raw_path) |
|
138 |
# This may return None, but it is our last attempt
|
|
139 |
return self.base_tree.path2id(full_base_path), full_base_path |
|
140 |
||
141 |
||
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
142 |
# TODO: jam 20050105 These could be used for compatibility
|
143 |
# however, they bind against the current stdout, not the
|
|
144 |
# one which exists at the time they are called, so they
|
|
145 |
# don't work for the test suite.
|
|
146 |
# deprecated
|
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
147 |
add_action_add = AddAction() |
148 |
add_action_null = add_action_add |
|
149 |
add_action_add_and_print = AddAction(should_print=True) |
|
150 |
add_action_print = add_action_add_and_print |
|
151 |
||
152 |
||
153 |
def smart_add(file_list, recurse=True, action=None, save=True): |
|
598
by Martin Pool
doc |
154 |
"""Add files to version, optionally recursing into directories.
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
155 |
|
156 |
This is designed more towards DWIM for humans than API simplicity.
|
|
157 |
For the specific behaviour see the help for cmd_add().
|
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
158 |
|
159 |
Returns the number of files added.
|
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
160 |
Please see smart_add_tree for more detail.
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
161 |
"""
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
162 |
file_list = _prepare_file_list(file_list) |
1508.1.10
by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins) |
163 |
tree = WorkingTree.open_containing(file_list[0])[0] |
1930.1.2
by John Arbash Meinel
Alexander Belchenko: Fix add --dry-run |
164 |
return smart_add_tree(tree, file_list, recurse, action=action, save=save) |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
165 |
|
166 |
||
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
167 |
class FastPath(object): |
168 |
"""A path object with fast accessors for things like basename."""
|
|
169 |
||
170 |
__slots__ = ['raw_path', 'base_path'] |
|
171 |
||
172 |
def __init__(self, path, base_path=None): |
|
173 |
"""Construct a FastPath from path."""
|
|
174 |
if base_path is None: |
|
175 |
self.base_path = bzrlib.osutils.basename(path) |
|
176 |
else: |
|
177 |
self.base_path = base_path |
|
178 |
self.raw_path = path |
|
179 |
||
1850.2.1
by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories. |
180 |
def __cmp__(self, other): |
181 |
return cmp(self.raw_path, other.raw_path) |
|
182 |
||
183 |
def __hash__(self): |
|
184 |
return hash(self.raw_path) |
|
185 |
||
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
186 |
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
187 |
def smart_add_tree(tree, file_list, recurse=True, action=None, save=True): |
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
188 |
"""Add files to version, optionally recursing into directories.
|
189 |
||
190 |
This is designed more towards DWIM for humans than API simplicity.
|
|
191 |
For the specific behaviour see the help for cmd_add().
|
|
192 |
||
193 |
This calls reporter with each (path, kind, file_id) of added files.
|
|
194 |
||
195 |
Returns the number of files added.
|
|
196 |
||
197 |
:param save: Save the inventory after completing the adds. If False this
|
|
198 |
provides dry-run functionality by doing the add and not saving the
|
|
199 |
inventory. Note that the modified inventory is left in place, allowing
|
|
200 |
further dry-run tasks to take place. To restore the original inventory
|
|
201 |
call tree.read_working_inventory().
|
|
202 |
"""
|
|
2255.2.62
by John Arbash Meinel
add a workingtree_implementations test that makes sure smart_add_tree orks properly |
203 |
tree.lock_tree_write() |
204 |
try: |
|
205 |
return _smart_add_tree(tree=tree, file_list=file_list, recurse=recurse, |
|
206 |
action=action, save=save) |
|
207 |
finally: |
|
208 |
tree.unlock() |
|
209 |
||
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
210 |
|
2255.2.62
by John Arbash Meinel
add a workingtree_implementations test that makes sure smart_add_tree orks properly |
211 |
def _smart_add_tree(tree, file_list, recurse=True, action=None, save=True): |
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
212 |
"""Helper for smart_add_tree.
|
213 |
||
214 |
The tree should be locked before entering this function. See smart_add_tree
|
|
215 |
for parameter definitions.
|
|
1092.1.29
by Robert Collins
break smart_add into smart_add and smart_add_branch which will accept a branch parameter |
216 |
"""
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
217 |
assert isinstance(recurse, bool) |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
218 |
if action is None: |
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
219 |
action = AddAction() |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
220 |
|
1713.1.14
by Robert Collins
Review feedback. |
221 |
prepared_list = _prepare_file_list(file_list) |
222 |
mutter("smart add of %r, originally %r", prepared_list, file_list) |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
223 |
inv = tree.read_working_inventory() |
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
224 |
added = [] |
225 |
ignored = {} |
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
226 |
dirs_to_add = [] |
1757.2.5
by Robert Collins
De-dup the add list so we only walk subtrees once for add. |
227 |
user_dirs = set() |
86
by mbp at sourcefrog
first cut at recursive add |
228 |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
229 |
# validate user file paths and convert all paths to tree
|
230 |
# relative : its cheaper to make a tree relative path an abspath
|
|
231 |
# than to convert an abspath to tree relative.
|
|
1713.1.14
by Robert Collins
Review feedback. |
232 |
for filepath in prepared_list: |
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
233 |
rf = FastPath(tree.relpath(filepath)) |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
234 |
# validate user parameters. Our recursive code avoids adding new files
|
235 |
# that need such validation
|
|
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
236 |
if tree.is_control_filename(rf.raw_path): |
2279.6.1
by Alexander Belchenko
Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron). |
237 |
raise errors.ForbiddenControlFileError(filename=rf.raw_path) |
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
238 |
|
239 |
abspath = tree.abspath(rf.raw_path) |
|
240 |
kind = bzrlib.osutils.file_kind(abspath) |
|
241 |
if kind == 'directory': |
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
242 |
# schedule the dir for scanning
|
1850.2.1
by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories. |
243 |
user_dirs.add(rf) |
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
244 |
else: |
245 |
if not InventoryEntry.versionable_kind(kind): |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
246 |
raise errors.BadFileKindError(filename=abspath, kind=kind) |
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
247 |
# ensure the named path is added, so that ignore rules in the later directory
|
248 |
# walk dont skip it.
|
|
249 |
# we dont have a parent ie known yet.: use the relatively slower inventory
|
|
250 |
# probing method
|
|
251 |
versioned = inv.has_filename(rf.raw_path) |
|
252 |
if versioned: |
|
253 |
continue
|
|
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
254 |
added.extend(__add_one_and_parent(tree, inv, None, rf, kind, action)) |
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
255 |
|
256 |
if not recurse: |
|
257 |
# no need to walk any directories at all.
|
|
258 |
if len(added) > 0 and save: |
|
259 |
tree._write_inventory(inv) |
|
260 |
return added, ignored |
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
261 |
|
1757.2.5
by Robert Collins
De-dup the add list so we only walk subtrees once for add. |
262 |
# only walk the minimal parents needed: we have user_dirs to override
|
263 |
# ignores.
|
|
264 |
prev_dir = None |
|
1850.2.1
by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories. |
265 |
|
266 |
is_inside = bzrlib.osutils.is_inside_or_parent_of_any |
|
1757.2.5
by Robert Collins
De-dup the add list so we only walk subtrees once for add. |
267 |
for path in sorted(user_dirs): |
1850.2.1
by John Arbash Meinel
Fix bug #52578, smart-add wasn't recursing all supplied directories. |
268 |
if (prev_dir is None or not is_inside([prev_dir], path.raw_path)): |
269 |
dirs_to_add.append((path, None)) |
|
270 |
prev_dir = path.raw_path |
|
1757.2.5
by Robert Collins
De-dup the add list so we only walk subtrees once for add. |
271 |
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
272 |
# this will eventually be *just* directories, right now it starts off with
|
273 |
# just directories.
|
|
274 |
for directory, parent_ie in dirs_to_add: |
|
275 |
# directory is tree-relative
|
|
276 |
abspath = tree.abspath(directory.raw_path) |
|
277 |
||
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
278 |
# get the contents of this directory.
|
279 |
||
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
280 |
# find the kind of the path being added.
|
281 |
kind = bzrlib.osutils.file_kind(abspath) |
|
282 |
||
283 |
if not InventoryEntry.versionable_kind(kind): |
|
284 |
warning("skipping %s (can't add file of kind '%s')", abspath, kind) |
|
285 |
continue
|
|
426
by Martin Pool
- Skip symlinks during recursive add (path from aaron) |
286 |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
287 |
if parent_ie is not None: |
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
288 |
versioned = directory.base_path in parent_ie.children |
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
289 |
else: |
290 |
# without the parent ie, use the relatively slower inventory
|
|
291 |
# probing method
|
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
292 |
versioned = inv.has_filename(directory.raw_path) |
86
by mbp at sourcefrog
first cut at recursive add |
293 |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
294 |
if kind == 'directory': |
295 |
try: |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
296 |
sub_branch = bzrlib.bzrdir.BzrDir.open(abspath) |
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
297 |
sub_tree = True |
298 |
except NotBranchError: |
|
299 |
sub_tree = False |
|
1185.1.53
by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors |
300 |
except errors.UnsupportedFormatError: |
301 |
sub_tree = True |
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
302 |
else: |
303 |
sub_tree = False |
|
304 |
||
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
305 |
if directory.raw_path == '': |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
306 |
# mutter("tree root doesn't need to be added")
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
307 |
sub_tree = False |
91
by mbp at sourcefrog
special handling of root directory for recursive add |
308 |
elif versioned: |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
309 |
pass
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
310 |
# mutter("%r is already versioned", abspath)
|
1092.1.27
by Robert Collins
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list |
311 |
elif sub_tree: |
2255.2.217
by Martin Pool
docs |
312 |
# XXX: This is wrong; people *might* reasonably be trying to add
|
313 |
# subtrees as subtrees. This should probably only be done in formats
|
|
314 |
# which can represent subtrees, and even then perhaps only when
|
|
2255.2.236
by Martin Pool
Review cleanups: mostly updating or removing todo comments. |
315 |
# the user asked to add subtrees. At the moment you can add them
|
316 |
# specially through 'join --reference', which is perhaps
|
|
317 |
# reasonable: adding a new reference is a special operation and
|
|
318 |
# can have a special behaviour. mbp 20070306
|
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
319 |
mutter("%r is a nested bzr tree", abspath) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
320 |
else: |
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
321 |
__add_one(tree, inv, parent_ie, directory, kind, action) |
322 |
added.append(directory.raw_path) |
|
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
323 |
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
324 |
if kind == 'directory' and not sub_tree: |
325 |
if parent_ie is not None: |
|
326 |
# must be present:
|
|
327 |
this_ie = parent_ie.children[directory.base_path] |
|
328 |
else: |
|
329 |
# without the parent ie, use the relatively slower inventory
|
|
330 |
# probing method
|
|
331 |
this_id = inv.path2id(directory.raw_path) |
|
332 |
if this_id is None: |
|
333 |
this_ie = None |
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
334 |
else: |
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
335 |
this_ie = inv[this_id] |
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
336 |
|
1910.10.1
by Andrew Bennetts
Sort os.listdir results in add.py. |
337 |
for subf in sorted(os.listdir(abspath)): |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
338 |
# here we could use TreeDirectory rather than
|
339 |
# string concatenation.
|
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
340 |
subp = bzrlib.osutils.pathjoin(directory.raw_path, subf) |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
341 |
# TODO: is_control_filename is very slow. Make it faster.
|
342 |
# TreeDirectory.is_control_filename could also make this
|
|
343 |
# faster - its impossible for a non root dir to have a
|
|
344 |
# control file.
|
|
1534.5.5
by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test. |
345 |
if tree.is_control_filename(subp): |
1185.31.4
by John Arbash Meinel
Fixing mutter() calls to not have to do string processing. |
346 |
mutter("skip control directory %r", subp) |
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
347 |
elif subf in this_ie.children: |
348 |
# recurse into this already versioned subdir.
|
|
349 |
dirs_to_add.append((FastPath(subp, subf), this_ie)) |
|
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
350 |
else: |
1757.2.5
by Robert Collins
De-dup the add list so we only walk subtrees once for add. |
351 |
# user selection overrides ignoes
|
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
352 |
# ignore while selecting files - if we globbed in the
|
353 |
# outer loop we would ignore user files.
|
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
354 |
ignore_glob = tree.is_ignored(subp) |
355 |
if ignore_glob is not None: |
|
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
356 |
# mutter("skip ignored sub-file %r", subp)
|
1830.3.4
by John Arbash Meinel
A couple no-op cleanups |
357 |
ignored.setdefault(ignore_glob, []).append(subp) |
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
358 |
else: |
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
359 |
#mutter("queue to add sub-file %r", subp)
|
1757.2.4
by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. |
360 |
dirs_to_add.append((FastPath(subp, subf), this_ie)) |
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
361 |
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
362 |
if len(added) > 0 and save: |
1508.1.10
by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins) |
363 |
tree._write_inventory(inv) |
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
364 |
return added, ignored |
1185.3.3
by Martin Pool
- patch from mpe to automatically add parent directories |
365 |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
366 |
|
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
367 |
def __add_one_and_parent(tree, inv, parent_ie, path, kind, action): |
1713.1.14
by Robert Collins
Review feedback. |
368 |
"""Add a new entry to the inventory and automatically add unversioned parents.
|
369 |
||
370 |
:param inv: Inventory which will receive the new entry.
|
|
371 |
:param parent_ie: Parent inventory entry if known, or None. If
|
|
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
372 |
None, the parent is looked up by name and used if present, otherwise it
|
373 |
is recursively added.
|
|
1713.1.14
by Robert Collins
Review feedback. |
374 |
:param kind: Kind of new entry (file, directory, etc)
|
375 |
:param action: callback(inv, parent_ie, path, kind); return ignored.
|
|
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
376 |
:return: A list of paths which have been added.
|
1713.1.14
by Robert Collins
Review feedback. |
377 |
"""
|
1185.3.3
by Martin Pool
- patch from mpe to automatically add parent directories |
378 |
# Nothing to do if path is already versioned.
|
1508.1.10
by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins) |
379 |
# This is safe from infinite recursion because the tree root is
|
1185.3.3
by Martin Pool
- patch from mpe to automatically add parent directories |
380 |
# always versioned.
|
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
381 |
if parent_ie is not None: |
382 |
# we have a parent ie already
|
|
383 |
added = [] |
|
384 |
else: |
|
385 |
# slower but does not need parent_ie
|
|
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
386 |
if inv.has_filename(path.raw_path): |
1713.1.11
by Robert Collins
refactor smart_add to pass around the parent inventory entry and use that, resulting in another 100bzrlib/inventory.py performance improvement, and making inventory writing the dominating factory in add. (Robert Collins) |
387 |
return [] |
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
388 |
# its really not there : add the parent
|
389 |
# note that the dirname use leads to some extra str copying etc but as
|
|
390 |
# there are a limited number of dirs we can be nested under, it should
|
|
391 |
# generally find it very fast and not recurse after that.
|
|
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
392 |
added = __add_one_and_parent(tree, inv, None, FastPath(dirname(path.raw_path)), 'directory', action) |
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
393 |
parent_id = inv.path2id(dirname(path.raw_path)) |
1757.2.16
by Robert Collins
Review comments. |
394 |
parent_ie = inv[parent_id] |
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
395 |
__add_one(tree, inv, parent_ie, path, kind, action) |
396 |
return added + [path.raw_path] |
|
397 |
||
398 |
||
399 |
def __add_one(tree, inv, parent_ie, path, kind, action): |
|
400 |
"""Add a new entry to the inventory.
|
|
401 |
||
402 |
:param inv: Inventory which will receive the new entry.
|
|
403 |
:param parent_ie: Parent inventory entry.
|
|
404 |
:param kind: Kind of new entry (file, directory, etc)
|
|
1911.3.1
by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id. |
405 |
:param action: callback(inv, parent_ie, path, kind); return a file_id
|
406 |
or None to generate a new file id
|
|
1757.2.7
by Robert Collins
Split out the recursive add and add of a single entry in add.py. |
407 |
:returns: None
|
408 |
"""
|
|
1911.3.1
by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id. |
409 |
file_id = action(inv, parent_ie, path, kind) |
410 |
entry = bzrlib.inventory.make_entry(kind, path.base_path, parent_ie.file_id, |
|
411 |
file_id=file_id) |
|
1757.2.6
by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code. |
412 |
inv.add(entry) |