/stdhome : revision 37

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/update.py

Committer: Tim Marston
Date: 2014-04-18 14:42:00 UTC
Revision ID: tim@ed.am-20140418144200-ksbr3l58p2v3jhy2

fixed bugs in command.expand_files, where results could be not unique, nor
sorted, and make sure the last component of the files is not resolved if it is a
symlink

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py

raise the.program.FatalError(

'invalid repository name: ' + optarg )

the.repo = optarg

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

the.verbose += 1

elif opt == "--help":

self.print_help()

# discard first argument (the command)

args.pop( 0 )

if the.repo.vcs.has_changes():

raise the.program.FatalError(

'repo has local changes: %s\n'

'Hint: see "%s stage-revert --help"' %

100

'Hint: see "%s stage-revert --help"' %

101

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

100

102

101

103

# copy-in changes to repo

102

deployment.copy_in()

104

try:

105

deployment.copy_in()

106

except deployment.CopyInConflicts as e:

107

raise the.program.FatalError(

108

'Files in %s differ too severly from %s:\n %s\n' % \

109

( the.home_dir, the.repo.dir, '\n '.join( e.conflicts ) ) )

103

110

104

111

# perform vcs update

105

112

if the.verbose >= 1: print "updating %s" % the.repo.dir