/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-16 00:26:53 UTC
  • Revision ID: tim@ed.am-20160216002653-oa8dgponknyislg3
added home directory change reporting to CopyOutWalker; added --quiet option to
update, resolve, revert and init commands; replace use of re.match with
re.search for clarity (and fixed related bug in FileMatcher); added BzrVcs.run
command output when verbose >= 2

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
 
 
36
31
        def print_help( self ):
37
32
                print "Usage: " + the.program.name + " init [URL] [--repo=REPO]"
38
33
                print
49
44
                print "      --quiet      do not report changes to the home directory"
50
45
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
51
46
                print "  -v, --verbose    display information about what is being done"
52
 
                print "      --vcs=VCS    select the version control system"
53
47
                print "      --help       display help and exit"
54
48
                exit( 0 )
55
49
 
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
                        [ "quiet", "repo=", "verbose", "help" ] )
61
55
                for opt, optarg in opts:
62
56
                        if opt == "--quiet":
63
57
                                self.quiet = True
66
60
                                        raise the.program.FatalError(
67
61
                                                'invalid repository name: ' + optarg )
68
62
                                the.repo = optarg
69
 
                        elif opt == "--vcs":
70
 
                                self.vcs = optarg
71
 
                        elif opt in [ '--verbose', '-v' ]:
72
 
                                the.verbose += 1
73
63
                        elif opt == "--help":
74
64
                                self.print_help()
75
65
 
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 ):
99
88
 
100
89
                        # expand url if it's a simple hostname
101
90
                        if re.search( '^[0-9a-zA-z.]+$', self.url ):
102
 
                                self.url = the.repo.vcs.expand_repo_url( self.url )
 
91
                                self.url = 'bzr+ssh://%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()
109
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
 
105
                                try:
 
106
                                        shutil.rmtree( the.repo.full_dir )
 
107
                                except OSError:
 
108
                                        pass
120
109
 
121
 
                                raise
 
110
                                raise e
122
111
 
123
112
                        message = ''
124
113
 
142
131
                        if the.verbose >= 1: print 'initialising %s' % the.repo.dir
143
132
                        try:
144
133
                                the.repo.vcs.init()
145
 
                        except Exception:
 
134
                        except Exception as e:
146
135
 
147
136
                                # 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
 
137
                                try:
 
138
                                        shutil.rmtree( the.repo.full_dir )
 
139
                                except OSError:
 
140
                                        pass
153
141
 
154
 
                                raise
 
142
                                raise e