22
22
import sys, re, getopt, os
23
from .command import Command
23
from command import Command
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
30
29
class AddCommand( Command ):
34
self.recursive = False
37
32
def print_help( self ):
38
print("Usage: " + the.program.name + " add [--repo=REPO] FILE...")
33
print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
40
35
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789
41
print("Add (or update) a file in the repository.")
43
print("Add a named file from the local filesystem to the repo, or updates an existing")
44
print("file in the repo with your changes. Directories can also be added, but note")
45
print("that they are not added recursively (as is common with version control) unless")
46
print("this is explicitly requested.")
49
print(" -r, --repo=REPO select the repo to check-out or create (defaults to 'home')")
50
print(" -R, --recursive recursively add directories")
51
print(" -v, --verbose display information about what is being done")
52
print(" --help display help and exit")
36
print "Add (or update) a file in the repository."
38
print "Add a named file from the local filesystem, specified relative to the home"
39
print "directory, to the repo, or update an existing file in the repo with your local"
40
print "changes. Directories can also be added, but note that they are not added"
41
print "recursively (as is common with version control)."
44
print " -r, --repo=REPO select the repo to check-out or create (defaults to 'home')"
45
print " -v, --verbose display information about what is being done"
46
print " --help display help and exit"
56
50
def parse_command_line( self ):
57
51
opts, args = getopt.gnu_getopt(
58
sys.argv[ 1: ], "r:Rv",
59
[ "repo=", "recuirsive", "verbose", "help" ] )
52
sys.argv[ 1: ], "r:v",
53
[ "repo=", "verbose", "help" ] )
60
54
for opt, optarg in opts:
61
55
if opt in [ '--repo', '-r' ]:
62
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
56
if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
63
57
raise the.program.FatalError(
64
58
'invalid repository name: ' + optarg )
66
elif opt in [ '--recursive', '-R' ]:
68
60
elif opt in [ '--verbose', '-v' ]:
70
62
elif opt == "--help":
73
65
# discard first argument (the command)
97
89
if the.repo.vcs.has_changes():
98
90
raise the.program.FatalError(
99
91
'repo has local changes: %s\n'
100
'Hint: see "%s stage-revert --help"' %
92
'Hint: see "%s stage-revert --help"' %
101
93
( the.repo.name, the.program.name ) )
104
walker = CopyInWalker( files, True )
96
walker = CopyInWalker( files )
107
99
# make sure all files are added to version control
108
if the.verbose >= 1: print("adding files")
100
if the.verbose >= 1: print "adding files"
109
101
the.repo.vcs.add( files )
112
if the.verbose >= 1: print("committing " + the.repo.dir)
104
if the.verbose >= 1: print "committing " + the.repo.dir
113
105
the.repo.vcs.commit()
118
def expand_home_files( files, recurse ):
109
def expand_home_dir_files( files ):
119
110
"""Returns a unique, sorted list of relative filenames, calculated from the list
120
111
provided, which is made up from individual files and directories
121
relative to the CWD. As directories are found, they may optionally be
122
recursed in to. Leading path components of any items are alse returned.
123
Specified filenames must exist in the home directory (although they do
124
not have to exist in the repo).
126
This is a modified version of command.expand_files().
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
131
118
home_dir_prefix = os.path.realpath( the.full_home_dir ) + os.sep
133
120
# iterate through file list
134
121
for file in files:
135
( rel_file, abs_file ) = Command.resolve_homedir_file( file )
137
# check that file exists in homedir
138
if not os.path.exists( abs_file ):
139
raise the.program.FatalError(
140
'not found in home directory: %s' % file )
142
# ensure parent path parts are included
145
path, dummy = os.path.split( path )
146
if len( path ): ret.add( path )
149
# append the file or directory
150
ret.update( Walker.generate_walk_list(
151
the.full_home_dir, rel_file, recurse ) )
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 ) )