/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:04:21 UTC
  • Revision ID: tim@ed.am-20210705210421-75rb9swyku2397lb
added stage-status to main help

Show diffs side-by-side

added added

removed removed

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