/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:43:15 UTC
  • Revision ID: tim@ed.am-20220627154315-jkxty19bjqpbsqk9
reverted brz->bzr

Show diffs side-by-side

added added

removed removed

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