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 62
- compare with another revision
- download diff
- download tarball
- view history from revision 62
- Committer: Tim Marston
- Date: 2016-02-23 19:35:21 UTC
- Revision ID: tim@ed.am-20160223193521-2vgtxbfos50rrpku
renamed version -> VERSION
- files removed:
- dev
- files modified:
- lib/stdhome/Makefile.am
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
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
print("Usage: " + the.program.name + " add [--repo=REPO] FILE...")
39
print()
33
print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
34
print
40
35
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789
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")
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"
53
47
exit( 0 )
54
48
55
49
56
50
def parse_command_line( self ):
57
51
opts, args = getopt.gnu_getopt(
58
sys.argv[ 1: ], "r:Rv",
59
[ "repo=", "recuirsive", "verbose", "help" ] )
52
sys.argv[ 1: ], "r:v",
53
[ "repo=", "verbose", "help" ] )
60
54
for opt, optarg in opts:
61
55
if opt in [ '--repo', '-r' ]:
62
56
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
63
57
raise the.program.FatalError(
64
58
'invalid repository name: ' + optarg )
65
59
the.repo = optarg
66
elif opt in [ '--recursive', '-R' ]:
67
self.recursive = True
68
elif opt in [ '--verbose', '-v' ]:
69
the.verbose += 1
70
60
elif opt == "--help":
71
61
self.print_help()
72
62
87
77
the.repo.check_dir_exists()
88
78
89
79
# determine files
90
files = self.expand_home_files( self.files, self.recursive )
80
files = self.expand_home_dir_files( self.files )
91
81
92
82
# initialise deployment and ensure it's not ongoing
93
83
deployment = Deployment()
101
91
( the.repo.name, the.program.name ) )
102
92
103
93
# check status
104
walker = CopyInWalker( files, True )
94
walker = CopyInWalker( files )
105
95
walker.walk()
106
96
107
97
# make sure all files are added to version control
108
if the.verbose >= 1: print("adding files")
98
if the.verbose >= 1: print "adding files"
109
99
the.repo.vcs.add( files )
110
100
111
101
# commit repo
112
if the.verbose >= 1: print("committing " + the.repo.dir)
102
if the.verbose >= 1: print "committing " + the.repo.dir
113
103
the.repo.vcs.commit()
114
104
115
105
116
117
106
@staticmethod
118
def expand_home_files( files, recurse ):
107
def expand_home_dir_files( files ):
119
108
"""Returns a unique, sorted list of relative filenames, calculated from the list
120
109
provided, which is made up from individual files and directories
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().
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).
127
113
128
114
"""
129
115
132
118
133
119
# iterate through file list
134
120
for file in files:
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
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
143
139
path = rel_file
144
140
while True:
145
141
path, dummy = os.path.split( path )
147
143
else: break
148
144
149
145
# append the file or directory
150
ret.update( Walker.generate_walk_list(
151
the.full_home_dir, rel_file, recurse ) )
146
ret.add( rel_file )
152
147
153
148
return sorted( ret )
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480