/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-08 00:40:42 UTC
  • Revision ID: tim@ed.am-20140308004042-j5rco14bjp3teegj
updated .bzrignore

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 ):
36
 
                print("Usage: " + the.program.name + " resolve [--repo=REPO]")
37
 
                print()
 
35
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
 
36
                print
38
37
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
 
                print("Reattempt to deploy files following an update that failed due to conflicts.")
40
 
                print()
41
 
                print("After an update, no files will have been redeployed from the local repository to")
42
 
                print("your home directory if there were merge or deployment conflicts.  In a situation")
43
 
                print("such as this, you are expected to manually intervene; fixing broken merged files")
44
 
                print("by hand and moving aside files in your home directory.  After having done this,")
45
 
                print("this command can be used to reattempt the deployment and finalise the update.")
46
 
                print()
47
 
                print("You can list outstanding conflicts by typing:")
48
 
                print("    " + the.program.name + " conflicts")
49
 
                print()
50
 
                print("Options:")
51
 
                print("      --quiet      do not report changes to the home directory")
52
 
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
53
 
                print("  -v, --verbose    display information about what is being done")
54
 
                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"
55
53
                exit( 0 )
56
54
 
57
55
 
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)
94
91
                # check for conflicts in repo
95
92
                files = the.repo.vcs.get_conflicts()
96
93
                if files:
97
 
                        message += 'conflicts in %s:\n  %s' % \
 
94
                        message += 'Conflicts in %s:\n  %s' % \
98
95
                                           ( the.repo.name, '\n  '.join( files ) )
99
96
 
100
97
                # check for deployment conclicts
101
98
                conflicts = deployment.get_conflicts()
102
99
                if conflicts:
103
 
                        message += 'deployment conflicts:\n  %s' % \
 
100
                        message += 'Deployment conflicts:\n  %s' % \
104
101
                                           '\n  '.join( conflicts )
105
102
 
106
103
                # stop if there are conflicts
109
106
                                'there were conflicts...\n' + message )
110
107
 
111
108
                # copy-out changes from repo
112
 
                deployment.copy_out( self.quiet )
 
109
                deployment.copy_out()
113
110
 
114
111
                # now we've copied-out, revert any copied-in changes!
115
 
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
 
112
                if the.verbose: print "reverting %s" % the.repo.dir
116
113
                the.repo.vcs.revert()