/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/update.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

lib/stdhome/command/update.py
29
29
 
30
30
 
31
31
        def __init__( self ):
32
 
                self.repo = None
 
32
                self.quiet = False
33
33
 
34
34
 
35
35
        def print_help( self ):
48
48
                print "Conflicts that arise from files already existing in your home directory must be"
49
49
                print "dealt with by moving those files aside (currently)."
50
50
                print
51
 
                print "You can resume the redeployment of your repository by typing:"
 
51
                print "After a failed update, you can list outstanding conflicts by typing:"
 
52
                print "    " + the.program.name + " conflicts"
 
53
                print
 
54
                print "After fixing outstanding conflicts, you can re-attempt the redeployment of"
 
55
                print "your repository by typing:"
52
56
                print "    " + the.program.name + " resolve"
53
57
                print
54
 
                print "You can list outstanding conflicts by typing:"
55
 
                print "    " + the.program.name + " conflicts"
 
58
                print "To back out of trying to update and revert the local repository, type:"
 
59
                print "    " + the.program.name + " stage-revert"
56
60
                print
57
61
                print "Options:"
 
62
                print "      --quiet      do not report changes to the home directory"
58
63
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
59
64
                print "  -v, --verbose    display information about what is being done"
60
65
                print "      --help       display help and exit"
63
68
 
64
69
        def parse_command_line( self ):
65
70
                opts, args = getopt.gnu_getopt(
66
 
                        sys.argv[ 1: ], "r:v",
67
 
                        [ "repo=", "verbose", "help" ] )
 
71
                        sys.argv[ 1: ], "qr:v",
 
72
                        [ "quiet", "repo=", "verbose", "help" ] )
68
73
                for opt, optarg in opts:
69
 
                        if opt in [ '--repo', '-r' ]:
70
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
74
                        if opt == '--quiet':
 
75
                                self.quiet = True
 
76
                        elif opt in [ '--repo', '-r' ]:
 
77
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
71
78
                                        raise the.program.FatalError(
72
79
                                                'invalid repository name: ' + optarg )
73
 
                                self.repo = optarg
74
 
                        elif opt in [ '--verbose', '-v' ]:
75
 
                                the.verbose += 1
 
80
                                the.repo = optarg
76
81
                        elif opt == "--help":
77
82
                                self.print_help()
78
 
                
 
83
 
79
84
                # discard first argument (the command)
80
85
                args.pop( 0 )
81
86
 
87
92
        def run( self ):
88
93
 
89
94
                # set up repo and check it exists
90
 
                the.set_repo( self.repo )
91
95
                the.repo.check_dir_exists()
92
96
 
93
97
                # initialise deployment (and check it)
98
102
                if the.repo.vcs.has_changes():
99
103
                        raise the.program.FatalError(
100
104
                                'repo has local changes: %s\n'
101
 
                                'Hint: see "%s stage-revert --help"' % 
 
105
                                'Hint: see "%s stage-revert --help"' %
102
106
                                ( the.repo.name, the.program.name ) )
103
107
 
104
108
                # copy-in changes to repo
105
 
                try:
106
 
                        deployment.copy_in()
107
 
                except deployment.CopyInConflicts as e:
108
 
                        raise the.program.FatalError(
109
 
                                'Files in %s differ too severly from %s:\n  %s\n' % \
110
 
                                ( the.hdir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
 
109
                deployment.copy_in()
111
110
 
112
111
                # perform vcs update
113
 
                if the.verbose: print "updating %s" % the.repo.dir
 
112
                if the.verbose >= 1: print "updating %s" % the.repo.dir
114
113
                updated_files = the.repo.vcs.update()
115
114
 
116
115
                message = ''
118
117
                # check for conflicts in repo
119
118
                files = the.repo.vcs.get_conflicts()
120
119
                if files:
121
 
                        message += 'Conflicts in %s:\n  %s' % \
 
120
                        message += 'conflicts in %s:\n  %s' % \
122
121
                                           ( the.repo.name, '\n  '.join( files ) )
123
122
 
124
123
                # check for deployment conclicts
125
124
                conflicts = deployment.get_conflicts( updated_files )
126
125
                if conflicts:
127
 
                        message += 'Deployment conflicts:\n  %s' % \
 
126
                        message += 'deployment conflicts:\n  %s' % \
128
127
                                           '\n  '.join( conflicts )
129
128
 
130
129
                # stop if there are conflicts
131
130
                if message:
132
131
                        raise the.program.FatalError(
133
132
                                'there were conflicts...\n' + message )
 
133
 
134
134
                # copy-out changes from repo
135
 
                deployment.copy_out()
 
135
                deployment.copy_out( self.quiet )
136
136
 
137
137
                # now we've copied-out, revert any copied-in changes!
138
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
138
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
139
139
                the.repo.vcs.revert()