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

  • Committer: Tim Marston
  • Date: 2016-12-13 21:40:34 UTC
  • Revision ID: tim@ed.am-20161213214034-nd5t7ztnlrjd627i
fix add command and generic filename expansion/resolution to expend to
homedir-relative filename and absolute filename based on original filename, as
specified, rather than a fully, symlink-resolved filename.  So, e.g., if ~/bob
was a symlink to ~/fred, then ~/bob/a would resolve to the relative filename
bob/a, becuase it is inside the homedir (it would resolve to fred/a otherwise)

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict.py
1
 
# conflict_walker.py
 
1
# conflict.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
22
23
from walker import Walker
23
24
import stdhome.the as the
24
25
 
35
36
        Walker traversing:   repo
36
37
        """
37
38
 
38
 
        def __init__( self, ignore_files, affected_files = None ):
 
39
        def __init__( self, ignore_files, walk_files = None ):
39
40
                self.src_dir = the.repo.full_dir
40
 
                self.dst_dir = the.full_fsdir
41
 
                self.walk_list = affected_files if affected_files is not None else \
 
41
                self.dst_dir = the.full_home_dir
 
42
                self.walk_list = walk_files if walk_files is not None else \
42
43
                                                 self.generate_walk_list( the.repo.full_dir )
43
44
 
44
45
                self.ignore_files = ignore_files
45
46
                self.changed = list()
46
 
 
47
 
 
48
 
        def process( self, rel_file, src_file, src_type, dst_file, dst_type ):
 
47
                self.obstructed = list()
 
48
 
 
49
 
 
50
        def process( self, rel_file, src, dst ):
49
51
 
50
52
                # if entity is missing in home dir, it's ok to copy out (and there's no
51
53
                # need to recurse)
52
 
                if dst_type == '_': return False
 
54
                if dst.type == '_': return False
53
55
 
54
56
                # if entity was copied-in, it's ok to copy out
55
 
                if rel_file in self.ignore_files:
 
57
                elif rel_file in self.ignore_files:
 
58
 
56
59
                        # we recurse only if this is a directory in the home dir, because if
57
60
                        # it isn't copying-out will replace whatever's in the home dir with
58
61
                        # the whole directory from the repo
59
 
                        return dst_type == 'd'
 
62
                        return dst.type == 'd'
60
63
 
61
64
                # entity has changed type?
62
 
                elif src_type != dst_type:
63
 
                        self.changed.append( "%s (now %s)" % (
64
 
                                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() ) )
65
68
 
66
69
                        # if an entity has changed to/from a directory, we don't care about
67
70
                        # anything that directory does/did contain
68
71
                        return False
69
72
 
 
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
 
70
89
                # nothing to see here
71
90
                return True