/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

106

@staticmethod

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

126

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

128

113

129

114

"""

130

115

133

118

134

119

# iterate through file list

135

120

for file in files:

136

( rel_file, abs_file ) = Command.resolve_homedir_file( file )

137

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 )

142

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

124

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 )

129

130

# relative file

131

rel_file = abs_file[ len( home_dir_prefix ) : ]

132

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 )

137

138

# append path parts

144

139

path = rel_file

145

140

while True:

146

141

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

148

143

else: break

149

144

150

145

# append the file or directory

151

ret.update( Walker.generate_walk_list(

152

the.full_home_dir, rel_file, recurse ) )

146

ret.add( rel_file )

153

147

154

148

return sorted( ret )