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  | 
||
| 
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  | 
|
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
21  | 
import sys  | 
| 
1185.1.53
by Robert Collins
 raise a specific error on unsupported branches so that they can be distinguished from generic errors  | 
22  | 
|
| 
2094.3.5
by John Arbash Meinel
 Fix imports to ensure modules are loaded before they are used  | 
23  | 
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  | 
24  | 
import bzrlib.errors as errors  | 
| 
2568.2.2
by Robert Collins
 * New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class  | 
25  | 
import bzrlib.osutils  | 
26  | 
from bzrlib.symbol_versioning import *  | 
|
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
27  | 
from bzrlib.workingtree import WorkingTree  | 
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
28  | 
|
| 
1685.1.80
by Wouter van Heyst
 more code cleanup  | 
29  | 
|
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
30  | 
class AddAction(object):  | 
31  | 
"""A class which defines what action to take when adding a file."""  | 
|
32  | 
||
| 
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.  | 
33  | 
def __init__(self, to_file=None, should_print=None):  | 
| 
2399.1.5
by John Arbash Meinel
 Clean up add.py documentation.  | 
34  | 
"""Initialize an action which prints added files to an output stream.  | 
35  | 
||
36  | 
        :param to_file: The stream to write into. This is expected to take
 | 
|
37  | 
            Unicode paths. If not supplied, it will default to ``sys.stdout``.
 | 
|
38  | 
        :param should_print: If False, printing will be supressed.
 | 
|
39  | 
        """
 | 
|
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
40  | 
self._to_file = to_file  | 
41  | 
if to_file is None:  | 
|
42  | 
self._to_file = sys.stdout  | 
|
| 
1685.1.69
by Wouter van Heyst
 merge bzr.dev 1740  | 
43  | 
self.should_print = False  | 
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
44  | 
if should_print is not None:  | 
45  | 
self.should_print = should_print  | 
|
46  | 
||
| 
1757.2.15
by Robert Collins
 Consolidate writes of adds to one write per file - drops encoding overhead by 1/3.  | 
47  | 
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.  | 
48  | 
"""Add path to inventory.  | 
49  | 
||
50  | 
        The default action does nothing.
 | 
|
51  | 
||
52  | 
        :param inv: The inventory we are working with.
 | 
|
| 
1757.2.2
by Robert Collins
 Merge basename call eliminate for smart_add.  | 
53  | 
        :param path: The FastPath being added
 | 
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
54  | 
        :param kind: The kind of the object being added.
 | 
55  | 
        """
 | 
|
| 
1911.3.1
by John Arbash Meinel
 Updated smart_add so that the AddAction can return a custom id.  | 
56  | 
if self.should_print:  | 
57  | 
self._to_file.write('added %s\n' % _quote(path.raw_path))  | 
|
58  | 
return None  | 
|
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
59  | 
|
60  | 
||
| 
1911.3.2
by John Arbash Meinel
 Adding the AddFromBaseAction, which tries to reuse file ids from another tree  | 
61  | 
class AddFromBaseAction(AddAction):  | 
62  | 
"""This class will try to extract file ids from another tree."""  | 
|
63  | 
||
64  | 
def __init__(self, base_tree, base_path, to_file=None, should_print=None):  | 
|
65  | 
super(AddFromBaseAction, self).__init__(to_file=to_file,  | 
|
66  | 
should_print=should_print)  | 
|
67  | 
self.base_tree = base_tree  | 
|
68  | 
self.base_path = base_path  | 
|
69  | 
||
70  | 
def __call__(self, inv, parent_ie, path, kind):  | 
|
71  | 
        # Place the parent call
 | 
|
72  | 
        # Now check to see if we can extract an id for this file
 | 
|
73  | 
file_id, base_path = self._get_base_file_id(path, parent_ie)  | 
|
74  | 
if file_id is not None:  | 
|
75  | 
if self.should_print:  | 
|
76  | 
self._to_file.write('added %s w/ file id from %s\n'  | 
|
77  | 
% (path.raw_path, base_path))  | 
|
78  | 
else:  | 
|
79  | 
            # we aren't doing anything special, so let the default
 | 
|
80  | 
            # reporter happen
 | 
|
81  | 
file_id = super(AddFromBaseAction, self).__call__(  | 
|
82  | 
inv, parent_ie, path, kind)  | 
|
83  | 
return file_id  | 
|
84  | 
||
85  | 
def _get_base_file_id(self, path, parent_ie):  | 
|
86  | 
"""Look for a file id in the base branch.  | 
|
87  | 
||
88  | 
        First, if the base tree has the parent directory,
 | 
|
89  | 
        we look for a file with the same name in that directory.
 | 
|
90  | 
        Else, we look for an entry in the base tree with the same path.
 | 
|
91  | 
        """
 | 
|
92  | 
||
93  | 
if (parent_ie.file_id in self.base_tree):  | 
|
94  | 
base_parent_ie = self.base_tree.inventory[parent_ie.file_id]  | 
|
95  | 
base_child_ie = base_parent_ie.children.get(path.base_path)  | 
|
96  | 
if base_child_ie is not None:  | 
|
97  | 
return (base_child_ie.file_id,  | 
|
98  | 
self.base_tree.id2path(base_child_ie.file_id))  | 
|
99  | 
full_base_path = bzrlib.osutils.pathjoin(self.base_path, path.raw_path)  | 
|
100  | 
        # This may return None, but it is our last attempt
 | 
|
101  | 
return self.base_tree.path2id(full_base_path), full_base_path  | 
|
102  | 
||
103  | 
||
| 
1185.85.12
by John Arbash Meinel
 Refactoring AddAction to allow redirecting to an encoding file.  | 
104  | 
# TODO: jam 20050105 These could be used for compatibility
 | 
105  | 
#       however, they bind against the current stdout, not the
 | 
|
106  | 
#       one which exists at the time they are called, so they
 | 
|
107  | 
#       don't work for the test suite.
 | 
|
108  | 
# 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.  | 
109  | 
add_action_add = AddAction()  | 
110  | 
add_action_null = add_action_add  | 
|
111  | 
add_action_add_and_print = AddAction(should_print=True)  | 
|
112  | 
add_action_print = add_action_add_and_print  | 
|
113  | 
||
114  | 
||
| 
2568.2.2
by Robert Collins
 * New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class  | 
115  | 
@deprecated_function(zero_eighteen)  | 
| 
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.  | 
116  | 
def smart_add(file_list, recurse=True, action=None, save=True):  | 
| 
598
by Martin Pool
 doc  | 
117  | 
"""Add files to version, optionally recursing into directories.  | 
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
118  | 
|
119  | 
    This is designed more towards DWIM for humans than API simplicity.
 | 
|
120  | 
    For the specific behaviour see the help for cmd_add().
 | 
|
| 
1159
by Martin Pool
 - clean up parameters to smart_add and smart_add_branch  | 
121  | 
|
122  | 
    Returns the number of files added.
 | 
|
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
123  | 
    Deprecated in 0.18. Please use MutableTree.smart_add.
 | 
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
124  | 
    """
 | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
125  | 
tree = WorkingTree.open_containing(file_list[0])[0]  | 
| 
1930.1.2
by John Arbash Meinel
 Alexander Belchenko: Fix add --dry-run  | 
126  | 
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.  | 
127  | 
|
128  | 
||
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
129  | 
@deprecated_function(zero_eighteen)  | 
| 
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.  | 
130  | 
def smart_add_tree(tree, file_list, recurse=True, action=None, save=True):  | 
| 
2568.2.4
by Robert Collins
 * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now  | 
131  | 
"""Deprecated in 0.18. Please use MutableTree.smart_add."""  | 
132  | 
return tree.smart_add(file_list, recurse, action, save)  | 
|
133  |