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
|
# 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
import os, sys
import bzrlib
from osutils import quotefn, appendpath
from errors import bailout
from trace import mutter, note
def smart_add(file_list, verbose=False, recurse=True):
"""Add files to version, optionall recursing into directories.
This is designed more towards DWIM for humans than API simplicity.
For the specific behaviour see the help for cmd_add().
"""
assert file_list
user_list = file_list[:]
assert not isinstance(file_list, basestring)
b = bzrlib.branch.Branch(file_list[0], find_root=True)
inv = b.read_working_inventory()
tree = b.working_tree()
count = 0
for f in file_list:
rf = b.relpath(f)
af = b.abspath(rf)
kind = bzrlib.osutils.file_kind(af)
if kind != 'file' and kind != 'directory':
if f not in user_list:
print "Skipping %s (can't add file of kind '%s')" % (f, kind)
continue
bailout("can't add file of kind %r" % kind)
bzrlib.mutter("smart add of %r, abs=%r" % (f, af))
if bzrlib.branch.is_control_file(af):
bailout("cannot add control file %r" % af)
versioned = (inv.path2id(rf) != None)
if rf == '':
mutter("branch root doesn't need to be added")
elif versioned:
mutter("%r is already versioned" % f)
else:
file_id = bzrlib.branch.gen_file_id(rf)
inv.add_path(rf, kind=kind, file_id=file_id)
bzrlib.mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id))
count += 1
if verbose:
bzrlib.textui.show_status('A', kind, quotefn(f))
if kind == 'directory' and recurse:
for subf in os.listdir(af):
subp = appendpath(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(b.abspath(subp))
if count > 0:
if verbose:
note('added %d' % count)
b._write_inventory(inv)
|