/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-04-10 20:17:32 UTC
  • Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9
added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
80
                                the.repo = optarg
74
81
                        elif opt in [ '--verbose', '-v' ]:
75
82
                                the.verbose += 1
76
83
                        elif opt == "--help":
77
84
                                self.print_help()
78
 
                
 
85
 
79
86
                # discard first argument (the command)
80
87
                args.pop( 0 )
81
88
 
87
94
        def run( self ):
88
95
 
89
96
                # set up repo and check it exists
90
 
                the.set_repo( self.repo )
91
97
                the.repo.check_dir_exists()
92
98
 
93
99
                # initialise deployment (and check it)
98
104
                if the.repo.vcs.has_changes():
99
105
                        raise the.program.FatalError(
100
106
                                'repo has local changes: %s\n'
101
 
                                'Hint: see "%s stage-revert --help"' % 
 
107
                                'Hint: see "%s stage-revert --help"' %
102
108
                                ( the.repo.name, the.program.name ) )
103
109
 
104
110
                # 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 ) ) )
 
111
                deployment.copy_in()
111
112
 
112
113
                # perform vcs update
113
 
                if the.verbose: print "updating %s" % the.repo.dir
 
114
                if the.verbose >= 1: print "updating %s" % the.repo.dir
114
115
                updated_files = the.repo.vcs.update()
115
116
 
116
117
                message = ''
118
119
                # check for conflicts in repo
119
120
                files = the.repo.vcs.get_conflicts()
120
121
                if files:
121
 
                        message += 'Conflicts in %s:\n  %s' % \
 
122
                        message += 'conflicts in %s:\n  %s' % \
122
123
                                           ( the.repo.name, '\n  '.join( files ) )
123
124
 
124
125
                # check for deployment conclicts
125
126
                conflicts = deployment.get_conflicts( updated_files )
126
127
                if conflicts:
127
 
                        message += 'Deployment conflicts:\n  %s' % \
 
128
                        message += 'deployment conflicts:\n  %s' % \
128
129
                                           '\n  '.join( conflicts )
129
130
 
130
131
                # stop if there are conflicts
131
132
                if message:
132
133
                        raise the.program.FatalError(
133
134
                                'there were conflicts...\n' + message )
 
135
 
134
136
                # copy-out changes from repo
135
 
                deployment.copy_out()
 
137
                deployment.copy_out( self.quiet )
136
138
 
137
139
                # now we've copied-out, revert any copied-in changes!
138
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
140
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
139
141
                the.repo.vcs.revert()