/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: 2022-06-27 15:47:18 UTC
  • Revision ID: tim@ed.am-20220627154718-coj4in7pqgl3c8lr
updated Makefile for previous commit

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/resolve.py
19
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
20
 
21
21
 
22
 
import sys, re, getopt
23
 
from command import Command
 
22
import getopt
 
23
import re
 
24
import sys
 
25
 
24
26
import stdhome.the as the
25
27
from stdhome.deployment import Deployment
26
28
 
 
29
from .command import Command
 
30
 
27
31
 
28
32
class ResolveCommand( Command ):
29
33
 
30
34
 
 
35
        def __init__( self ):
 
36
                self.quiet = False
 
37
 
 
38
 
31
39
        def print_help( self ):
32
 
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
33
 
                print
 
40
                print("Usage: " + the.program.name + " resolve [--repo=REPO]")
 
41
                print()
34
42
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
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"
 
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")
50
59
                exit( 0 )
51
60
 
52
61
 
53
62
        def parse_command_line( self ):
54
63
                opts, args = getopt.gnu_getopt(
55
64
                        sys.argv[ 1: ], "r:v",
56
 
                        [ "repo=", "verbose", "help" ] )
 
65
                        [ "quiet", "repo=", "verbose", "help" ] )
57
66
                for opt, optarg in opts:
58
 
                        if opt in [ '--repo', '-r' ]:
59
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
67
                        if opt == "--quiet":
 
68
                                self.quiet = True
 
69
                        elif opt in [ '--repo', '-r' ]:
 
70
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
60
71
                                        raise the.program.FatalError(
61
72
                                                'invalid repository name: ' + optarg )
62
73
                                the.repo = optarg
 
74
                        elif opt in [ '--verbose', '-v' ]:
 
75
                                the.verbose += 1
63
76
                        elif opt == "--help":
64
77
                                self.print_help()
65
78
 
85
98
                # check for conflicts in repo
86
99
                files = the.repo.vcs.get_conflicts()
87
100
                if files:
88
 
                        message += 'conflicts in %s:\n  %s' % \
 
101
                        message += 'conflicts in %s:\n  %s\n' % \
89
102
                                           ( the.repo.name, '\n  '.join( files ) )
90
103
 
91
104
                # check for deployment conclicts
92
105
                conflicts = deployment.get_conflicts()
93
106
                if conflicts:
94
 
                        message += 'deployment conflicts:\n  %s' % \
 
107
                        message += 'deployment conflicts:\n  %s\n' % \
95
108
                                           '\n  '.join( conflicts )
96
109
 
97
110
                # stop if there are conflicts
98
111
                if message:
99
112
                        raise the.program.FatalError(
100
 
                                'there were conflicts...\n' + message )
 
113
                                'there were conflicts...\n' + message.rstrip( '\n' ) )
101
114
 
102
115
                # copy-out changes from repo
103
 
                deployment.copy_out()
 
116
                deployment.copy_out( self.quiet )
104
117
 
105
118
                # now we've copied-out, revert any copied-in changes!
106
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
119
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
107
120
                the.repo.vcs.revert()