To get this branch, use:
bzr branch
http://bzr.ed.am/stdhome
« back to all changes in this revision
Viewing changes to lib/stdhome/program.py
- browse files at revision 57
- compare with another revision
- download diff
- download tarball
- view history from revision 57
- Committer: Tim Marston
- Date: 2016-02-13 13:25:21 UTC
- Revision ID: tim@ed.am-20160213132521-46v5774k6ql7tdfn
fixed uninitialised variable
- files added:
- lib/stdhome/command/add.py
- files modified:
- configure.ac
added
removed
lib/stdhome/program.py
21
21
22
22
import os, sys, getopt
23
23
import the
24
from config import Config
24
25
from vcs.vcs import Vcs
25
26
26
27
62
63
print " update update files in your home directory"
63
64
print " resolve try to finish an update (that had conflicts)"
64
65
print " add add local files/changes to the repository"
65
print " remove remove a local file from the repository"
66
# print " remove remove a local file from the repository"
66
67
print " status list files that have changed locally"
67
68
print " diff shows changes made to local files"
68
print " revert undo changes made to a local file"
69
print " stage-add stage local files/changes"
70
print " stage-remove stage the removal of files"
71
print " stage-revert revert staged changes"
72
print " stage-status show status of staging area"
73
print " stage-diff shows staged changes"
74
print " stage-commit commit staged changes to repository"
69
print " revert undo changes made to local files"
70
# print " stage-add add (but don't commit) files/changes to local repository"
71
# print " stage-remove delete *but don't comit) files from the local repository"
72
print " stage-revert revert changes in the local repository"
73
# print " stage-status show status of local repository"
74
# print " stage-diff shows changes in local repository"
75
# print " stage-commit commit changes in the local repository"
75
76
print
76
77
print "For help about a particular command (including the additional options that the"
77
78
print "command accepts) try typing:"
97
98
98
99
99
100
def check_command( self, command ):
100
"""
101
Check that the given command is valid and return the full name of the command.
102
103
Arguments:
104
- `command`: the given command
105
"""
101
"""Check that the given command is valid and return the full name of the
102
command.
103
104
@param command the given command
105
"""
106
106
107
# commands
107
108
if [ 'init', 'update', 'resolve', 'add', 'remove', 'revert', 'status',
108
109
'diff', 'stage-add', 'stage-remove', 'stage-revert',
124
125
125
126
126
127
def get_command_argument( self, args ):
128
"""Find the first program argument what isn't an option argument.
129
130
@param args the program arguments
127
131
"""
128
Find the first program argument what isn't an option argument.
129
132
130
Arguments:
131
- `args`: the program arguments
132
"""
133
133
while args:
134
134
if args[ 0 ] == '--':
135
135
return args[ 1 ] if len( args ) > 1 else None
141
141
142
142
def run( self ):
143
143
# make an initial attempt to parse the command line, looking only for
144
# --help and --version, so that they have the chance to run without a
145
# command being specified
144
# --help, --version and --verbose, so that they have the chance to run
145
# without a command being specified
146
146
try:
147
147
opts, args = getopt.gnu_getopt(
148
sys.argv[ 1: ], "",
149
[ "help", "version" ] )
148
sys.argv[ 1: ], "v",
149
[ "verbose", "help", "version" ] )
150
150
151
151
for opt, optarg in opts:
152
152
# we only show help if there are no non-option arguments (e.g.,
153
153
# a command) specified. If a command has been specified it will
154
154
# have to be parsed and --help will be handled by it, instead)
155
if opt == "--help" and len( args ) == 0:
155
if opt in [ '--verbose', '-v' ]:
156
the.verbose += 1
157
elif opt == "--help" and len( args ) == 0:
156
158
self.print_help()
157
159
elif opt == "--version":
158
160
self.print_version()
161
163
# ignore errors -- we aren't parsing the command line properly yet
162
164
pass
163
165
164
# find the first non-option argument (the command)
166
# read program configuration
167
the.config = Config()
168
169
# find the command by grabbing the first program argument that doesn't
170
# look like an option (note: the first argument that doesn't look like
171
# an option may actually be an argument to an option, so this is far
172
# from perfect, but, provided the user is mindful, this is preferable to
173
# forcing the user to always specify options after the command)
165
174
the.command = self.get_command_argument( sys.argv[ 1: ] )
166
175
if the.command == None:
167
176
self.print_usage( "missing command" )
185
194
fromlist = [ class_name ] )
186
195
instance = getattr( module, class_name )()
187
196
188
# run the command
197
# fully parse the command line, as per the command
189
198
try:
190
199
instance.parse_command_line()
191
instance.run()
192
200
except( getopt.GetoptError, self.UsageError ) as e:
193
201
self.print_usage( e.msg )
202
except self.FatalError as e:
203
self.die( e.msg )
204
205
# do late initialisation
206
the.late_init()
207
208
# run the command
209
try:
210
instance.run()
194
211
except Vcs.VcsError as e:
195
212
message = e.msg.rstrip()
196
if the.verbose:
213
if the.verbose >= 1:
197
214
message += '\n\nOUTPUT:\n' + e.output.rstrip()
198
215
self.die( message )
199
216
except self.FatalError as e:
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480