47
47
self.obstructed = list()
50
def process( self, rel_file, src_file, src_type, dst_file, dst_type ):
50
def process( self, rel_file, src, dst ):
52
52
# if entity is missing in home dir, it's ok to copy out (and there's no
54
if dst_type == '_': return False
54
if dst.type == '_': return False
56
56
# if entity was copied-in, it's ok to copy out
57
57
elif rel_file in self.ignore_files:
59
59
# we recurse only if this is a directory in the home dir, because if
60
60
# it isn't copying-out will replace whatever's in the home dir with
61
61
# the whole directory from the repo
62
return dst_type == 'd'
62
return dst.type == 'd'
64
64
# entity has changed type?
65
elif src_type != dst_type:
66
self.changed.append( "%s (now %s)" % (
67
rel_file, self.name_of_type( src_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() ) )
69
69
# if an entity has changed to/from a directory, we don't care about
70
70
# anything that directory does/did contain
73
73
# entity is a file (that wasn't copyied-in)?
76
# only aproblem if its content is different
77
if not filecmp.cmp( src_file, dst_file ):
76
# only a problem if its content is different
77
if not filecmp.cmp( src.file, dst.file ):
78
78
self.obstructed.append( rel_file )
81
81
# entity is a symlink (that wasn't copied-in)?
84
84
# only a problem if the symlink is different
85
if os.readlink( src_file ) != os.readlink( dst_file ):
85
if os.readlink( src.file ) != os.readlink( dst.file ):
86
86
self.obstructed.append( rel_file )
added
removed
lib/stdhome/walker/conflict.py
