/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/resolve.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/resolve.py
29
29
 
30
30
 
31
31
        def __init__( self ):
32
 
                self.repo = None
 
32
                self.quiet = False
33
33
 
34
34
 
35
35
        def print_help( self ):
48
48
                print "    " + the.program.name + " conflicts"
49
49
                print
50
50
                print "Options:"
 
51
                print "      --quiet      do not report changes to the home directory"
51
52
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
52
53
                print "  -v, --verbose    display information about what is being done"
53
54
                print "      --help       display help and exit"
57
58
        def parse_command_line( self ):
58
59
                opts, args = getopt.gnu_getopt(
59
60
                        sys.argv[ 1: ], "r:v",
60
 
                        [ "repo=", "verbose", "help" ] )
 
61
                        [ "quiet", "repo=", "verbose", "help" ] )
61
62
                for opt, optarg in opts:
62
 
                        if opt in [ '--repo', '-r' ]:
63
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
63
                        if opt == "--quiet":
 
64
                                self.quiet = True
 
65
                        elif opt in [ '--repo', '-r' ]:
 
66
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
64
67
                                        raise the.program.FatalError(
65
68
                                                'invalid repository name: ' + optarg )
66
 
                                self.repo = optarg
 
69
                                the.repo = optarg
67
70
                        elif opt in [ '--verbose', '-v' ]:
68
71
                                the.verbose += 1
69
72
                        elif opt == "--help":
70
73
                                self.print_help()
71
 
                
 
74
 
72
75
                # discard first argument (the command)
73
76
                args.pop( 0 )
74
77
 
80
83
        def run( self ):
81
84
 
82
85
                # set up repo and check it exists
83
 
                the.set_repo( self.repo )
84
86
                the.repo.check_dir_exists()
85
87
 
86
88
                # initialise deployment (check it's valid)
92
94
                # check for conflicts in repo
93
95
                files = the.repo.vcs.get_conflicts()
94
96
                if files:
95
 
                        message += 'Conflicts in %s:\n  %s' % \
 
97
                        message += 'conflicts in %s:\n  %s' % \
96
98
                                           ( the.repo.name, '\n  '.join( files ) )
97
99
 
98
100
                # check for deployment conclicts
99
101
                conflicts = deployment.get_conflicts()
100
102
                if conflicts:
101
 
                        message += 'Deployment conflicts:\n  %s' % \
 
103
                        message += 'deployment conflicts:\n  %s' % \
102
104
                                           '\n  '.join( conflicts )
103
105
 
104
106
                # stop if there are conflicts
107
109
                                'there were conflicts...\n' + message )
108
110
 
109
111
                # copy-out changes from repo
110
 
                deployment.copy_out()
 
112
                deployment.copy_out( self.quiet )
111
113
 
112
114
                # now we've copied-out, revert any copied-in changes!
113
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
115
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
114
116
                the.repo.vcs.revert()