/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 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/init.py
1
 
# command_init.py
 
1
# init.py
2
2
#
3
3
# Copyright (C) 2013 Tim Marston <tim@edm.am>
4
4
#
20
20
 
21
21
 
22
22
import sys, os, re, getopt, shutil, subprocess
23
 
import the, deployment
24
 
from subprocess import Popen
25
 
 
26
 
 
27
 
class CommandInit:
28
 
 
29
 
 
30
 
        def __init__( self ):
31
 
                self.repo = None
 
23
from command import Command
 
24
import stdhome.the as the
 
25
from stdhome.deployment import Deployment
 
26
from stdhome.subprocess import Popen
 
27
 
 
28
 
 
29
class InitCommand( Command ):
32
30
 
33
31
 
34
32
        def print_help( self ):
45
43
                print
46
44
                print "Options:"
47
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"
48
47
                print "      --help       display help and exit"
49
48
                exit( 0 )
50
49
 
54
53
                        sys.argv[ 1: ], "r:v",
55
54
                        [ "repo=", "verbose", "help" ] )
56
55
                for opt, optarg in opts:
57
 
                        if [ '--repo', '-r' ].count( opt ):
 
56
                        if opt in [ '--repo', '-r' ]:
58
57
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
59
 
                                        raise the.FatalError(
 
58
                                        raise the.program.FatalError(
60
59
                                                'invalid repository name: ' + optarg )
61
 
                                self.repo = optarg
62
 
                        elif [ '--verbose', '-v' ].count( opt ):
63
 
                                the.verbose = True
 
60
                                the.repo = optarg
 
61
                        elif opt in [ '--verbose', '-v' ]:
 
62
                                the.verbose += 1
64
63
                        elif opt == "--help":
65
64
                                self.print_help()
66
65
                
70
69
                # URL argument
71
70
                self.url = args[ 0 ].strip() if len( args ) else None
72
71
 
73
 
                # remaining arguments
 
72
                # check remaining arguments
74
73
                if len( args ) > 1:
75
74
                        raise the.program.UsageError( 'too many arguments' )
76
75
 
77
76
 
78
77
        def run( self ):
79
 
                the.set_repo( self.repo )
80
78
 
81
 
                # repo dir must not already exist
 
79
                # set up repo and check it *doesn't* already exists
82
80
                the.repo.check_dir_exists( False )
83
81
 
84
82
                # ensure our top-level directory exists
85
 
                if not os.path.exists( the.expanded_dir ):
86
 
                        os.mkdir( the.expanded_dir )
 
83
                if not os.path.exists( the.full_dir ):
 
84
                        os.mkdir( the.full_dir )
87
85
 
 
86
                # checkout a remote repo, or create an empty local one?
88
87
                if self.url:
89
88
 
90
89
                        # expand url if it's a simple hostname
93
92
                                                   ( self.url, the.dir, the.repo.name )
94
93
 
95
94
                        # initialise deployment (with an empty repo)
96
 
                        deployment = Deployment( self.repo )
 
95
                        deployment = Deployment()
97
96
                        deployment.copy_in()
98
97
 
99
98
                        # perform bzr checkout
100
 
                        print "checking out %s" % the.repo.dir
101
 
                        p = Popen( [ 'bzr', 'co', self.url, the.repo.name ],
102
 
                                           cwd = the.expanded_dir,
103
 
                                           stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
104
 
                        out = p.communicate()[ 0 ]
105
 
                        if p.returncode > 0:
 
99
                        if the.verbose >= 1: print "checking out %s" % the.repo.dir
 
100
                        try:
 
101
                                the.repo.vcs.checkout( self.url )
 
102
                        except Exception as e:
106
103
 
107
 
                                # attempt to clean-up repo dir, and die
 
104
                                # attempt to clean-up repo dir
108
105
                                try:
109
 
                                        shutil.rmtree( the.repo.expanded_dir )
110
 
                                except OSError as e:
 
106
                                        shutil.rmtree( the.repo.full_dir )
 
107
                                except OSError:
111
108
                                        pass
112
 
                                raise the.program.FatalError( 'checkout failed', out )
 
109
 
 
110
                                raise e
113
111
 
114
112
                        # perform deployment
115
 
                        deployment.copy_out()
 
113
                        try:
 
114
                                deployment.copy_out()
 
115
                        except deployment.Conflict as e:
 
116
                                raise the.program.FatalError( e.msg )
116
117
 
117
118
                else:
118
119
 
119
120
                        # perform bzr init
120
 
                        print 'creating %s' % the.repo.dir
121
 
                        p = Popen( [ 'bzr', 'init', the.repo.name ],
122
 
                                           cwd = the.expanded_dir,
123
 
                                           stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
124
 
                        out = p.communicate()[ 0 ]
125
 
                        if p.returncode > 0:
 
121
                        if the.verbose >= 1: print 'initialising %s' % the.repo.dir
 
122
                        try:
 
123
                                the.repo.vcs.init()
 
124
                        except Exception as e:
126
125
 
127
126
                                # attempt to clean-up repo dir, and die
128
127
                                try:
129
 
                                        shutil.rmtree( the.repo.expanded_dir )
130
 
                                except OSError as e:
 
128
                                        shutil.rmtree( the.repo.full_dir )
 
129
                                except OSError:
131
130
                                        pass
132
 
                                raise the.program.FatalError( 'init failed', out )
 
131
 
 
132
                                raise e