/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-03-08 00:40:42 UTC
  • Revision ID: tim@ed.am-20140308004042-j5rco14bjp3teegj
updated .bzrignore

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict_walker.py
1
 
# conflict.py
 
1
# conflict_walker.py
2
2
#
3
3
# Copyright (C) 2013 to 2014 Tim Marston <tim@edm.am>
4
4
#
19
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
20
 
21
21
 
22
 
import filecmp, os
23
22
from walker import Walker
24
23
import stdhome.the as the
25
24
 
36
35
        Walker traversing:   repo
37
36
        """
38
37
 
39
 
        def __init__( self, ignore_files, walk_files = None ):
 
38
        def __init__( self, ignore_files, affected_files = None ):
40
39
                self.src_dir = the.repo.full_dir
41
 
                self.dst_dir = the.full_home_dir
42
 
                self.walk_list = walk_files if walk_files is not None else \
43
 
                                                 self.generate_walk_list()
 
40
                self.dst_dir = the.full_fsdir
 
41
                self.walk_list = affected_files if affected_files is not None else \
 
42
                                                 self.generate_walk_list( the.repo.full_dir )
44
43
 
45
44
                self.ignore_files = ignore_files
46
45
                self.changed = list()
47
 
                self.obstructed = list()
48
 
 
49
 
 
50
 
        def process( self, rel_file, src, dst ):
 
46
 
 
47
 
 
48
        def process( self, rel_file, src_file, src_type, dst_file, dst_type ):
51
49
 
52
50
                # if entity is missing in home dir, it's ok to copy out (and there's no
53
51
                # need to recurse)
54
 
                if dst.type == '_': return False
 
52
                if dst_type == '_': return False
55
53
 
56
54
                # if entity was copied-in, it's ok to copy out
57
 
                elif rel_file in self.ignore_files:
58
 
 
 
55
                if rel_file in self.ignore_files:
59
56
                        # we recurse only if this is a directory in the home dir, because if
60
57
                        # it isn't copying-out will replace whatever's in the home dir with
61
58
                        # the whole directory from the repo
62
 
                        return dst.type == 'd'
 
59
                        return dst_type == 'd'
63
60
 
64
61
                # entity has changed type?
65
 
                elif src.get_type_name() != dst.get_type_name():
66
 
                        self.changed.append( "%s (%s => %s)" % (
67
 
                                rel_file, src.get_type_name(), dst.get_type_name() ) )
 
62
                elif src_type != dst_type:
 
63
                        self.changed.append( "%s (now %s)" % (
 
64
                                rel_file, self.name_of_type( src_type ) ) )
68
65
 
69
66
                        # if an entity has changed to/from a directory, we don't care about
70
67
                        # anything that directory does/did contain
71
68
                        return False
72
69
 
73
 
                # entity is a file (that wasn't copyied-in)?
74
 
                elif dst.type == 'f':
75
 
 
76
 
                        # only a problem if its content is different
77
 
                        if not filecmp.cmp( src.file, dst.file ):
78
 
                                self.obstructed.append( rel_file )
79
 
                                return False
80
 
 
81
 
                # entity is a symlink (that wasn't copied-in)?
82
 
                if dst.type == 'l':
83
 
 
84
 
                        # only a problem if the symlink is different
85
 
                        if os.readlink( src.file ) != os.readlink( dst.file ):
86
 
                                self.obstructed.append( rel_file )
87
 
                                return False
88
 
 
89
70
                # nothing to see here
90
71
                return True