24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
26
26
from stdhome.walker.copy_in import CopyInWalker
27
from stdhome.walker.walker import Walker
29
30
class AddCommand( Command ):
34
self.recursive = False
32
37
def print_help( self ):
33
38
print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
38
43
print "Add a named file from the local filesystem, specified relative to the home"
39
44
print "directory, to the repo, or update an existing file in the repo with your local"
40
45
print "changes. Directories can also be added, but note that they are not added"
41
print "recursively (as is common with version control)."
46
print "recursively (as is common with version control) unless this is specifically"
47
print "requested on the commandline."
44
50
print " -r, --repo=REPO select the repo to check-out or create (defaults to 'home')"
51
print " -R, --recursive recursively add directories"
45
52
print " -v, --verbose display information about what is being done"
46
53
print " --help display help and exit"
50
57
def parse_command_line( self ):
51
58
opts, args = getopt.gnu_getopt(
52
sys.argv[ 1: ], "r:v",
53
[ "repo=", "verbose", "help" ] )
59
sys.argv[ 1: ], "r:Rv",
60
[ "repo=", "recuirsive", "verbose", "help" ] )
54
61
for opt, optarg in opts:
55
62
if opt in [ '--repo', '-r' ]:
56
if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
63
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
57
64
raise the.program.FatalError(
58
65
'invalid repository name: ' + optarg )
67
elif opt in [ '--recursive', '-R' ]:
60
69
elif opt in [ '--verbose', '-v' ]:
62
71
elif opt == "--help":
65
74
# discard first argument (the command)
79
88
the.repo.check_dir_exists()
82
files = self.expand_home_dir_files( self.files )
91
files = self.expand_home_files( self.files, self.recursive )
84
93
# initialise deployment and ensure it's not ongoing
85
94
deployment = Deployment()
89
98
if the.repo.vcs.has_changes():
90
99
raise the.program.FatalError(
91
100
'repo has local changes: %s\n'
92
'Hint: see "%s stage-revert --help"' %
101
'Hint: see "%s stage-revert --help"' %
93
102
( the.repo.name, the.program.name ) )
96
walker = CopyInWalker( files )
105
walker = CopyInWalker( files, True )
99
108
# make sure all files are added to version control
105
114
the.repo.vcs.commit()
109
def expand_home_dir_files( files ):
119
def expand_home_files( files, recurse ):
110
120
"""Returns a unique, sorted list of relative filenames, calculated from the list
111
121
provided, which is made up from individual files and directories
112
relative to the CWD. Directories and are not recursed in to. Specified
113
filenames must exist in the home directory (although they may not exist
122
relative to the CWD. As directories are found, they may optionally be
123
recursed in to. Leading path components of any items are alse returned.
124
Specified filenames must exist in the home directory (although they do
125
not have to exist in the repo).
127
This is a modified version of command.expand_files().
118
132
home_dir_prefix = os.path.realpath( the.full_home_dir ) + os.sep
120
134
# iterate through file list
121
135
for file in files:
122
parts = os.path.split( file )
123
abs_file = os.path.join(
124
os.path.realpath( parts[ 0 ] ), parts[ 1 ] )
126
# check the file is in the home directory
127
if abs_file[ : len( home_dir_prefix ) ] != home_dir_prefix:
128
raise the.program.FatalError(
129
'not in home directory: %s' % abs_file )
132
rel_file = abs_file[ len( home_dir_prefix ) : ]
134
# check if file exists in home directory
135
if not os.path.lexists( abs_file ):
136
raise the.program.FatalError(
137
'not in home directory: %s' % rel_file )
139
# append the file or directory tree
140
ret.append( rel_file )
142
return sorted( set ( ret ) )
136
( rel_file, abs_file ) = Command.resolve_homedir_file( file )
138
# check that file exists in homedir
139
if not os.path.exists( abs_file ):
140
raise the.program.FatalError(
141
'not found in home directory: %s' % file )
143
# ensure parent path parts are included
146
path, dummy = os.path.split( path )
147
if len( path ): ret.add( path )
150
# append the file or directory
151
ret.update( Walker.generate_walk_list(
152
the.full_home_dir, rel_file, recurse ) )