/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: 2014-04-05 19:20:06 UTC
  • Revision ID: tim@ed.am-20140405192006-fv0toip4b8m5pc88
fixed bug preventing skipping of subdirectories in walker; also added
walker.File.__str__()

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/update.py
28
28
class UpdateCommand( Command ):
29
29
 
30
30
 
31
 
        def __init__( self ):
32
 
                self.repo = None
33
 
 
34
 
 
35
31
        def print_help( self ):
36
32
                print "Usage: " + the.program.name + " update [--repo=REPO]"
37
33
                print
48
44
                print "Conflicts that arise from files already existing in your home directory must be"
49
45
                print "dealt with by moving those files aside (currently)."
50
46
                print
51
 
                print "You can resume the redeployment of your repository by typing:"
 
47
                print "After a failed update, you can list outstanding conflicts by typing:"
 
48
                print "    " + the.program.name + " conflicts"
 
49
                print
 
50
                print "After fixing outstanding conflicts, you can re-attempt the redeployment of"
 
51
                print "your repository by typing:"
52
52
                print "    " + the.program.name + " resolve"
53
53
                print
54
 
                print "You can list outstanding conflicts by typing:"
55
 
                print "    " + the.program.name + " conflicts"
 
54
                print "To back out of trying to update and revert the local repository, type:"
 
55
                print "    " + the.program.name + " stage-revert"
56
56
                print
57
57
                print "Options:"
58
58
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
70
70
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
71
71
                                        raise the.program.FatalError(
72
72
                                                'invalid repository name: ' + optarg )
73
 
                                self.repo = optarg
 
73
                                the.repo = optarg
74
74
                        elif opt in [ '--verbose', '-v' ]:
75
75
                                the.verbose += 1
76
76
                        elif opt == "--help":
87
87
        def run( self ):
88
88
 
89
89
                # set up repo and check it exists
90
 
                the.set_repo( self.repo )
91
90
                the.repo.check_dir_exists()
92
91
 
93
92
                # initialise deployment (and check it)