28
27
"""The conflict walker traverses the repo looking for "deployment conflicts"
29
28
(i.e., changes in the type of file). This is run prior to running the
30
29
copy-out walker and, as such, is given a list of files that were copied-in
31
and which is can, therefore, safely ignore. It can also be given a list of
32
files affected by the update (it will walk all repo files otherwise).
30
and which is can, therefore, safely ignore.
34
32
Walker source: repo
35
33
Walker destination: home dir
36
34
Walker traversing: repo
39
def __init__( self, ignore_files, walk_files = None ):
37
def __init__( self, ignore_files, updated_files = None ):
40
38
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()
39
self.dst_dir = the.full_fsdir
40
self.walk_list = updated_files if updated_files is not None else \
41
self.generate_walk_list( the.repo.full_dir )
45
43
self.ignore_files = ignore_files
46
44
self.changed = list()
47
self.obstructed = list()
50
def process( self, rel_file, src, dst ):
47
def process( self, rel_file, src_file, src_type, dst_file, dst_type ):
52
49
# if entity is missing in home dir, it's ok to copy out (and there's no
54
if dst.type == '_': return False
51
if dst_type == '_': return False
56
53
# if entity was copied-in, it's ok to copy out
57
elif rel_file in self.ignore_files:
54
if rel_file in self.ignore_files:
59
55
# we recurse only if this is a directory in the home dir, because if
60
56
# it isn't copying-out will replace whatever's in the home dir with
61
57
# the whole directory from the repo
62
return dst.type == 'd'
58
return dst_type == 'd'
64
60
# 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() ) )
61
elif src_type != dst_type:
62
self.changed.append( "%s (now %s)" % (
63
rel_file, self.name_of_type( src_type ) ) )
69
65
# if an entity has changed to/from a directory, we don't care about
70
66
# anything that directory does/did contain
73
# entity is a file (that wasn't copyied-in)?
76
# only a problem if its content is different
77
if not filecmp.cmp( src.file, dst.file ):
78
self.obstructed.append( rel_file )
81
# entity is a symlink (that wasn't copied-in)?
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 )
89
69
# nothing to see here