19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
import sys, re, getopt
23
from command import Command
24
26
import stdhome.the as the
25
27
from stdhome.deployment import Deployment
29
from .command import Command
28
32
class ResolveCommand( Command ):
35
39
def print_help( self ):
36
print "Usage: " + the.program.name + " resolve [--repo=REPO]"
40
print("Usage: " + the.program.name + " resolve [--repo=REPO]")
38
42
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
print "Reattempt to deploy files following an update that failed due to conflicts."
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."
47
print "You can list outstanding conflicts by typing:"
48
print " " + the.program.name + " conflicts"
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.")
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.")
51
print("You can list outstanding conflicts by typing:")
52
print(" " + the.program.name + " conflicts")
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")
94
98
# check for conflicts in repo
95
99
files = the.repo.vcs.get_conflicts()
97
message += 'conflicts in %s:\n %s' % \
101
message += 'conflicts in %s:\n %s\n' % \
98
102
( the.repo.name, '\n '.join( files ) )
100
104
# check for deployment conclicts
101
105
conflicts = deployment.get_conflicts()
103
message += 'deployment conflicts:\n %s' % \
107
message += 'deployment conflicts:\n %s\n' % \
104
108
'\n '.join( conflicts )
106
110
# stop if there are conflicts
108
112
raise the.program.FatalError(
109
'there were conflicts...\n' + message )
113
'there were conflicts...\n' + message.rstrip( '\n' ) )
111
115
# copy-out changes from repo
112
116
deployment.copy_out( self.quiet )
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()