/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/stage_revert.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/stage_revert.py
1
 
# command_stage_revert.py
 
1
# stage_revert.py
2
2
#
3
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
4
#
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
import the
24
 
from deployment import Deployment
25
 
 
26
 
 
27
 
class CommandStageRevert:
 
23
from command import Command
 
24
import stdhome.the as the
 
25
from stdhome.deployment import Deployment
 
26
 
 
27
 
 
28
class StageRevertCommand( Command ):
28
29
 
29
30
 
30
31
        def __init__( self ):
31
32
                self.repo = None
32
 
                self.force = False
33
33
 
34
34
 
35
35
        def print_help( self ):
49
49
                print "repository."
50
50
                print
51
51
                print "Options:"
52
 
                print "      --force      disregard any ongoing deployment"
53
52
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
54
53
                print "  -v, --verbose    display information about what is being done"
55
54
                print "      --help       display help and exit"
59
58
        def parse_command_line( self ):
60
59
                opts, args = getopt.gnu_getopt(
61
60
                        sys.argv[ 1: ], "r:v",
62
 
                        [ "force", "repo=", "verbose", "help" ] )
 
61
                        [ "repo=", "verbose", "help" ] )
63
62
                for opt, optarg in opts:
64
 
                        if opt == '--force':
65
 
                                self.force = True
66
63
                        if opt in [ '--repo', '-r' ]:
67
64
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
68
65
                                        raise the.program.FatalError(
69
66
                                                'invalid repository name: ' + optarg )
70
67
                                self.repo = optarg
71
68
                        elif opt in [ '--verbose', '-v' ]:
72
 
                                the.verbose = True
 
69
                                the.verbose += 1
73
70
                        elif opt == "--help":
74
71
                                self.print_help()
75
72
                
87
84
                the.set_repo( self.repo )
88
85
                the.repo.check_dir_exists()
89
86
 
90
 
                # check there isn't a deployment in progress
 
87
                # initialise deployment
91
88
                deployment = Deployment()
92
 
                if not self.force:
93
 
                        deployment.check_ongoing( False )
 
89
                if deployment.is_ongoing() and deployment.get_initial_revno() is None:
 
90
                        raise RunteimError(
 
91
                                "can't revert ongoing deployment: initial revno is missing!" )
94
92
 
95
93
                # check for local changes
96
94
                if the.verbose: print "reverting %s" % the.repo.dir
97
 
                the.repo.vcs.revert()
 
95
                the.repo.vcs.revert( deployment.get_initial_revno() )
98
96
 
99
 
                # remove deployment state, as necessary
100
 
                if self.force:
101
 
                        deployment.remove_deployment_state()
 
97
                # remove deployment state
 
98
                deployment.remove_deployment_state()