/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-04-04 22:33:09 UTC
  • Revision ID: tim@ed.am-20140404223309-macifjzkiryg982n
read ~/.stdhomerc; commands set repo before run(); program performs late
initialisation of some variables; updated help

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
28
28
class ResolveCommand( Command ):
29
29
 
30
30
 
31
 
        def __init__( self ):
32
 
                self.quiet = False
33
 
 
34
 
 
35
31
        def print_help( self ):
36
 
                print("Usage: " + the.program.name + " resolve [--repo=REPO]")
37
 
                print()
 
32
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
 
33
                print
38
34
                #      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")
 
35
                print "Reattempt to deploy files following an update that failed due to conflicts."
 
36
                print
 
37
                print "After an update, no files will have been redeployed from the local repository to"
 
38
                print "your home directory if there were merge or deployment conflicts.  In a situation"
 
39
                print "such as this, you are expected to manually intervene; fixing broken merged files"
 
40
                print "by hand and moving aside files in your home directory.  After having done this,"
 
41
                print "this command can be used to reattempt the deployment and finalise the update."
 
42
                print
 
43
                print "You can list outstanding conflicts by typing:"
 
44
                print "    " + the.program.name + " conflicts"
 
45
                print
 
46
                print "Options:"
 
47
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
 
48
                print "  -v, --verbose    display information about what is being done"
 
49
                print "      --help       display help and exit"
55
50
                exit( 0 )
56
51
 
57
52
 
58
53
        def parse_command_line( self ):
59
54
                opts, args = getopt.gnu_getopt(
60
55
                        sys.argv[ 1: ], "r:v",
61
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
56
                        [ "repo=", "verbose", "help" ] )
62
57
                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 ):
 
58
                        if opt in [ '--repo', '-r' ]:
 
59
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
67
60
                                        raise the.program.FatalError(
68
61
                                                'invalid repository name: ' + optarg )
69
62
                                the.repo = optarg
71
64
                                the.verbose += 1
72
65
                        elif opt == "--help":
73
66
                                self.print_help()
74
 
 
 
67
                
75
68
                # discard first argument (the command)
76
69
                args.pop( 0 )
77
70
 
109
102
                                'there were conflicts...\n' + message )
110
103
 
111
104
                # copy-out changes from repo
112
 
                deployment.copy_out( self.quiet )
 
105
                deployment.copy_out()
113
106
 
114
107
                # now we've copied-out, revert any copied-in changes!
115
 
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
 
108
                if the.verbose: print "reverting %s" % the.repo.dir
116
109
                the.repo.vcs.revert()