/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-02-16 00:26:53 UTC
  • Revision ID: tim@ed.am-20160216002653-oa8dgponknyislg3
added home directory change reporting to CopyOutWalker; added --quiet option to
update, resolve, revert and init commands; replace use of re.match with
re.search for clarity (and fixed related bug in FileMatcher); added BzrVcs.run
command output when verbose >= 2

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
from .command import Command
 
23
from command import Command
24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
26
26
 
33
33
 
34
34
 
35
35
        def print_help( self ):
36
 
                print("Usage: " + the.program.name + " resolve [--repo=REPO]")
37
 
                print()
 
36
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
 
37
                print
38
38
                #      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")
 
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"
55
55
                exit( 0 )
56
56
 
57
57
 
67
67
                                        raise the.program.FatalError(
68
68
                                                'invalid repository name: ' + optarg )
69
69
                                the.repo = optarg
70
 
                        elif opt in [ '--verbose', '-v' ]:
71
 
                                the.verbose += 1
72
70
                        elif opt == "--help":
73
71
                                self.print_help()
74
72
 
112
110
                deployment.copy_out( self.quiet )
113
111
 
114
112
                # now we've copied-out, revert any copied-in changes!
115
 
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
 
113
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
116
114
                the.repo.vcs.revert()