/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-07-17 18:17:18 UTC
  • Revision ID: tim@ed.am-20140717181718-gxi5lpi8qszsigxf
switch to using bzr+ssh, rather than sftp (to work around broken pimiko)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/init.py
20
20
 
21
21
 
22
22
import sys, os, re, getopt, shutil, subprocess
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
 
28
28
class InitCommand( Command ):
29
29
 
30
30
 
31
 
        def __init__( self ):
32
 
                self.quiet = False
33
 
                self.vcs = the.config.default_vcs
34
 
 
35
 
 
36
31
        def print_help( self ):
37
 
                print("Usage: " + the.program.name + " init [URL] [--repo=REPO]")
38
 
                print()
 
32
                print "Usage: " + the.program.name + " init [URL] [--repo=REPO]"
 
33
                print
39
34
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
40
 
                print("Initialise a local repository.")
41
 
                print()
42
 
                print("If an URL is given, the local reposity is a checkout of it (i.e., you can")
43
 
                print("receive updates from it and changes you commit will be sent to it).  The URL")
44
 
                print("can take the form of a simple hostname, such as \"example.com\", or it can be a")
45
 
                print("fully-qualified bazaar URL.  (Actually, in the first case, where it is a simple")
46
 
                print("hostname, it is internally expanded to scp://HOSTNAME/~/.stdhome/REPO).")
47
 
                print()
48
 
                print("Options:")
49
 
                print("      --quiet      do not report changes to the home directory")
50
 
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
51
 
                print("  -v, --verbose    display information about what is being done")
52
 
                print("      --vcs=VCS    select the version control system")
53
 
                print("      --help       display help and exit")
 
35
                print "Initialise a local repository."
 
36
                print
 
37
                print "If an URL is given, the local reposity is a checkout of it (i.e., you can"
 
38
                print "receive updates from it and changes you commit will be sent to it).  The URL"
 
39
                print "can take the form of a simple hostname, such as \"example.com\", or it can be a"
 
40
                print "fully-qualified bazaar URL.  (Actually, in the first case, where it is a simple"
 
41
                print "hostname, it is internally expanded to scp://HOSTNAME/~/.stdhome/REPO)."
 
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"
54
47
                exit( 0 )
55
48
 
56
49
 
57
50
        def parse_command_line( self ):
58
51
                opts, args = getopt.gnu_getopt(
59
52
                        sys.argv[ 1: ], "r:v",
60
 
                        [ "quiet", "repo=", "vcs=", "verbose", "help" ] )
 
53
                        [ "repo=", "verbose", "help" ] )
61
54
                for opt, optarg in opts:
62
 
                        if opt == "--quiet":
63
 
                                self.quiet = True
64
 
                        elif opt in [ '--repo', '-r' ]:
65
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
55
                        if opt in [ '--repo', '-r' ]:
 
56
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
66
57
                                        raise the.program.FatalError(
67
58
                                                'invalid repository name: ' + optarg )
68
59
                                the.repo = optarg
69
 
                        elif opt == "--vcs":
70
 
                                self.vcs = optarg
71
60
                        elif opt in [ '--verbose', '-v' ]:
72
61
                                the.verbose += 1
73
62
                        elif opt == "--help":
74
63
                                self.print_help()
75
 
 
 
64
                
76
65
                # discard first argument (the command)
77
66
                args.pop( 0 )
78
67
 
88
77
 
89
78
                # set up repo and check it *doesn't* already exists
90
79
                the.repo.check_dir_exists( False )
91
 
                the.repo.set_vcs( self.vcs )
92
80
 
93
81
                # ensure our top-level directory exists
94
82
                if not os.path.exists( the.full_dir ):
98
86
                if self.url:
99
87
 
100
88
                        # expand url if it's a simple hostname
101
 
                        if re.search( '^[0-9a-zA-z.]+$', self.url ):
102
 
                                self.url = the.repo.vcs.expand_repo_url( self.url )
 
89
                        if re.match( '^[0-9a-zA-z.]+$', self.url ):
 
90
                                self.url = 'bzr+ssh://%s/%s/%s' % \
 
91
                                                   ( self.url, the.dir, the.repo.name )
103
92
 
104
93
                        # initialise deployment (with an empty repo)
105
94
                        deployment = Deployment()
106
95
                        deployment.copy_in()
107
96
 
108
97
                        # perform bzr checkout
109
 
                        if the.verbose >= 1: print("checking out %s" % the.repo.dir)
 
98
                        if the.verbose >= 1: print "checking out %s" % the.repo.dir
110
99
                        try:
111
100
                                the.repo.vcs.checkout( self.url )
112
 
                        except Exception:
 
101
                        except Exception as e:
113
102
 
114
103
                                # attempt to clean-up repo dir
115
 
                                if os.path.exists( the.repo.full_dir ):
116
 
                                        try:
117
 
                                                shutil.rmtree( the.repo.full_dir )
118
 
                                        except OSError:
119
 
                                                pass
120
 
 
121
 
                                raise
122
 
 
123
 
                        message = ''
124
 
 
125
 
                        # check for deployment conclicts
126
 
                        conflicts = deployment.get_conflicts()
127
 
                        if conflicts:
128
 
                                message += 'deployment conflicts:\n  %s' % \
129
 
                                                   '\n  '.join( conflicts )
130
 
 
131
 
                        # stop if there are conflicts
132
 
                        if message:
133
 
                                raise the.program.FatalError(
134
 
                                        'there were conflicts...\n' + message )
 
104
                                try:
 
105
                                        shutil.rmtree( the.repo.full_dir )
 
106
                                except OSError:
 
107
                                        pass
 
108
 
 
109
                                raise e
135
110
 
136
111
                        # perform deployment
137
 
                        deployment.copy_out( self.quiet )
 
112
                        try:
 
113
                                deployment.copy_out()
 
114
                        except deployment.Conflict as e:
 
115
                                raise the.program.FatalError( e.msg )
138
116
 
139
117
                else:
140
118
 
141
119
                        # perform bzr init
142
 
                        if the.verbose >= 1: print('initialising %s' % the.repo.dir)
 
120
                        if the.verbose >= 1: print 'initialising %s' % the.repo.dir
143
121
                        try:
144
122
                                the.repo.vcs.init()
145
 
                        except Exception:
 
123
                        except Exception as e:
146
124
 
147
125
                                # attempt to clean-up repo dir, and die
148
 
                                if os.path.exists( the.repo.full_dir ):
149
 
                                        try:
150
 
                                                shutil.rmtree( the.repo.full_dir )
151
 
                                        except OSError:
152
 
                                                pass
 
126
                                try:
 
127
                                        shutil.rmtree( the.repo.full_dir )
 
128
                                except OSError:
 
129
                                        pass
153
130
 
154
 
                                raise
 
131
                                raise e