~bzr-pqm/bzr/bzr.dev

5273.1.8 by Vincent Ladeuil
Merge bzr.dev into cleanup
1
# Copyright (C) 2005-2010 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
70 by mbp at sourcefrog
Prepare for smart recursive add.
16
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
17
"""Helper functions for adding files to working trees."""
18
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
19
import sys
1185.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
20
2568.2.2 by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
21
import bzrlib.osutils
70 by mbp at sourcefrog
Prepare for smart recursive add.
22
1685.1.80 by Wouter van Heyst
more code cleanup
23
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
24
class AddAction(object):
25
    """A class which defines what action to take when adding a file."""
26
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.
27
    def __init__(self, to_file=None, should_print=None):
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
28
        """Initialize an action which prints added files to an output stream.
29
30
        :param to_file: The stream to write into. This is expected to take
31
            Unicode paths. If not supplied, it will default to ``sys.stdout``.
4031.3.1 by Frank Aspell
Fixing various typos
32
        :param should_print: If False, printing will be suppressed.
2399.1.5 by John Arbash Meinel
Clean up add.py documentation.
33
        """
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
34
        self._to_file = to_file
35
        if to_file is None:
36
            self._to_file = sys.stdout
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
37
        self.should_print = False
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
38
        if should_print is not None:
39
            self.should_print = should_print
40
1757.2.15 by Robert Collins
Consolidate writes of adds to one write per file - drops encoding overhead by 1/3.
41
    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.
42
        """Add path to inventory.
43
44
        The default action does nothing.
45
46
        :param inv: The inventory we are working with.
1757.2.2 by Robert Collins
Merge basename call eliminate for smart_add.
47
        :param path: The FastPath being added
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
48
        :param kind: The kind of the object being added.
49
        """
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
50
        if self.should_print:
3985.2.3 by Daniel Watkins
Changed output of add to not suggest partial success.
51
            self._to_file.write('adding %s\n' % _quote(path.raw_path))
1911.3.1 by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id.
52
        return None
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
53
54
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
55
class AddFromBaseAction(AddAction):
56
    """This class will try to extract file ids from another tree."""
57
58
    def __init__(self, base_tree, base_path, to_file=None, should_print=None):
59
        super(AddFromBaseAction, self).__init__(to_file=to_file,
60
                                                should_print=should_print)
61
        self.base_tree = base_tree
62
        self.base_path = base_path
63
64
    def __call__(self, inv, parent_ie, path, kind):
65
        # Place the parent call
66
        # Now check to see if we can extract an id for this file
67
        file_id, base_path = self._get_base_file_id(path, parent_ie)
68
        if file_id is not None:
69
            if self.should_print:
3985.2.3 by Daniel Watkins
Changed output of add to not suggest partial success.
70
                self._to_file.write('adding %s w/ file id from %s\n'
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
71
                                    % (path.raw_path, base_path))
72
        else:
73
            # we aren't doing anything special, so let the default
74
            # reporter happen
75
            file_id = super(AddFromBaseAction, self).__call__(
76
                        inv, parent_ie, path, kind)
77
        return file_id
78
79
    def _get_base_file_id(self, path, parent_ie):
80
        """Look for a file id in the base branch.
81
82
        First, if the base tree has the parent directory,
83
        we look for a file with the same name in that directory.
84
        Else, we look for an entry in the base tree with the same path.
85
        """
86
87
        if (parent_ie.file_id in self.base_tree):
88
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
89
            base_child_ie = base_parent_ie.children.get(path.base_path)
90
            if base_child_ie is not None:
91
                return (base_child_ie.file_id,
92
                        self.base_tree.id2path(base_child_ie.file_id))
93
        full_base_path = bzrlib.osutils.pathjoin(self.base_path, path.raw_path)
94
        # This may return None, but it is our last attempt
95
        return self.base_tree.path2id(full_base_path), full_base_path