70
by mbp at sourcefrog
Prepare for smart recursive add. |
1 |
# Copyright (C) 2005 Canonical Ltd
|
2 |
||
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.
|
|
7 |
||
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.
|
|
12 |
||
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 |
||
95
by mbp at sourcefrog
only show count of added files with --verbose |
17 |
from trace import mutter, note |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
18 |
|
686
by Martin Pool
- glob expand add arguments on win32 |
19 |
def glob_expand_for_win32(file_list): |
20 |
import glob |
|
21 |
||
22 |
expanded_file_list = [] |
|
23 |
for possible_glob in file_list: |
|
24 |
glob_files = glob.glob(possible_glob) |
|
25 |
||
26 |
if glob_files == []: |
|
27 |
# special case to let the normal code path handle
|
|
28 |
# files that do not exists
|
|
29 |
expanded_file_list.append(possible_glob) |
|
30 |
else: |
|
31 |
expanded_file_list += glob_files |
|
32 |
return expanded_file_list |
|
33 |
||
597
by Martin Pool
- tidy up add code |
34 |
def smart_add(file_list, verbose=True, recurse=True): |
598
by Martin Pool
doc |
35 |
"""Add files to version, optionally recursing into directories.
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
36 |
|
37 |
This is designed more towards DWIM for humans than API simplicity.
|
|
38 |
For the specific behaviour see the help for cmd_add().
|
|
39 |
"""
|
|
974
by Martin Pool
- start adding tests for commit in subdir |
40 |
import os |
41 |
import sys |
|
597
by Martin Pool
- tidy up add code |
42 |
from bzrlib.osutils import quotefn, kind_marker |
599
by Martin Pool
- better error reporting from smart_add |
43 |
from bzrlib.errors import BadFileKindError, ForbiddenFileError |
974
by Martin Pool
- start adding tests for commit in subdir |
44 |
import bzrlib.branch |
45 |
import bzrlib.osutils |
|
599
by Martin Pool
- better error reporting from smart_add |
46 |
|
686
by Martin Pool
- glob expand add arguments on win32 |
47 |
if sys.platform == 'win32': |
48 |
file_list = glob_expand_for_win32(file_list) |
|
974
by Martin Pool
- start adding tests for commit in subdir |
49 |
|
50 |
if not file_list: |
|
51 |
file_list = ['.'] |
|
686
by Martin Pool
- glob expand add arguments on win32 |
52 |
|
426
by Martin Pool
- Skip symlinks during recursive add (path from aaron) |
53 |
user_list = file_list[:] |
88
by mbp at sourcefrog
smart_add: no warning for already-added files |
54 |
assert not isinstance(file_list, basestring) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
55 |
b = bzrlib.branch.Branch(file_list[0], find_root=True) |
56 |
inv = b.read_working_inventory() |
|
86
by mbp at sourcefrog
first cut at recursive add |
57 |
tree = b.working_tree() |
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
58 |
count = 0 |
86
by mbp at sourcefrog
first cut at recursive add |
59 |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
60 |
for f in file_list: |
510
by Martin Pool
- fix add of files when standing in subdirectory |
61 |
rf = b.relpath(f) |
62 |
af = b.abspath(rf) |
|
63 |
||
64 |
kind = bzrlib.osutils.file_kind(af) |
|
426
by Martin Pool
- Skip symlinks during recursive add (path from aaron) |
65 |
|
66 |
if kind != 'file' and kind != 'directory': |
|
599
by Martin Pool
- better error reporting from smart_add |
67 |
if f in user_list: |
68 |
raise BadFileKindError("cannot add %s of type %s" % (f, kind)) |
|
69 |
else: |
|
70 |
print "skipping %s (can't add file of kind '%s')" % (f, kind) |
|
426
by Martin Pool
- Skip symlinks during recursive add (path from aaron) |
71 |
continue
|
72 |
||
800
by Martin Pool
Merge John's import-speedup branch: |
73 |
mutter("smart add of %r, abs=%r" % (f, af)) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
74 |
|
75 |
if bzrlib.branch.is_control_file(af): |
|
599
by Martin Pool
- better error reporting from smart_add |
76 |
raise ForbiddenFileError('cannot add control file %s' % f) |
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
77 |
|
86
by mbp at sourcefrog
first cut at recursive add |
78 |
versioned = (inv.path2id(rf) != None) |
79 |
||
91
by mbp at sourcefrog
special handling of root directory for recursive add |
80 |
if rf == '': |
81 |
mutter("branch root doesn't need to be added") |
|
82 |
elif versioned: |
|
88
by mbp at sourcefrog
smart_add: no warning for already-added files |
83 |
mutter("%r is already versioned" % f) |
70
by mbp at sourcefrog
Prepare for smart recursive add. |
84 |
else: |
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
85 |
file_id = bzrlib.branch.gen_file_id(rf) |
86 |
inv.add_path(rf, kind=kind, file_id=file_id) |
|
800
by Martin Pool
Merge John's import-speedup branch: |
87 |
mutter("added %r kind %r file_id={%s}" % (rf, kind, file_id)) |
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
88 |
count += 1 |
597
by Martin Pool
- tidy up add code |
89 |
|
90 |
print 'added', quotefn(f) |
|
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
91 |
|
92 |
if kind == 'directory' and recurse: |
|
93 |
for subf in os.listdir(af): |
|
597
by Martin Pool
- tidy up add code |
94 |
subp = os.path.join(rf, subf) |
103
by mbp at sourcefrog
Skip control directories in recursive add |
95 |
if subf == bzrlib.BZRDIR: |
96 |
mutter("skip control directory %r" % subp) |
|
97 |
elif tree.is_ignored(subp): |
|
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
98 |
mutter("skip ignored sub-file %r" % subp) |
99 |
else: |
|
510
by Martin Pool
- fix add of files when standing in subdirectory |
100 |
mutter("queue to add sub-file %r" % subp) |
101 |
file_list.append(b.abspath(subp)) |
|
87
by mbp at sourcefrog
- clean up smart_add code, and make it commit the inventory |
102 |
|
103 |
if count > 0: |
|
95
by mbp at sourcefrog
only show count of added files with --verbose |
104 |
if verbose: |
105 |
note('added %d' % count) |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
106 |
b._write_inventory(inv) |
974
by Martin Pool
- start adding tests for commit in subdir |
107 |
else: |
108 |
print "nothing new to add" |
|
109 |
# should this return 1 to the shell?
|