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
37
37
def print_help( self ):
38
print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
38
print("Usage: " + the.program.name + " add [--repo=REPO] FILE...")
40
40
# 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"
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")
108
108
# make sure all files are added to version control
109
if the.verbose >= 1: print "adding files"
109
if the.verbose >= 1: print("adding files")
110
110
the.repo.vcs.add( files )
113
if the.verbose >= 1: print "committing " + the.repo.dir
113
if the.verbose >= 1: print("committing " + the.repo.dir)
114
114
the.repo.vcs.commit()
120
119
def expand_home_files( files, recurse ):
121
120
"""Returns a unique, sorted list of relative filenames, calculated from the list
122
121
provided, which is made up from individual files and directories
123
relative to the CWD. Directories are recursed in to as requried, and
124
leading path components of any items are alse returned. Specified
125
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).
128
127
This is a modified version of command.expand_files().
135
134
# iterate through file list
136
135
for file in files:
137
parts = os.path.split( file )
138
abs_file = os.path.join(
139
os.path.realpath( parts[ 0 ] ), parts[ 1 ] )
141
# check the file is in the home directory
142
if abs_file[ : len( home_dir_prefix ) ] != home_dir_prefix:
143
raise the.program.FatalError(
144
'not under home directory: %s' % abs_file )
147
rel_file = abs_file[ len( home_dir_prefix ) : ]
149
# check if file exists in home directory
150
if not os.path.lexists( abs_file ):
151
raise the.program.FatalError(
152
'not found in home directory: %s' % rel_file )
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 )
154
143
# ensure parent path parts are included
added
removed
lib/stdhome/command/add.py
