/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: 2016-02-23 22:37:03 UTC
  • Revision ID: tim@ed.am-20160223223703-sx94svvstwt8xvrb
determine and instantiate repo vcs dynamically; for new repos, added default vcs
configuration option and allow override in init command arguments; re-added
handling of -v/--verbose arguments to commands and removed from program (since
there may be problems parsing all arguments here)

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/init.py
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
 
31
36
        def print_help( self ):
32
37
                print "Usage: " + the.program.name + " init [URL] [--repo=REPO]"
33
38
                print
44
49
                print "      --quiet      do not report changes to the home directory"
45
50
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
46
51
                print "  -v, --verbose    display information about what is being done"
 
52
                print "      --vcs=VCS    select the version control system"
47
53
                print "      --help       display help and exit"
48
54
                exit( 0 )
49
55
 
51
57
        def parse_command_line( self ):
52
58
                opts, args = getopt.gnu_getopt(
53
59
                        sys.argv[ 1: ], "r:v",
54
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
60
                        [ "quiet", "repo=", "vcs=", "verbose", "help" ] )
55
61
                for opt, optarg in opts:
56
62
                        if opt == "--quiet":
57
63
                                self.quiet = True
60
66
                                        raise the.program.FatalError(
61
67
                                                'invalid repository name: ' + optarg )
62
68
                                the.repo = optarg
 
69
                        elif opt == "--vcs":
 
70
                                self.vcs = optarg
 
71
                        elif opt in [ '--verbose', '-v' ]:
 
72
                                the.verbose += 1
63
73
                        elif opt == "--help":
64
74
                                self.print_help()
65
75
 
78
88
 
79
89
                # set up repo and check it *doesn't* already exists
80
90
                the.repo.check_dir_exists( False )
 
91
                the.repo.set_vcs( self.vcs )
81
92
 
82
93
                # ensure our top-level directory exists
83
94
                if not os.path.exists( the.full_dir ):
88
99
 
89
100
                        # expand url if it's a simple hostname
90
101
                        if re.search( '^[0-9a-zA-z.]+$', self.url ):
91
 
                                self.url = 'bzr+ssh://%s/%s/%s' % \
92
 
                                                   ( self.url, the.dir, the.repo.name )
 
102
                                self.url = the.repo.vcs.expand_repo_url( self.url )
93
103
 
94
104
                        # initialise deployment (with an empty repo)
95
105
                        deployment = Deployment()
99
109
                        if the.verbose >= 1: print "checking out %s" % the.repo.dir
100
110
                        try:
101
111
                                the.repo.vcs.checkout( self.url )
102
 
                        except Exception as e:
 
112
                        except Exception:
103
113
 
104
114
                                # attempt to clean-up repo dir
105
 
                                try:
106
 
                                        shutil.rmtree( the.repo.full_dir )
107
 
                                except OSError:
108
 
                                        pass
 
115
                                if os.path.exists( the.repo.full_dir ):
 
116
                                        try:
 
117
                                                shutil.rmtree( the.repo.full_dir )
 
118
                                        except OSError:
 
119
                                                pass
109
120
 
110
 
                                raise e
 
121
                                raise
111
122
 
112
123
                        message = ''
113
124
 
131
142
                        if the.verbose >= 1: print 'initialising %s' % the.repo.dir
132
143
                        try:
133
144
                                the.repo.vcs.init()
134
 
                        except Exception as e:
 
145
                        except Exception:
135
146
 
136
147
                                # attempt to clean-up repo dir, and die
137
 
                                try:
138
 
                                        shutil.rmtree( the.repo.full_dir )
139
 
                                except OSError:
140
 
                                        pass
 
148
                                if os.path.exists( the.repo.full_dir ):
 
149
                                        try:
 
150
                                                shutil.rmtree( the.repo.full_dir )
 
151
                                        except OSError:
 
152
                                                pass
141
153
 
142
 
                                raise e
 
154
                                raise