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

  • Committer: Tim Marston
  • Date: 2016-02-28 17:51:29 UTC
  • Revision ID: tim@ed.am-20160228175129-ea341cedv8g3s63m
fixed display of bzr output

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/walker/walker.py
32
32
        process() for more information.
33
33
        """
34
34
 
35
 
 
36
35
        def walk( self ):
37
36
                """Iterates over self.walk_list, calling process() for each entry in turn.  For
38
37
                directory entries, where process() returns False, subsequent entries in
39
38
                walk_list that fall under the directory are skipped.
40
39
                """
41
40
 
42
 
                if the.verbose >= 3:
43
 
                        print("walking [%s]" % self.__class__.__name__)
44
 
 
45
41
                skip = ''
 
42
 
46
43
                for rel_file in self.walk_list:
47
44
 
48
45
                        # if we're skipping, skip entries in subdirectories, or turn off
64
61
                        # way of knowing what to check.  It could be src_type or dst_type
65
62
                        # (if src_dir or dst_dir was used to generate the walk list) or it
66
63
                        # could be neither (if the walk list came from somewhere else).  But
67
 
                        # it shouldn't matter: we add a path seperateor (os.sep) to the end
68
 
                        # of the filename, so it wuill only match files that are descendents
69
 
                        # of a directory with the name of this file.
 
64
                        # it shouldn't matter.  We adding an os.pathset to the end of the
 
65
                        # filename, so it wuill only match files that are descendents of a
 
66
                        # directory with the name of this file.
70
67
                        if not recurse: skip = rel_file + os.sep
71
68
 
72
69
 
102
99
 
103
100
 
104
101
        @staticmethod
105
 
        def generate_walk_list( full_dir, rel_file = '', recurse = True ):
 
102
        def generate_walk_list( rel_file = '', full_dir = None ):
106
103
                """Returns a list of files and directories in full_dir, specified as relative
107
104
                files (relative to full_dir), breadth first.
108
 
 
109
105
                """
110
106
 
 
107
                # default place to walk
 
108
                if full_dir is None: full_dir = the.repo.full_dir
 
109
 
111
110
                # ignore some files
112
 
                static_ignores = [ '.stdhome', '.stdhomerc' ] + \
113
 
                                                 the.repo.vcs.ignored_files
114
 
                if rel_file in static_ignores:
 
111
                if rel_file in [ '.bzr', '.bzrignore', '.stdhome', '.stdhomerc' ]:
115
112
                        return list()
116
113
 
117
114
                full_file = os.path.join( full_dir, rel_file )
123
120
                # directories are returned and recursed in to
124
121
                elif os.path.isdir( full_file ):
125
122
                        ret = [ rel_file ] if rel_file != '' else []
126
 
                        if recurse:
127
 
                                for file in os.listdir( full_file ):
128
 
                                        ret.extend( Walker.generate_walk_list(
129
 
                                                full_dir, os.path.join( rel_file, file ) ) )
 
123
                        for file in os.listdir( full_file ):
 
124
                                ret.extend( Walker.generate_walk_list(
 
125
                                        os.path.join( rel_file, file ), full_dir ) )
130
126
                        return sorted( ret )
131
127
 
132
128
                # other kinds are invalid