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