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

  • Committer: Tim Marston
  • Date: 2014-02-26 19:10:31 UTC
  • Revision ID: tim@ed.am-20140226191031-elcqy5j09h2syn2j
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
bzr vcs back-end now parses affected files during update; deployment state now
includes affected files

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict_walker.py
27
27
        """The conflict walker traverses the repo looking for "deployment conflicts"
28
28
        (i.e., changes in the type of file).  This is run prior to running the
29
29
        copy-out walker and, as such, is given a list of files that were copied-in
30
 
        and which is can, therefore, safely ignore.  It can also be given a list of
31
 
        files affected by the update (it will walk all repo files otherwise).
 
30
        and which is can, therefore, safely ignore.
32
31
 
33
32
        Walker source:       repo
34
33
        Walker destination:  home dir
35
34
        Walker traversing:   repo
36
35
        """
37
36
 
38
 
        def __init__( self, ignore_files, affected_files = None ):
 
37
        def __init__( self, ignore_files, updated_files = None ):
39
38
                self.src_dir = the.repo.full_dir
40
39
                self.dst_dir = the.full_fsdir
41
 
                self.walk_list = affected_files if affected_files is not None else \
 
40
                self.walk_list = updated_files if updated_files is not None else \
42
41
                                                 self.generate_walk_list( the.repo.full_dir )
43
42
 
44
43
                self.ignore_files = ignore_files