1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
# Copyright (C) 2005 Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from bzrlib.trace import mutter, note, warning
from bzrlib.errors import NotBranchError
from bzrlib.branch import Branch
from bzrlib.osutils import quotefn
def glob_expand_for_win32(file_list):
import glob
expanded_file_list = []
for possible_glob in file_list:
glob_files = glob.glob(possible_glob)
if glob_files == []:
# special case to let the normal code path handle
# files that do not exists
expanded_file_list.append(possible_glob)
else:
expanded_file_list += glob_files
return expanded_file_list
def _NullAddCallback(path, kind, entry):
pass
def _PrintAddCallback(path, kind, entry):
print "added", quotefn(path)
def _prepare_file_list(file_list):
"""Prepare a file list for use by smart_add_*."""
import sys
if sys.platform == 'win32':
file_list = glob_expand_for_win32(file_list)
if not file_list:
file_list = ['.']
file_list = list(file_list)
assert not isinstance(file_list, basestring)
return file_list
def smart_add(file_list, verbose=True, recurse=True, callback=_NullAddCallback):
"""Add files to version, optionally recursing into directories.
This is designed more towards DWIM for humans than API simplicity.
For the specific behaviour see the help for cmd_add().
"""
file_list = _prepare_file_list(file_list)
b = Branch(file_list[0], find_root=True)
return smart_add_branch(b, file_list, verbose, recurse)
def smart_add_branch(branch, file_list, verbose=True, recurse=True,
callback=_NullAddCallback):
"""Add files to version, optionally recursing into directories.
This is designed more towards DWIM for humans than API simplicity.
For the specific behaviour see the help for cmd_add().
This yields a sequence of (path, kind, file_id) for added files.
"""
import os
import sys
from bzrlib.osutils import quotefn
from bzrlib.errors import BadFileKindError, ForbiddenFileError
import bzrlib.branch
import bzrlib.osutils
file_list = _prepare_file_list(file_list)
user_list = file_list[:]
inv = branch.read_working_inventory()
tree = branch.working_tree()
count = 0
for f in file_list:
rf = branch.relpath(f)
af = branch.abspath(rf)
kind = bzrlib.osutils.file_kind(af)
if kind != 'file' and kind != 'directory':
if f in user_list:
raise BadFileKindError("cannot add %s of type %s" % (f, kind))
else:
warning("skipping %s (can't add file of kind '%s')", f, kind)
continue
mutter("smart add of %r, abs=%r" % (f, af))
if bzrlib.branch.is_control_file(af):
raise ForbiddenFileError('cannot add control file %s' % f)
versioned = (inv.path2id(rf) != None)
if kind == 'directory':
try:
sub_branch = Branch(af, find_root=False)
sub_tree = True
except NotBranchError:
sub_tree = False
else:
sub_tree = False
if rf == '':
mutter("branch root doesn't need to be added")
sub_tree = False
elif versioned:
mutter("%r is already versioned" % f)
elif sub_tree:
mutter("%r is a bzr tree" %f)
else:
entry = inv.add_path(rf, kind=kind)
mutter("added %r kind %r file_id={%s}" % (rf, kind, entry.file_id))
count += 1
callback(rf, kind, entry)
if kind == 'directory' and recurse and not sub_tree:
for subf in os.listdir(af):
subp = os.path.join(rf, subf)
if subf == bzrlib.BZRDIR:
mutter("skip control directory %r" % subp)
elif tree.is_ignored(subp):
mutter("skip ignored sub-file %r" % subp)
else:
mutter("queue to add sub-file %r" % subp)
file_list.append(branch.abspath(subp))
if count > 0:
if verbose:
note('added %d' % count)
branch._write_inventory(inv)
else:
note("nothing new to add")
# should this return 1 to the shell?
|