/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: 2016-04-10 21:03:07 UTC
  • Revision ID: tim@ed.am-20160410210307-6m8527mg1syvrual
updated todo

Show diffs side-by-side

added added

removed removed

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