/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-12-13 21:40:34 UTC
  • Revision ID: tim@ed.am-20161213214034-nd5t7ztnlrjd627i
fix add command and generic filename expansion/resolution to expend to
homedir-relative filename and absolute filename based on original filename, as
specified, rather than a fully, symlink-resolved filename.  So, e.g., if ~/bob
was a symlink to ~/fred, then ~/bob/a would resolve to the relative filename
bob/a, becuase it is inside the homedir (it would resolve to fred/a otherwise)

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/init.py
23
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
27
26
 
28
27
 
29
28
class InitCommand( Command ):
30
29
 
31
30
 
 
31
        def __init__( self ):
 
32
                self.quiet = False
 
33
                self.vcs = the.config.default_vcs
 
34
 
 
35
 
32
36
        def print_help( self ):
33
37
                print "Usage: " + the.program.name + " init [URL] [--repo=REPO]"
34
38
                print
42
46
                print "hostname, it is internally expanded to scp://HOSTNAME/~/.stdhome/REPO)."
43
47
                print
44
48
                print "Options:"
 
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
 
                        [ "repo=", "verbose", "help" ] )
 
60
                        [ "quiet", "repo=", "vcs=", "verbose", "help" ] )
55
61
                for opt, optarg in opts:
56
 
                        if opt in [ '--repo', '-r' ]:
57
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
62
                        if opt == "--quiet":
 
63
                                self.quiet = True
 
64
                        elif opt in [ '--repo', '-r' ]:
 
65
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
58
66
                                        raise the.program.FatalError(
59
67
                                                'invalid repository name: ' + optarg )
60
68
                                the.repo = optarg
 
69
                        elif opt == "--vcs":
 
70
                                self.vcs = optarg
61
71
                        elif opt in [ '--verbose', '-v' ]:
62
72
                                the.verbose += 1
63
73
                        elif opt == "--help":
64
74
                                self.print_help()
65
 
                
 
75
 
66
76
                # discard first argument (the command)
67
77
                args.pop( 0 )
68
78
 
69
79
                # URL argument
70
80
                self.url = args[ 0 ].strip() if len( args ) else None
71
81
 
72
 
                # remaining arguments
 
82
                # check remaining arguments
73
83
                if len( args ) > 1:
74
84
                        raise the.program.UsageError( 'too many arguments' )
75
85
 
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 ):
87
98
                if self.url:
88
99
 
89
100
                        # expand url if it's a simple hostname
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 )
 
101
                        if re.search( '^[0-9a-zA-z.]+$', self.url ):
 
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()
96
106
                        deployment.copy_in()
97
107
 
98
108
                        # perform bzr checkout
99
 
                        if the.verbose: print "checking out %s" % the.repo.dir
 
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
109
 
 
110
 
                                raise e
 
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 )
111
135
 
112
136
                        # perform deployment
113
 
                        try:
114
 
                                deployment.copy_out()
115
 
                        except deployment.Conflict as e:
116
 
                                raise the.program.FatalError( e.msg )
 
137
                        deployment.copy_out( self.quiet )
117
138
 
118
139
                else:
119
140
 
120
141
                        # perform bzr init
121
 
                        if the.verbose: print 'initialising %s' % the.repo.dir
 
142
                        if the.verbose >= 1: print 'initialising %s' % the.repo.dir
122
143
                        try:
123
144
                                the.repo.vcs.init()
124
 
                        except Exception as e:
 
145
                        except Exception:
125
146
 
126
147
                                # attempt to clean-up repo dir, and die
127
 
                                try:
128
 
                                        shutil.rmtree( the.repo.full_dir )
129
 
                                except OSError:
130
 
                                        pass
 
148
                                if os.path.exists( the.repo.full_dir ):
 
149
                                        try:
 
150
                                                shutil.rmtree( the.repo.full_dir )
 
151
                                        except OSError:
 
152
                                                pass
131
153
 
132
 
                                raise e
 
154
                                raise