To get this branch, use:
bzr branch
http://bzr.ed.am/stdhome
« back to all changes in this revision
Viewing changes to lib/stdhome/command/add.py
- browse files at revision 99
- compare with another revision
- download diff
- download tarball
- view history from revision 99
- Committer: Tim Marston
- Date: 2022-06-27 15:47:18 UTC
- Revision ID: tim@ed.am-20220627154718-coj4in7pqgl3c8lr
updated Makefile for previous commit
- files added:
- dev
- files modified:
- configure.ac
added
removed
lib/stdhome/command/add.py
20
20
21
21
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
27
28
28
29
29
30
class AddCommand( Command ):
30
31
31
32
33
def __init__( self ):
34
self.recursive = False
35
36
32
37
def print_help( self ):
33
print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
34
print
38
print("Usage: " + the.program.name + " add [--repo=REPO] FILE...")
39
print()
35
40
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789
36
print "Add (or update) a file in the repository."
37
print
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)."
42
print
43
print "Options:"
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"
41
print("Add (or update) a file in the repository.")
42
print()
43
print("Add a named file from the local filesystem to the repo, or updates an existing")
44
print("file in the repo with your changes. Directories can also be added, but note")
45
print("that they are not added recursively (as is common with version control) unless")
46
print("this is explicitly requested.")
47
print()
48
print("Options:")
49
print(" -r, --repo=REPO select the repo to check-out or create (defaults to 'home')")
50
print(" -R, --recursive recursively add directories")
51
print(" -v, --verbose display information about what is being done")
52
print(" --help display help and exit")
47
53
exit( 0 )
48
54
49
55
50
56
def parse_command_line( self ):
51
57
opts, args = getopt.gnu_getopt(
52
sys.argv[ 1: ], "r:v",
53
[ "repo=", "verbose", "help" ] )
58
sys.argv[ 1: ], "r:Rv",
59
[ "repo=", "recuirsive", "verbose", "help" ] )
54
60
for opt, optarg in opts:
55
61
if opt in [ '--repo', '-r' ]:
56
62
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
57
63
raise the.program.FatalError(
58
64
'invalid repository name: ' + optarg )
59
65
the.repo = optarg
66
elif opt in [ '--recursive', '-R' ]:
67
self.recursive = True
68
elif opt in [ '--verbose', '-v' ]:
69
the.verbose += 1
60
70
elif opt == "--help":
61
71
self.print_help()
62
72
77
87
the.repo.check_dir_exists()
78
88
79
89
# determine files
80
files = self.expand_home_dir_files( self.files )
90
files = self.expand_home_files( self.files, self.recursive )
81
91
82
92
# initialise deployment and ensure it's not ongoing
83
93
deployment = Deployment()
91
101
( the.repo.name, the.program.name ) )
92
102
93
103
# check status
94
walker = CopyInWalker( files )
104
walker = CopyInWalker( files, True )
95
105
walker.walk()
96
106
97
107
# make sure all files are added to version control
98
if the.verbose >= 1: print "adding files"
108
if the.verbose >= 1: print("adding files")
99
109
the.repo.vcs.add( files )
100
110
101
111
# commit repo
102
if the.verbose >= 1: print "committing " + the.repo.dir
112
if the.verbose >= 1: print("committing " + the.repo.dir)
103
113
the.repo.vcs.commit()
104
114
105
115
116
106
117
@staticmethod
107
def expand_home_dir_files( files ):
118
def expand_home_files( files, recurse ):
108
119
"""Returns a unique, sorted list of relative filenames, calculated from the list
109
120
provided, which is made up from individual files and directories
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).
121
relative to the CWD. As directories are found, they may optionally be
122
recursed in to. Leading path components of any items are alse returned.
123
Specified filenames must exist in the home directory (although they do
124
not have to exist in the repo).
125
126
This is a modified version of command.expand_files().
113
127
114
128
"""
115
129
118
132
119
133
# iterate through file list
120
134
for file in files:
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
135
( rel_file, abs_file ) = Command.resolve_homedir_file( file )
136
137
# check that file exists in homedir
138
if not os.path.exists( abs_file ):
139
raise the.program.FatalError(
140
'not found in home directory: %s' % file )
141
142
# ensure parent path parts are included
139
143
path = rel_file
140
144
while True:
141
145
path, dummy = os.path.split( path )
143
147
else: break
144
148
145
149
# append the file or directory
146
ret.add( rel_file )
150
ret.update( Walker.generate_walk_list(
151
the.full_home_dir, rel_file, recurse ) )
147
152
148
153
return sorted( ret )
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0