/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/add.py

  • Committer: Tim Marston
  • Date: 2016-04-10 20:16:16 UTC
  • Revision ID: tim@ed.am-20160410201616-xyd9aeyc7xf6tqg5
fixed tools to use ~/tmp/stdhome-dev as dev home-dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/add.py
24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
26
26
from stdhome.walker.copy_in import CopyInWalker
27
 
from stdhome.walker.walker import Walker
28
27
 
29
28
 
30
29
class AddCommand( Command ):
31
30
 
32
31
 
33
 
        def __init__( self ):
34
 
                self.recursive = False
35
 
 
36
 
 
37
32
        def print_help( self ):
38
33
                print "Usage: " + the.program.name + " add [--repo=REPO] FILE..."
39
34
                print
43
38
                print "Add a named file from the local filesystem, specified relative to the home"
44
39
                print "directory, to the repo, or update an existing file in the repo with your local"
45
40
                print "changes.  Directories can also be added, but note that they are not added"
46
 
                print "recursively (as is common with version control) unless this is specifically"
47
 
                print "requested on the commandline."
 
41
                print "recursively (as is common with version control)."
48
42
                print
49
43
                print "Options:"
50
44
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
51
 
                print "  -R, --recursive  recursively add directories"
52
45
                print "  -v, --verbose    display information about what is being done"
53
46
                print "      --help       display help and exit"
54
47
                exit( 0 )
56
49
 
57
50
        def parse_command_line( self ):
58
51
                opts, args = getopt.gnu_getopt(
59
 
                        sys.argv[ 1: ], "r:Rv",
60
 
                        [ "repo=", "recuirsive", "verbose", "help" ] )
 
52
                        sys.argv[ 1: ], "r:v",
 
53
                        [ "repo=", "verbose", "help" ] )
61
54
                for opt, optarg in opts:
62
55
                        if opt in [ '--repo', '-r' ]:
63
56
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
64
57
                                        raise the.program.FatalError(
65
58
                                                'invalid repository name: ' + optarg )
66
59
                                the.repo = optarg
67
 
                        elif opt in [ '--recursive', '-R' ]:
68
 
                                self.recursive = True
69
60
                        elif opt in [ '--verbose', '-v' ]:
70
61
                                the.verbose += 1
71
62
                        elif opt == "--help":
88
79
                the.repo.check_dir_exists()
89
80
 
90
81
                # determine files
91
 
                files = self.expand_home_files( self.files, self.recursive )
 
82
                files = self.expand_home_dir_files( self.files )
92
83
 
93
84
                # initialise deployment and ensure it's not ongoing
94
85
                deployment = Deployment()
102
93
                                ( the.repo.name, the.program.name ) )
103
94
 
104
95
                # check status
105
 
                walker = CopyInWalker( files, True )
 
96
                walker = CopyInWalker( files )
106
97
                walker.walk()
107
98
 
108
99
                # make sure all files are added to version control
114
105
                the.repo.vcs.commit()
115
106
 
116
107
 
117
 
 
118
 
 
119
108
        @staticmethod
120
 
        def expand_home_files( files, recurse ):
 
109
        def expand_home_dir_files( files ):
121
110
                """Returns a unique, sorted list of relative filenames, calculated from the list
122
111
                provided, which is made up from individual files and directories
123
 
                relative to the CWD.  Directories are recursed in to as requried, and
124
 
                leading path components of any items are alse returned.  Specified
125
 
                filenames must exist in the home directory (although they may not exist
126
 
                in the repo).
127
 
 
128
 
                This is a modified version of command.expand_files().
 
112
                relative to the CWD.  Directories are not recursed in to, and leading
 
113
                path components are not returned.  Specified filenames must exist in the
 
114
                home directory (although they may not exist in the repo).
129
115
 
130
116
                """
131
117
 
151
137
                                raise the.program.FatalError(
152
138
                                        'not found in home directory: %s' % rel_file )
153
139
 
154
 
                        # ensure parent path parts are included
155
 
                        path = rel_file
156
 
                        while True:
157
 
                                path, dummy = os.path.split( path )
158
 
                                if len( path ): ret.add( path )
159
 
                                else: break
 
140
                        # # append path parts
 
141
                        # path = rel_file
 
142
                        # while True:
 
143
                        #       path, dummy = os.path.split( path )
 
144
                        #       if len( path ): ret.add( path )
 
145
                        #       else: break
160
146
 
161
147
                        # append the file or directory
162
 
                        ret.update( Walker.generate_walk_list(
163
 
                                the.full_home_dir, rel_file, recurse ) )
 
148
                        ret.add( rel_file )
164
149
 
165
150
                return sorted( ret )