/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:
28
28
class ResolveCommand( Command ):
29
29
 
30
30
 
 
31
        def __init__( self ):
 
32
                self.quiet = False
 
33
 
 
34
 
31
35
        def print_help( self ):
32
36
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
33
37
                print
44
48
                print "    " + the.program.name + " conflicts"
45
49
                print
46
50
                print "Options:"
 
51
                print "      --quiet      do not report changes to the home directory"
47
52
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
48
53
                print "  -v, --verbose    display information about what is being done"
49
54
                print "      --help       display help and exit"
53
58
        def parse_command_line( self ):
54
59
                opts, args = getopt.gnu_getopt(
55
60
                        sys.argv[ 1: ], "r:v",
56
 
                        [ "repo=", "verbose", "help" ] )
 
61
                        [ "quiet", "repo=", "verbose", "help" ] )
57
62
                for opt, optarg in opts:
58
 
                        if opt in [ '--repo', '-r' ]:
59
 
                                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 ):
60
67
                                        raise the.program.FatalError(
61
68
                                                'invalid repository name: ' + optarg )
62
69
                                the.repo = optarg
100
107
                                'there were conflicts...\n' + message )
101
108
 
102
109
                # copy-out changes from repo
103
 
                deployment.copy_out()
 
110
                deployment.copy_out( self.quiet )
104
111
 
105
112
                # now we've copied-out, revert any copied-in changes!
106
113
                if the.verbose >= 1: print "reverting %s" % the.repo.dir