bzr branch
http://bzr.ed.am/stdhome
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
1 |
# conflict.py |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
2 |
# |
3 |
# Copyright (C) 2013 to 2014 Tim Marston <tim@edm.am> |
|
4 |
# |
|
5 |
# This file is part of stdhome (hereafter referred to as "this program"). |
|
6 |
# See http://ed.am/dev/stdhome for more information. |
|
7 |
# |
|
8 |
# This program is free software: you can redistribute it and/or modify |
|
9 |
# it under the terms of the GNU General Public License as published by |
|
10 |
# the Free Software Foundation, either version 3 of the License, or |
|
11 |
# (at your option) any later version. |
|
12 |
# |
|
13 |
# This program is distributed in the hope that it will be useful, |
|
14 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
15 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
16 |
# GNU General Public License for more details. |
|
17 |
# |
|
18 |
# You should have received a copy of the GNU General Public License |
|
19 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
20 |
||
21 |
||
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
22 |
import filecmp, os |
88
by Tim Marston
python3ification |
23 |
from .walker import Walker |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
24 |
import stdhome.the as the |
25 |
||
26 |
||
27 |
class ConflictWalker( Walker ): |
|
28 |
"""The conflict walker traverses the repo looking for "deployment conflicts" |
|
29 |
(i.e., changes in the type of file). This is run prior to running the |
|
30 |
copy-out walker and, as such, is given a list of files that were copied-in |
|
6
by Tim Marston
renamed updated_files to affected_files |
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). |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
33 |
|
34 |
Walker source: repo |
|
35 |
Walker destination: home dir |
|
36 |
Walker traversing: repo |
|
37 |
""" |
|
38 |
||
27
by Tim Marston
got symlink accept lists working; fixed some walker bugs |
39 |
def __init__( self, ignore_files, walk_files = None ): |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
40 |
self.src_dir = the.repo.full_dir |
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
41 |
self.dst_dir = the.full_home_dir |
27
by Tim Marston
got symlink accept lists working; fixed some walker bugs |
42 |
self.walk_list = walk_files if walk_files is not None else \ |
82
by Tim Marston
added general reporting to CopyBase and configured it via copy-in and copy-out |
43 |
self.generate_walk_list( the.repo.full_dir ) |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
44 |
|
45 |
self.ignore_files = ignore_files |
|
46 |
self.changed = list() |
|
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
47 |
self.obstructed = list() |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
48 |
|
49 |
||
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
50 |
def process( self, rel_file, src, dst ): |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
51 |
|
52 |
# if entity is missing in home dir, it's ok to copy out (and there's no |
|
53 |
# need to recurse) |
|
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
54 |
if dst.type == '_': return False |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
55 |
|
56 |
# if entity was copied-in, it's ok to copy out |
|
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
57 |
elif rel_file in self.ignore_files: |
58 |
||
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
59 |
# we recurse only if this is a directory in the home dir, because if |
60 |
# it isn't copying-out will replace whatever's in the home dir with |
|
61 |
# the whole directory from the repo |
|
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
62 |
return dst.type == 'd' |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
63 |
|
64 |
# entity has changed type? |
|
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
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() ) ) |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
68 |
|
69 |
# if an entity has changed to/from a directory, we don't care about |
|
70 |
# anything that directory does/did contain |
|
71 |
return False |
|
72 |
||
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
73 |
# entity is a file (that wasn't copyied-in)? |
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
74 |
elif dst.type == 'f': |
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
75 |
|
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
76 |
# only a problem if its content is different |
77 |
if not filecmp.cmp( src.file, dst.file ): |
|
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
78 |
self.obstructed.append( rel_file ) |
79 |
return False |
|
80 |
||
81 |
# entity is a symlink (that wasn't copied-in)? |
|
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
82 |
if dst.type == 'l': |
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
83 |
|
84 |
# only a problem if the symlink is different |
|
16
by Tim Marston
walker now passes Walker.File objects to process(), which includes file name, |
85 |
if os.readlink( src.file ) != os.readlink( dst.file ): |
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
86 |
self.obstructed.append( rel_file ) |
87 |
return False |
|
88 |
||
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
89 |
# nothing to see here |
90 |
return True |