/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: 2014-02-12 21:51:49 UTC
  • Revision ID: tim@ed.am-20140212215149-msaxl7vo98il5i4a
added more commands

Show diffs side-by-side

added added

removed removed

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