/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: 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/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
 
                self.repo = None
32
32
                self.force = False
33
33
 
34
34
 
35
35
        def print_help( self ):
36
 
                print "Usage: " + the.program.name + " update [--repo=REPO]"
 
36
                print "Usage: " + the.program.name + " stage-revert [--repo=REPO]"
37
37
                print
38
38
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
39
                print "Revert any modifications made to a local repository, losing those changes."
49
49
                print "repository."
50
50
                print
51
51
                print "Options:"
52
 
                print "      --force      disregard any ongoing deployment"
 
52
                print "      --force      force revert of stage (when there is a problem)"
53
53
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
54
54
                print "  -v, --verbose    display information about what is being done"
55
55
                print "      --help       display help and exit"
61
61
                        sys.argv[ 1: ], "r:v",
62
62
                        [ "force", "repo=", "verbose", "help" ] )
63
63
                for opt, optarg in opts:
64
 
                        if opt == '--force':
 
64
                        if opt == "--force":
65
65
                                self.force = True
66
 
                        if opt in [ '--repo', '-r' ]:
67
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
66
                        elif opt in [ '--repo', '-r' ]:
 
67
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
68
68
                                        raise the.program.FatalError(
69
69
                                                'invalid repository name: ' + optarg )
70
 
                                self.repo = optarg
71
 
                        elif opt in [ '--verbose', '-v' ]:
72
 
                                the.verbose = True
 
70
                                the.repo = optarg
73
71
                        elif opt == "--help":
74
72
                                self.print_help()
75
 
                
 
73
 
76
74
                # discard first argument (the command)
77
75
                args.pop( 0 )
78
76
 
84
82
        def run( self ):
85
83
 
86
84
                # set up repo and check it exists
87
 
                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
                   and not self.force:
 
91
                        raise RuntimeError(
 
92
                                "can't revert ongoing deployment: initial revno is missing!\n"
 
93
                                "use --force to override, but an update may miss changes!" )
94
94
 
95
95
                # check for local changes
96
 
                if the.verbose: print "reverting %s" % the.repo.dir
97
 
                the.repo.vcs.revert()
 
96
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
97
                the.repo.vcs.revert( deployment.get_initial_revno() )
98
98
 
99
 
                # remove deployment state, as necessary
100
 
                if self.force:
101
 
                        deployment.remove_deployment_state()
 
99
                # remove deployment state
 
100
                deployment.remove_deployment_state()