/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: 2014-04-06 14:09:14 UTC
  • Revision ID: tim@ed.am-20140406140914-lyd6n7proccrcr7v
minor tweaks to variable names and comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/resolve.py
28
28
class ResolveCommand( Command ):
29
29
 
30
30
 
31
 
        def __init__( self ):
32
 
                self.quiet = False
33
 
 
34
 
 
35
31
        def print_help( self ):
36
32
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
37
33
                print
48
44
                print "    " + the.program.name + " conflicts"
49
45
                print
50
46
                print "Options:"
51
 
                print "      --quiet      do not report changes to the home directory"
52
47
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
53
48
                print "  -v, --verbose    display information about what is being done"
54
49
                print "      --help       display help and exit"
58
53
        def parse_command_line( self ):
59
54
                opts, args = getopt.gnu_getopt(
60
55
                        sys.argv[ 1: ], "r:v",
61
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
56
                        [ "repo=", "verbose", "help" ] )
62
57
                for opt, optarg in opts:
63
 
                        if opt == "--quiet":
64
 
                                self.quiet = True
65
 
                        elif opt in [ '--repo', '-r' ]:
66
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
58
                        if opt in [ '--repo', '-r' ]:
 
59
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
67
60
                                        raise the.program.FatalError(
68
61
                                                'invalid repository name: ' + optarg )
69
62
                                the.repo = optarg
 
63
                        elif opt in [ '--verbose', '-v' ]:
 
64
                                the.verbose += 1
70
65
                        elif opt == "--help":
71
66
                                self.print_help()
72
 
 
 
67
                
73
68
                # discard first argument (the command)
74
69
                args.pop( 0 )
75
70
 
107
102
                                'there were conflicts...\n' + message )
108
103
 
109
104
                # copy-out changes from repo
110
 
                deployment.copy_out( self.quiet )
 
105
                deployment.copy_out()
111
106
 
112
107
                # now we've copied-out, revert any copied-in changes!
113
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
108
                if the.verbose: print "reverting %s" % the.repo.dir
114
109
                the.repo.vcs.revert()