/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: 2014-04-18 15:00:34 UTC
  • Revision ID: tim@ed.am-20140418150034-l94wfs6ururhi9t5
fixed error in walker.py (from last checkin)

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