/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-03-08 00:47:23 UTC
  • Revision ID: tim@ed.am-20140308004723-hkl3s2hobsblf72o
added diff command; moved all command to commands subdir; made stage-revert
handle ongoing deployment automatically (now that initial revno is known); made
verbose level incremental; detect obstructing conflicts in ConflictWalker;
handle files deleted from repo during copy-out (update)

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/resolve.py
28
28
class ResolveCommand( Command ):
29
29
 
30
30
 
 
31
        def __init__( self ):
 
32
                self.repo = None
 
33
 
 
34
 
31
35
        def print_help( self ):
32
36
                print "Usage: " + the.program.name + " resolve [--repo=REPO]"
33
37
                print
59
63
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
60
64
                                        raise the.program.FatalError(
61
65
                                                'invalid repository name: ' + optarg )
62
 
                                the.repo = optarg
 
66
                                self.repo = optarg
63
67
                        elif opt in [ '--verbose', '-v' ]:
64
68
                                the.verbose += 1
65
69
                        elif opt == "--help":
76
80
        def run( self ):
77
81
 
78
82
                # set up repo and check it exists
 
83
                the.set_repo( self.repo )
79
84
                the.repo.check_dir_exists()
80
85
 
81
86
                # initialise deployment (check it's valid)
87
92
                # check for conflicts in repo
88
93
                files = the.repo.vcs.get_conflicts()
89
94
                if files:
90
 
                        message += 'conflicts in %s:\n  %s' % \
 
95
                        message += 'Conflicts in %s:\n  %s' % \
91
96
                                           ( the.repo.name, '\n  '.join( files ) )
92
97
 
93
98
                # check for deployment conclicts
94
99
                conflicts = deployment.get_conflicts()
95
100
                if conflicts:
96
 
                        message += 'deployment conflicts:\n  %s' % \
 
101
                        message += 'Deployment conflicts:\n  %s' % \
97
102
                                           '\n  '.join( conflicts )
98
103
 
99
104
                # stop if there are conflicts
105
110
                deployment.copy_out()
106
111
 
107
112
                # now we've copied-out, revert any copied-in changes!
108
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
113
                if the.verbose: print "reverting %s" % the.repo.dir
109
114
                the.repo.vcs.revert()