/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-04-18 15:00:34 UTC
  • Revision ID: tim@ed.am-20140418150034-l94wfs6ururhi9t5
fixed error in walker.py (from last checkin)

Show diffs side-by-side

added added

removed removed

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