/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: 2021-07-05 21:01:29 UTC
  • Revision ID: tim@ed.am-20210705210129-gc746mez1vhzobz7
add stage-status command; add common stage notice to helps

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