/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-03-19 20:03:32 UTC
  • Revision ID: tim@ed.am-20140319200332-6jpt67qon2ugmg2n
changed wording of status command output

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 ):
64
65
                                                'invalid repository name: ' + optarg )
65
66
                                self.repo = optarg
66
67
                        elif opt in [ '--verbose', '-v' ]:
67
 
                                the.verbose = True
 
68
                                the.verbose += 1
68
69
                        elif opt == "--help":
69
70
                                self.print_help()
70
71
                
86
87
                deployment = Deployment()
87
88
                deployment.check_ongoing( True )
88
89
 
89
 
                # check for conflicts
90
90
                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' % \
 
91
 
 
92
                # check for conflicts in repo
 
93
                files = the.repo.vcs.get_conflicts()
 
94
                if files:
 
95
                        message += 'conflicts in %s:\n  %s' % \
 
96
                                           ( the.repo.name, '\n  '.join( files ) )
 
97
 
 
98
                # check for deployment conclicts
 
99
                conflicts = deployment.get_conflicts()
 
100
                if conflicts:
 
101
                        message += 'deployment conflicts:\n  %s' % \
98
102
                                           '\n  '.join( conflicts )
 
103
 
 
104
                # stop if there are conflicts
99
105
                if message:
100
 
                        raise the.program.FatalError( 'there are conflicts:\n' + message )
 
106
                        raise the.program.FatalError(
 
107
                                'there were conflicts...\n' + message )
101
108
 
102
109
                # copy-out changes from repo
103
 
                try:
104
 
                        deployment.copy_out()
105
 
                except deployment.Conflict as e:
106
 
                        raise the.program.FatalError( e.msg )
 
110
                deployment.copy_out()
107
111
 
108
112
                # now we've copied-out, revert any copied-in changes!
109
113
                if the.verbose: print "reverting %s" % the.repo.dir