/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-04-10 21:03:07 UTC
  • Revision ID: tim@ed.am-20160410210307-6m8527mg1syvrual
updated todo

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/resolve.py
1
 
# command_resolve.py
 
1
# resolve.py
2
2
#
3
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
4
#
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
import the
24
 
from deployment import Deployment
25
 
 
26
 
 
27
 
class CommandResolve:
 
23
from command import Command
 
24
import stdhome.the as the
 
25
from stdhome.deployment import Deployment
 
26
 
 
27
 
 
28
class ResolveCommand( Command ):
28
29
 
29
30
 
30
31
        def __init__( self ):
31
 
                self.repo = None
 
32
                self.quiet = False
32
33
 
33
34
 
34
35
        def print_help( self ):
47
48
                print "    " + the.program.name + " conflicts"
48
49
                print
49
50
                print "Options:"
 
51
                print "      --quiet      do not report changes to the home directory"
50
52
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
51
53
                print "  -v, --verbose    display information about what is being done"
52
54
                print "      --help       display help and exit"
56
58
        def parse_command_line( self ):
57
59
                opts, args = getopt.gnu_getopt(
58
60
                        sys.argv[ 1: ], "r:v",
59
 
                        [ "repo=", "verbose", "help" ] )
 
61
                        [ "quiet", "repo=", "verbose", "help" ] )
60
62
                for opt, optarg in opts:
61
 
                        if opt in [ '--repo', '-r' ]:
62
 
                                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 ):
63
67
                                        raise the.program.FatalError(
64
68
                                                'invalid repository name: ' + optarg )
65
 
                                self.repo = optarg
 
69
                                the.repo = optarg
66
70
                        elif opt in [ '--verbose', '-v' ]:
67
 
                                the.verbose = True
 
71
                                the.verbose += 1
68
72
                        elif opt == "--help":
69
73
                                self.print_help()
70
 
                
 
74
 
71
75
                # discard first argument (the command)
72
76
                args.pop( 0 )
73
77
 
79
83
        def run( self ):
80
84
 
81
85
                # set up repo and check it exists
82
 
                the.set_repo( self.repo )
83
86
                the.repo.check_dir_exists()
84
87
 
85
88
                # initialise deployment (check it's valid)
86
89
                deployment = Deployment()
87
90
                deployment.check_ongoing( True )
88
91
 
89
 
                # check for conflicts
90
92
                message = ''
91
 
                conflicts = the.repo.vcs.has_conflicts()
92
 
                if conflicts:
93
 
                        message += 'Conflicts in %s:\n  %s' % \
94
 
                                           ( the.repo.name, '\n  '.join( conflicts ) )
95
 
                conflicts = deployment.check_conflicts()
96
 
                if conflicts:
97
 
                        message += 'Deployment conflicts:\n  %s' % \
 
93
 
 
94
                # check for conflicts in repo
 
95
                files = the.repo.vcs.get_conflicts()
 
96
                if files:
 
97
                        message += 'conflicts in %s:\n  %s' % \
 
98
                                           ( the.repo.name, '\n  '.join( files ) )
 
99
 
 
100
                # check for deployment conclicts
 
101
                conflicts = deployment.get_conflicts()
 
102
                if conflicts:
 
103
                        message += 'deployment conflicts:\n  %s' % \
98
104
                                           '\n  '.join( conflicts )
 
105
 
 
106
                # stop if there are conflicts
99
107
                if message:
100
 
                        raise the.program.FatalError( 'there are conflicts:\n' + message )
 
108
                        raise the.program.FatalError(
 
109
                                'there were conflicts...\n' + message )
101
110
 
102
111
                # copy-out changes from repo
103
 
                try:
104
 
                        deployment.copy_out()
105
 
                except deployment.Conflict as e:
106
 
                        raise the.program.FatalError( e.msg )
 
112
                deployment.copy_out( self.quiet )
107
113
 
108
114
                # now we've copied-out, revert any copied-in changes!
109
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
115
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
110
116
                the.repo.vcs.revert()