/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
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
 
29
29
 
30
30
 
31
31
        def __init__( self ):
32
 
                self.force = False
 
32
                self.repo = None
33
33
 
34
34
 
35
35
        def print_help( self ):
36
 
                print("Usage: " + the.program.name + " stage-revert [--repo=REPO]")
37
 
                print()
 
36
                print "Usage: " + the.program.name + " update [--repo=REPO]"
 
37
                print
38
38
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
 
                print("Revert any modifications made to a local repository, losing those changes.")
40
 
                print()
41
 
                Command.print_stage_commands_notice()
42
 
                print()
43
 
                print("If you have not used any of the staging commands, it is probably safe to revert")
44
 
                print("a local repository and doing so will allow many primary commands (such as add")
45
 
                print("and remove) to work again.")
46
 
                print()
47
 
                print("Options:")
48
 
                print("      --force      force revert of stage (when there is a problem)")
49
 
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
50
 
                print("  -v, --verbose    display information about what is being done")
51
 
                print("      --help       display help and exit")
 
39
                print "Revert any modifications made to a local repository, losing those changes."
 
40
                print
 
41
                print "In addition to using the add and remove commands, you can also manually modify"
 
42
                print "the files in a local repository and then commit them to a remote repository as"
 
43
                print "required.  This can be done with the staging commands."
 
44
                print
 
45
                print "When files in your local repository have been modified, several of the primary"
 
46
                print "commands of this program will not be able to function.  This command reverts all"
 
47
                print "modifications to a local repository so that the primary commands can work again."
 
48
                print "If you have not used any of the staging commands, it is safe to revert a local"
 
49
                print "repository."
 
50
                print
 
51
                print "Options:"
 
52
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
 
53
                print "  -v, --verbose    display information about what is being done"
 
54
                print "      --help       display help and exit"
52
55
                exit( 0 )
53
56
 
54
57
 
55
58
        def parse_command_line( self ):
56
59
                opts, args = getopt.gnu_getopt(
57
60
                        sys.argv[ 1: ], "r:v",
58
 
                        [ "force", "repo=", "verbose", "help" ] )
 
61
                        [ "repo=", "verbose", "help" ] )
59
62
                for opt, optarg in opts:
60
 
                        if opt == "--force":
61
 
                                self.force = True
62
 
                        elif opt in [ '--repo', '-r' ]:
63
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
63
                        if opt in [ '--repo', '-r' ]:
 
64
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
64
65
                                        raise the.program.FatalError(
65
66
                                                'invalid repository name: ' + optarg )
66
 
                                the.repo = optarg
 
67
                                self.repo = optarg
67
68
                        elif opt in [ '--verbose', '-v' ]:
68
69
                                the.verbose += 1
69
70
                        elif opt == "--help":
70
71
                                self.print_help()
71
 
 
 
72
                
72
73
                # discard first argument (the command)
73
74
                args.pop( 0 )
74
75
 
80
81
        def run( self ):
81
82
 
82
83
                # set up repo and check it exists
 
84
                the.set_repo( self.repo )
83
85
                the.repo.check_dir_exists()
84
86
 
85
87
                # initialise deployment
86
88
                deployment = Deployment()
87
 
                if deployment.is_ongoing() and deployment.get_initial_revno() is None \
88
 
                   and not self.force:
89
 
                        raise RuntimeError(
90
 
                                "can't revert ongoing deployment: initial revno is missing!\n"
91
 
                                "use --force to override, but an update may miss changes!" )
 
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!" )
92
92
 
93
93
                # check for local changes
94
 
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
 
94
                if the.verbose: print "reverting %s" % the.repo.dir
95
95
                the.repo.vcs.revert( deployment.get_initial_revno() )
96
96
 
97
97
                # remove deployment state