3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
5
# This file is part of stdhome (hereafter referred to as "this program").
6
# See http://ed.am/dev/stdhome for more information.
8
# This program is free software: you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation, either version 3 of the License, or
11
# (at your option) any later version.
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
# GNU General Public License for more details.
18
# You should have received a copy of the GNU General Public License
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
import sys, re, getopt, os
23
from command import Command
24
import stdhome.the as the
25
from stdhome.deployment import Deployment
26
from stdhome.walker.copy_in import CopyInWalker
27
from stdhome.walker.walker import Walker
30
class AddCommand( Command ):
34
self.recursive = False
37
def print_help( self ):
38
print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
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"
57
def parse_command_line( self ):
58
opts, args = getopt.gnu_getopt(
59
sys.argv[ 1: ], "r:Rv",
60
[ "repo=", "recuirsive", "verbose", "help" ] )
61
for opt, optarg in opts:
62
if opt in [ '--repo', '-r' ]:
63
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
64
raise the.program.FatalError(
65
'invalid repository name: ' + optarg )
67
elif opt in [ '--recursive', '-R' ]:
69
elif opt in [ '--verbose', '-v' ]:
74
# discard first argument (the command)
77
# check remaining arguments
79
raise the.program.UsageError( 'too few arguments' )
87
# set up repo and check it exists
88
the.repo.check_dir_exists()
91
files = self.expand_home_files( self.files, self.recursive )
93
# initialise deployment and ensure it's not ongoing
94
deployment = Deployment()
95
deployment.check_ongoing( False )
97
# check for local changes
98
if the.repo.vcs.has_changes():
99
raise the.program.FatalError(
100
'repo has local changes: %s\n'
101
'Hint: see "%s stage-revert --help"' %
102
( the.repo.name, the.program.name ) )
105
walker = CopyInWalker( files, True )
108
# make sure all files are added to version control
109
if the.verbose >= 1: print "adding files"
110
the.repo.vcs.add( files )
113
if the.verbose >= 1: print "committing " + the.repo.dir
114
the.repo.vcs.commit()
120
def expand_home_files( files, recurse ):
121
"""Returns a unique, sorted list of relative filenames, calculated from the list
122
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
128
This is a modified version of command.expand_files().
133
home_dir_prefix = os.path.realpath( the.full_home_dir ) + os.sep
135
# iterate through file list
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 )
154
# ensure parent path parts are included
157
path, dummy = os.path.split( path )
158
if len( path ): ret.add( path )
161
# append the file or directory
162
ret.update( Walker.generate_walk_list(
163
the.full_home_dir, rel_file, recurse ) )