/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: 2022-06-27 15:51:01 UTC
  • Revision ID: tim@ed.am-20220627155101-znatxg4q91gqs1sc
additional change for brz->bzr

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py
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
 
28
28
class UpdateCommand( Command ):
29
29
 
30
30
 
 
31
        def __init__( self ):
 
32
                self.quiet = False
 
33
 
 
34
 
31
35
        def print_help( self ):
32
 
                print "Usage: " + the.program.name + " update [--repo=REPO]"
33
 
                print
 
36
                print("Usage: " + the.program.name + " update [--repo=REPO]")
 
37
                print()
34
38
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
35
 
                print "Update a local repository and deploy changes."
36
 
                print
37
 
                print "Files in your home directory are copied in to the local repository, the local"
38
 
                print "repository is then updated (i.e., changes made to it are pulled down and merged)"
39
 
                print "and files from the local repository are then redeployed to your home directory."
40
 
                print
41
 
                print "If any conflicts occur, either during the merge or during the redeployment, no"
42
 
                print "files will be deployed and you will be expected to manually intervene.  Merge"
43
 
                print "conflicts should be dealt with the same way as you'd expect for version control."
44
 
                print "Conflicts that arise from files already existing in your home directory must be"
45
 
                print "dealt with by moving those files aside (currently)."
46
 
                print
47
 
                print "After a failed update, you can list outstanding conflicts by typing:"
48
 
                print "    " + the.program.name + " conflicts"
49
 
                print
50
 
                print "After fixing outstanding conflicts, you can re-attempt the redeployment of"
51
 
                print "your repository by typing:"
52
 
                print "    " + the.program.name + " resolve"
53
 
                print
54
 
                print "To back out of trying to update and revert the local repository, type:"
55
 
                print "    " + the.program.name + " stage-revert"
56
 
                print
57
 
                print "Options:"
58
 
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
59
 
                print "  -v, --verbose    display information about what is being done"
60
 
                print "      --help       display help and exit"
 
39
                print("Update a local repository and deploy changes.")
 
40
                print()
 
41
                print("Files in your home directory are copied in to the local repository, the local")
 
42
                print("repository is then updated (i.e., changes made to it are pulled down and merged)")
 
43
                print("and files from the local repository are then redeployed to your home directory.")
 
44
                print()
 
45
                print("If any conflicts occur, either during the merge or during the redeployment, no")
 
46
                print("files will be deployed and you will be expected to manually intervene.  Merge")
 
47
                print("conflicts should be dealt with the same way as you'd expect for version control.")
 
48
                print("Conflicts that arise from files already existing in your home directory must be")
 
49
                print("dealt with by moving those files aside (currently).")
 
50
                print()
 
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:")
 
56
                print("    " + the.program.name + " resolve")
 
57
                print()
 
58
                print("To back out of trying to update and revert the local repository, type:")
 
59
                print("    " + the.program.name + " stage-revert")
 
60
                print()
 
61
                print("Options:")
 
62
                print("      --quiet      do not report changes to the home directory")
 
63
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
 
64
                print("  -v, --verbose    display information about what is being done")
 
65
                print("      --help       display help and exit")
61
66
                exit( 0 )
62
67
 
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
80
                                the.repo = optarg
 
81
                        elif opt in [ '--verbose', '-v' ]:
 
82
                                the.verbose += 1
74
83
                        elif opt == "--help":
75
84
                                self.print_help()
76
85
 
99
108
                                ( the.repo.name, the.program.name ) )
100
109
 
101
110
                # copy-in changes to repo
102
 
                try:
103
 
                        deployment.copy_in()
104
 
                except deployment.CopyInConflicts as e:
105
 
                        raise the.program.FatalError(
106
 
                                'Files in %s differ too severly from %s:\n  %s\n' % \
107
 
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
 
111
                deployment.copy_in()
108
112
 
109
113
                # perform vcs update
110
 
                if the.verbose >= 1: print "updating %s" % the.repo.dir
 
114
                if the.verbose >= 1: print("updating %s" % the.repo.dir)
111
115
                updated_files = the.repo.vcs.update()
112
116
 
113
117
                message = ''
128
132
                if message:
129
133
                        raise the.program.FatalError(
130
134
                                'there were conflicts...\n' + message )
 
135
 
131
136
                # copy-out changes from repo
132
 
                deployment.copy_out()
 
137
                deployment.copy_out( self.quiet )
133
138
 
134
139
                # now we've copied-out, revert any copied-in changes!
135
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
140
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
136
141
                the.repo.vcs.revert()