/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:01:06 UTC
  • Revision ID: tim@ed.am-20140319200106-ou5y1nat6y2auaue
removed square brackets from AC_INIT parameter

Show diffs side-by-side

added added

removed removed

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