/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
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
 
33
37
 
34
38
 
35
39
        def print_help( self ):
36
 
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
37
 
                print
 
40
                print("Usage: " + the.program.name + " resolve [--repo=REPO]")
 
41
                print()
38
42
                #      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"
 
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")
55
59
                exit( 0 )
56
60
 
57
61
 
94
98
                # check for conflicts in repo
95
99
                files = the.repo.vcs.get_conflicts()
96
100
                if files:
97
 
                        message += 'conflicts in %s:\n  %s' % \
 
101
                        message += 'conflicts in %s:\n  %s\n' % \
98
102
                                           ( the.repo.name, '\n  '.join( files ) )
99
103
 
100
104
                # check for deployment conclicts
101
105
                conflicts = deployment.get_conflicts()
102
106
                if conflicts:
103
 
                        message += 'deployment conflicts:\n  %s' % \
 
107
                        message += 'deployment conflicts:\n  %s\n' % \
104
108
                                           '\n  '.join( conflicts )
105
109
 
106
110
                # stop if there are conflicts
107
111
                if message:
108
112
                        raise the.program.FatalError(
109
 
                                'there were conflicts...\n' + message )
 
113
                                'there were conflicts...\n' + message.rstrip( '\n' ) )
110
114
 
111
115
                # copy-out changes from repo
112
116
                deployment.copy_out( self.quiet )
113
117
 
114
118
                # now we've copied-out, revert any copied-in changes!
115
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
119
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
116
120
                the.repo.vcs.revert()