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, specified relative to the home")
44
print("directory, to the repo, or update an existing file in the repo with your local")
45
print("changes. Directories can also be added, but note that they are not added")
46
print("recursively (as is common with version control) unless this is specifically")
47
print("requested on the commandline.")
50
print(" -r, --repo=REPO select the repo to check-out or create (defaults to 'home')")
51
print(" -R, --recursive recursively add directories")
52
print(" -v, --verbose display information about what is being done")
53
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"
57
50
def parse_command_line( self ):
58
51
opts, args = getopt.gnu_getopt(
59
sys.argv[ 1: ], "r:Rv",
60
[ "repo=", "recuirsive", "verbose", "help" ] )
52
sys.argv[ 1: ], "r:v",
53
[ "repo=", "verbose", "help" ] )
61
54
for opt, optarg in opts:
62
55
if opt in [ '--repo', '-r' ]:
63
56
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
64
57
raise the.program.FatalError(
65
58
'invalid repository name: ' + optarg )
67
elif opt in [ '--recursive', '-R' ]:
69
elif opt in [ '--verbose', '-v' ]:
71
60
elif opt == "--help":
102
91
( the.repo.name, the.program.name ) )
105
walker = CopyInWalker( files, True )
94
walker = CopyInWalker( files )
108
97
# make sure all files are added to version control
109
if the.verbose >= 1: print("adding files")
98
if the.verbose >= 1: print "adding files"
110
99
the.repo.vcs.add( files )
113
if the.verbose >= 1: print("committing " + the.repo.dir)
102
if the.verbose >= 1: print "committing " + the.repo.dir
114
103
the.repo.vcs.commit()
119
def expand_home_files( files, recurse ):
107
def expand_home_dir_files( files ):
120
108
"""Returns a unique, sorted list of relative filenames, calculated from the list
121
109
provided, which is made up from individual files and directories
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().
110
relative to the CWD. Directories and are not recursed in to, but
111
leading path components are also returned. Specified filenames must
112
exist in the home directory (although they may not exist in the repo).
134
119
# iterate through file list
135
120
for file in files:
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
121
parts = os.path.split( file )
122
abs_file = os.path.join(
123
os.path.realpath( parts[ 0 ] ), parts[ 1 ] )
125
# check the file is in the home directory
126
if abs_file[ : len( home_dir_prefix ) ] != home_dir_prefix:
127
raise the.program.FatalError(
128
'not under home directory: %s' % abs_file )
131
rel_file = abs_file[ len( home_dir_prefix ) : ]
133
# check if file exists in home directory
134
if not os.path.lexists( abs_file ):
135
raise the.program.FatalError(
136
'not found in home directory: %s' % rel_file )
146
141
path, dummy = os.path.split( path )