/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:
lib/stdhome/command/resolve.py
1
 
# command_resolve.py
 
1
# resolve.py
2
2
#
3
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
4
#
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
import the
24
 
from deployment import Deployment
25
 
 
26
 
 
27
 
class CommandResolve:
 
23
from command import Command
 
24
import stdhome.the as the
 
25
from stdhome.deployment import Deployment
 
26
 
 
27
 
 
28
class ResolveCommand( Command ):
28
29
 
29
30
 
30
31
        def __init__( self ):
31
 
                self.repo = None
 
32
                self.quiet = False
32
33
 
33
34
 
34
35
        def print_help( self ):
47
48
                print "    " + the.program.name + " conflicts"
48
49
                print
49
50
                print "Options:"
 
51
                print "      --quiet      do not report changes to the home directory"
50
52
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
51
53
                print "  -v, --verbose    display information about what is being done"
52
54
                print "      --help       display help and exit"
56
58
        def parse_command_line( self ):
57
59
                opts, args = getopt.gnu_getopt(
58
60
                        sys.argv[ 1: ], "r:v",
59
 
                        [ "repo=", "verbose", "help" ] )
 
61
                        [ "quiet", "repo=", "verbose", "help" ] )
60
62
                for opt, optarg in opts:
61
 
                        if opt in [ '--repo', '-r' ]:
62
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
63
                        if opt == "--quiet":
 
64
                                self.quiet = True
 
65
                        elif opt in [ '--repo', '-r' ]:
 
66
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
63
67
                                        raise the.program.FatalError(
64
68
                                                'invalid repository name: ' + optarg )
65
 
                                self.repo = optarg
66
 
                        elif opt in [ '--verbose', '-v' ]:
67
 
                                the.verbose = True
 
69
                                the.repo = optarg
68
70
                        elif opt == "--help":
69
71
                                self.print_help()
70
 
                
 
72
 
71
73
                # discard first argument (the command)
72
74
                args.pop( 0 )
73
75
 
79
81
        def run( self ):
80
82
 
81
83
                # set up repo and check it exists
82
 
                the.set_repo( self.repo )
83
84
                the.repo.check_dir_exists()
84
85
 
85
86
                # initialise deployment (check it's valid)
91
92
                # check for conflicts in repo
92
93
                files = the.repo.vcs.get_conflicts()
93
94
                if files:
94
 
                        message += 'Conflicts in %s:\n  %s' % \
 
95
                        message += 'conflicts in %s:\n  %s' % \
95
96
                                           ( the.repo.name, '\n  '.join( files ) )
96
97
 
97
98
                # check for deployment conclicts
98
99
                conflicts = deployment.get_conflicts()
99
100
                if conflicts:
100
 
                        message += 'Deployment conflicts:\n  %s' % \
 
101
                        message += 'deployment conflicts:\n  %s' % \
101
102
                                           '\n  '.join( conflicts )
102
103
 
103
104
                # stop if there are conflicts
106
107
                                'there were conflicts...\n' + message )
107
108
 
108
109
                # copy-out changes from repo
109
 
                deployment.copy_out()
 
110
                deployment.copy_out( self.quiet )
110
111
 
111
112
                # now we've copied-out, revert any copied-in changes!
112
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
113
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
113
114
                the.repo.vcs.revert()