/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-26 19:10:31 UTC
  • Revision ID: tim@ed.am-20140226191031-elcqy5j09h2syn2j
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
bzr vcs back-end now parses affected files during update; deployment state now
includes affected files

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
#
19
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
20
 
21
21
 
22
 
import getopt
23
 
import re
24
 
import sys
25
 
 
26
 
import stdhome.the as the
27
 
from stdhome.deployment import Deployment
28
 
 
29
 
from .command import Command
30
 
 
31
 
 
32
 
class ResolveCommand( Command ):
 
22
import sys, re, getopt
 
23
import the
 
24
from deployment import Deployment
 
25
 
 
26
 
 
27
class CommandResolve:
33
28
 
34
29
 
35
30
        def __init__( self ):
36
 
                self.quiet = False
 
31
                self.repo = None
37
32
 
38
33
 
39
34
        def print_help( self ):
40
 
                print("Usage: " + the.program.name + " resolve [--repo=REPO]")
41
 
                print()
 
35
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
 
36
                print
42
37
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
43
 
                print("Reattempt to deploy files following an update that failed due to conflicts.")
44
 
                print()
45
 
                print("After an update, no files will have been redeployed from the local repository to")
46
 
                print("your home directory if there were merge or deployment conflicts.  In a situation")
47
 
                print("such as this, you are expected to manually intervene; fixing broken merged files")
48
 
                print("by hand and moving aside files in your home directory.  After having done this,")
49
 
                print("this command can be used to reattempt the deployment and finalise the update.")
50
 
                print()
51
 
                print("You can list outstanding conflicts by typing:")
52
 
                print("    " + the.program.name + " conflicts")
53
 
                print()
54
 
                print("Options:")
55
 
                print("      --quiet      do not report changes to the home directory")
56
 
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
57
 
                print("  -v, --verbose    display information about what is being done")
58
 
                print("      --help       display help and exit")
 
38
                print "Reattempt to deploy files following an update that failed due to conflicts."
 
39
                print
 
40
                print "After an update, no files will have been redeployed from the local repository to"
 
41
                print "your home directory if there were merge or deployment conflicts.  In a situation"
 
42
                print "such as this, you are expected to manually intervene; fixing broken merged files"
 
43
                print "by hand and moving aside files in your home directory.  After having done this,"
 
44
                print "this command can be used to reattempt the deployment and finalise the update."
 
45
                print
 
46
                print "You can list outstanding conflicts by typing:"
 
47
                print "    " + the.program.name + " conflicts"
 
48
                print
 
49
                print "Options:"
 
50
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
 
51
                print "  -v, --verbose    display information about what is being done"
 
52
                print "      --help       display help and exit"
59
53
                exit( 0 )
60
54
 
61
55
 
62
56
        def parse_command_line( self ):
63
57
                opts, args = getopt.gnu_getopt(
64
58
                        sys.argv[ 1: ], "r:v",
65
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
59
                        [ "repo=", "verbose", "help" ] )
66
60
                for opt, optarg in opts:
67
 
                        if opt == "--quiet":
68
 
                                self.quiet = True
69
 
                        elif opt in [ '--repo', '-r' ]:
70
 
                                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 ):
71
63
                                        raise the.program.FatalError(
72
64
                                                'invalid repository name: ' + optarg )
73
 
                                the.repo = optarg
 
65
                                self.repo = optarg
74
66
                        elif opt in [ '--verbose', '-v' ]:
75
 
                                the.verbose += 1
 
67
                                the.verbose = True
76
68
                        elif opt == "--help":
77
69
                                self.print_help()
78
 
 
 
70
                
79
71
                # discard first argument (the command)
80
72
                args.pop( 0 )
81
73
 
87
79
        def run( self ):
88
80
 
89
81
                # set up repo and check it exists
 
82
                the.set_repo( self.repo )
90
83
                the.repo.check_dir_exists()
91
84
 
92
85
                # initialise deployment (check it's valid)
98
91
                # check for conflicts in repo
99
92
                files = the.repo.vcs.get_conflicts()
100
93
                if files:
101
 
                        message += 'conflicts in %s:\n  %s\n' % \
 
94
                        message += 'Conflicts in %s:\n  %s' % \
102
95
                                           ( the.repo.name, '\n  '.join( files ) )
103
96
 
104
97
                # check for deployment conclicts
105
98
                conflicts = deployment.get_conflicts()
106
99
                if conflicts:
107
 
                        message += 'deployment conflicts:\n  %s\n' % \
 
100
                        message += 'Deployment conflicts:\n  %s' % \
108
101
                                           '\n  '.join( conflicts )
109
102
 
110
103
                # stop if there are conflicts
111
104
                if message:
112
105
                        raise the.program.FatalError(
113
 
                                'there were conflicts...\n' + message.rstrip( '\n' ) )
 
106
                                'there were conflicts...\n' + message )
114
107
 
115
108
                # copy-out changes from repo
116
 
                deployment.copy_out( self.quiet )
 
109
                deployment.copy_out()
117
110
 
118
111
                # now we've copied-out, revert any copied-in changes!
119
 
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
 
112
                if the.verbose: print "reverting %s" % the.repo.dir
120
113
                the.repo.vcs.revert()