/stdhome

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

  • Committer: Tim Marston
  • Date: 2014-03-19 20:02:10 UTC
  • Revision ID: tim@ed.am-20140319200210-b6nm63rpktfmw0l3
changed working of output

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/init.py
23
23
from command import Command
24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
 
26
from stdhome.subprocess import Popen
26
27
 
27
28
 
28
29
class InitCommand( Command ):
29
30
 
30
31
 
 
32
        def __init__( self ):
 
33
                self.repo = None
 
34
 
 
35
 
31
36
        def print_help( self ):
32
37
                print "Usage: " + the.program.name + " init [URL] [--repo=REPO]"
33
38
                print
56
61
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
57
62
                                        raise the.program.FatalError(
58
63
                                                'invalid repository name: ' + optarg )
59
 
                                the.repo = optarg
 
64
                                self.repo = optarg
60
65
                        elif opt in [ '--verbose', '-v' ]:
61
66
                                the.verbose += 1
62
67
                        elif opt == "--help":
68
73
                # URL argument
69
74
                self.url = args[ 0 ].strip() if len( args ) else None
70
75
 
71
 
                # check remaining arguments
 
76
                # remaining arguments
72
77
                if len( args ) > 1:
73
78
                        raise the.program.UsageError( 'too many arguments' )
74
79
 
76
81
        def run( self ):
77
82
 
78
83
                # set up repo and check it *doesn't* already exists
 
84
                the.set_repo( self.repo )
79
85
                the.repo.check_dir_exists( False )
80
86
 
81
87
                # ensure our top-level directory exists
87
93
 
88
94
                        # expand url if it's a simple hostname
89
95
                        if re.match( '^[0-9a-zA-z.]+$', self.url ):
90
 
                                self.url = 'bzr+ssh://%s/%s/%s' % \
 
96
                                self.url = 'sftp://%s/%s/%s' % \
91
97
                                                   ( self.url, the.dir, the.repo.name )
92
98
 
93
99
                        # initialise deployment (with an empty repo)
95
101
                        deployment.copy_in()
96
102
 
97
103
                        # perform bzr checkout
98
 
                        if the.verbose >= 1: print "checking out %s" % the.repo.dir
 
104
                        if the.verbose: print "checking out %s" % the.repo.dir
99
105
                        try:
100
106
                                the.repo.vcs.checkout( self.url )
101
107
                        except Exception as e:
117
123
                else:
118
124
 
119
125
                        # perform bzr init
120
 
                        if the.verbose >= 1: print 'initialising %s' % the.repo.dir
 
126
                        if the.verbose: print 'initialising %s' % the.repo.dir
121
127
                        try:
122
128
                                the.repo.vcs.init()
123
129
                        except Exception as e: