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 |
|
5870.1.43
by Jelmer Vernooij
Avoid 'import bzrlib.osutils'. |
21 |
from bzrlib import ( |
22 |
osutils, |
|
23 |
)
|
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
24 |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
25 |
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
26 |
class AddAction(object): |
27 |
"""A class which defines what action to take when adding a file."""
|
|
28 |
||
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. |
29 |
def __init__(self, to_file=None, should_print=None): |
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
30 |
"""Initialize an action which prints added files to an output stream.
|
31 |
||
32 |
:param to_file: The stream to write into. This is expected to take
|
|
33 |
Unicode paths. If not supplied, it will default to ``sys.stdout``.
|
|
4031.3.1
by Frank Aspell
Fixing various typos |
34 |
:param should_print: If False, printing will be suppressed.
|
2399.1.5
by John Arbash Meinel
Clean up add.py documentation. |
35 |
"""
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
36 |
self._to_file = to_file |
37 |
if to_file is None: |
|
38 |
self._to_file = sys.stdout |
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
39 |
self.should_print = False |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
40 |
if should_print is not None: |
41 |
self.should_print = should_print |
|
42 |
||
5870.1.43
by Jelmer Vernooij
Avoid 'import bzrlib.osutils'. |
43 |
def __call__(self, inv, parent_ie, path, kind, _quote=osutils.quotefn): |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
44 |
"""Add path to inventory.
|
45 |
||
46 |
The default action does nothing.
|
|
47 |
||
48 |
:param inv: The inventory we are working with.
|
|
1757.2.2
by Robert Collins
Merge basename call eliminate for smart_add. |
49 |
:param path: The FastPath being added
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
50 |
:param kind: The kind of the object being added.
|
51 |
"""
|
|
1911.3.1
by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id. |
52 |
if self.should_print: |
5870.1.36
by Jelmer Vernooij
kill _FastPath. |
53 |
self._to_file.write('adding %s\n' % _quote(path)) |
1911.3.1
by John Arbash Meinel
Updated smart_add so that the AddAction can return a custom id. |
54 |
return None |
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
55 |
|
56 |
||
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
57 |
class AddFromBaseAction(AddAction): |
58 |
"""This class will try to extract file ids from another tree."""
|
|
59 |
||
60 |
def __init__(self, base_tree, base_path, to_file=None, should_print=None): |
|
61 |
super(AddFromBaseAction, self).__init__(to_file=to_file, |
|
62 |
should_print=should_print) |
|
63 |
self.base_tree = base_tree |
|
64 |
self.base_path = base_path |
|
65 |
||
66 |
def __call__(self, inv, parent_ie, path, kind): |
|
67 |
# Place the parent call
|
|
68 |
# Now check to see if we can extract an id for this file
|
|
69 |
file_id, base_path = self._get_base_file_id(path, parent_ie) |
|
70 |
if file_id is not None: |
|
71 |
if self.should_print: |
|
3985.2.3
by Daniel Watkins
Changed output of add to not suggest partial success. |
72 |
self._to_file.write('adding %s w/ file id from %s\n' |
5870.1.36
by Jelmer Vernooij
kill _FastPath. |
73 |
% (path, base_path)) |
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
74 |
else: |
75 |
# we aren't doing anything special, so let the default
|
|
76 |
# reporter happen
|
|
77 |
file_id = super(AddFromBaseAction, self).__call__( |
|
78 |
inv, parent_ie, path, kind) |
|
79 |
return file_id |
|
80 |
||
81 |
def _get_base_file_id(self, path, parent_ie): |
|
82 |
"""Look for a file id in the base branch.
|
|
83 |
||
84 |
First, if the base tree has the parent directory,
|
|
85 |
we look for a file with the same name in that directory.
|
|
86 |
Else, we look for an entry in the base tree with the same path.
|
|
87 |
"""
|
|
88 |
||
5967.7.1
by Martin Pool
Deprecate __contains__ on Tree and Inventory |
89 |
if self.base_tree.has_id(parent_ie.file_id): |
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
90 |
base_parent_ie = self.base_tree.inventory[parent_ie.file_id] |
5870.1.36
by Jelmer Vernooij
kill _FastPath. |
91 |
base_child_ie = base_parent_ie.children.get( |
5870.1.43
by Jelmer Vernooij
Avoid 'import bzrlib.osutils'. |
92 |
osutils.basename(path)) |
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
93 |
if base_child_ie is not None: |
94 |
return (base_child_ie.file_id, |
|
95 |
self.base_tree.id2path(base_child_ie.file_id)) |
|
5870.1.43
by Jelmer Vernooij
Avoid 'import bzrlib.osutils'. |
96 |
full_base_path = osutils.pathjoin(self.base_path, path) |
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
97 |
# This may return None, but it is our last attempt
|
98 |
return self.base_tree.path2id(full_base_path), full_base_path |