/stdhome : revision 62

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

28

27

29

28

30

29

class AddCommand( Command ):

31

30

32

31

33

def __init__( self ):

34

self.recursive = False

35

36

37

32

def print_help( self ):

38

33

print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."

39

34

print

43

38

print "Add a named file from the local filesystem, specified relative to the home"

44

39

print "directory, to the repo, or update an existing file in the repo with your local"

45

40

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."

41

print "recursively (as is common with version control)."

48

42

print

49

43

print "Options:"

50

44

print " -r, --repo=REPO select the repo to check-out or create (defaults to 'home')"

51

print " -R, --recursive recursively add directories"

52

45

print " -v, --verbose display information about what is being done"

53

46

print " --help display help and exit"

54

47

exit( 0 )

56

49

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 )

66

59

the.repo = optarg

67

elif opt in [ '--recursive', '-R' ]:

68

self.recursive = True

69

elif opt in [ '--verbose', '-v' ]:

70

the.verbose += 1

71

60

elif opt == "--help":

72

61

self.print_help()

73

62

88

77

the.repo.check_dir_exists()

89

78

90

79

# determine files

91

files = self.expand_home_files( self.files, self.recursive )

80

files = self.expand_home_dir_files( self.files )

92

81

93

82

# initialise deployment and ensure it's not ongoing

94

83

deployment = Deployment()

102

91

( the.repo.name, the.program.name ) )

103

92

104

93

# check status

105

walker = CopyInWalker( files, True )

94

walker = CopyInWalker( files )

106

95

walker.walk()

107

96

108

97

# make sure all files are added to version control

114

103

the.repo.vcs.commit()

115

104

116

105

117

118

119

106

@staticmethod

120

def expand_home_files( files, recurse ):

107

def expand_home_dir_files( files ):

121

108

"""Returns a unique, sorted list of relative filenames, calculated from the list

122

109

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

126

in the repo).

127

128

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).

129

113

130

114

"""

131

115

151

135

raise the.program.FatalError(

152

136

'not found in home directory: %s' % rel_file )

153

137

154

# ensure parent path parts are included

138

# append path parts

155

139

path = rel_file

156

140

while True:

157

141

path, dummy = os.path.split( path )

159

143

else: break

160

144

161

145

# append the file or directory

162

ret.update( Walker.generate_walk_list(

163

the.full_home_dir, rel_file, recurse ) )

146

ret.add( rel_file )

164

147

165

148

return sorted( ret )