Further improve handling of symlink targets/deps.

In commit redo-0.11-4-g34669fb, we changed os.stat into os.lstat to
avoid false positives in the "manual override" detector: a .do file
that generates $3 as a symlink would trigger manual override if the
*target* of that symlink ever changed, which is incorrect.

Unfortunately using os.lstat() leads to a different problem: if X
depends on Y and Y is a symlink to Z, then X would not be rebuilt when
Z changes, which is clearly wrong.

The fix is twofold:

1. read_stamp() should change on changes to both the link itself,
   *and* the target of the link.

2. We shouldn't mark a target as overridden under so many situations.
   We'll use *only* the primary mtime of the os.lstat(), not all the
   other bits in the stamp.

Step 2 fixes a few other false positives also.  For example, if you
'cp -a' a whole tree to another location, the st_ino of all the targets
will change, which would trigger a mass of "manual override" warnings.
Although a change in inode is sufficient to count an input as having
changed (just to be extra safe), it should *not* be considered a manual
override.  Now we can distinguish between the two.

Because the stamp format has changed, update the SCHEMA_VER field.  I
should have done this every other time I changed the stamp format, but
I forgot.  Sorry.  That leads to spurious "manually modified" warnings
after upgrading redo.
This commit is contained in:
Avery Pennarun 2018-11-21 07:19:20 -05:00
commit 672b748394
9 changed files with 129 additions and 44 deletions

View file

@ -1,34 +1,73 @@
rm -f a a.extra b b.ran
d0=""
rm -f a a.ran a.final b b.ran *.[123] dir/*.[123]
mkdir -p dir
reads() {
aold=$aval
bold=$bval
read aval <a.ran || :
read bval <b.ran || :
}
# Basic setup should build a and b
aval=
bval=
redo a
redo-ifchange b
d1=$(cat b.ran)
[ "$d0" != "$d1" ] || exit 11
reads
[ "$aold" != "$aval" ] || exit 11
[ "$bold" != "$bval" ] || exit 111
# b only rebuilds if a changes
../flush-cache
redo-ifchange b
d2=$(cat b.ran)
[ "$d1" = "$d2" ] || exit 12
reads
[ "$aold" = "$aval" ] || exit 12
[ "$bold" = "$bval" ] || exit 112
. ../skip-if-minimal-do.sh
# forcibly changing a should rebuild b.
# a is already symlink to a.extra, but redo shouldn't care about the
# target of symlinks, so it shouldn't freak out that a.extra has changed.
# Anyway, b should still rebuild because a was rebuilt.
# forcibly building a should trigger rebuild of b, which depends on it.
# Previous versions of redo would be upset that a.final had changed.
../flush-cache
redo a
redo-ifchange b
d3=$(cat b.ran)
[ "$d2" != "$d3" ] || exit 13
reads
[ "$aold" != "$aval" ] || exit 13
[ "$bold" != "$bval" ] || exit 113
# Explicitly check that changing a's symlink target (a.extra) does *not*
# trigger a rebuild of b, because b depends on the stamp of the symlink,
# not what the symlink points to. In redo, you declare dependencies on
# specific filenames, not the things they happen to refer to.
# a.final is the target of the a symlink. We should notice when it changes,
# even if a was not rebuilt. Although it does get rebuilt, because a's
# stamp is now different from the database.
echo xx >>a.final
../flush-cache
touch a.extra
redo-ifchange b
d4=$(cat b.ran)
[ "$d3" = "$d4" ] || exit 14
reads
[ "$aold" != "$aval" ] || exit 14
[ "$bold" != "$bval" ] || exit 114
# We should also notice if a.final is removed.
# Now a is a "dangling" symlink.
rm -f a.final
../flush-cache
redo-ifchange b
reads
[ "$aold" != "$aval" ] || exit 15
[ "$bold" != "$bval" ] || exit 115
# If the symlink becomes no-longer-dangling, that should be dirty too.
echo "splash" >a.final
../flush-cache
redo-ifchange b
reads
[ "$aold" != "$aval" ] || exit 16
[ "$bold" != "$bval" ] || exit 116
# We ought to know the difference between a, the symlink, and its target.
# If a is replaced with a.final directly, that's a change.
rm -f a
mv a.final a
../flush-cache
redo-ifchange b >/dev/null 2>&1 # hide "you changed it" message
reads
[ "$aold" = "$aval" ] || exit 17 # manual override prevented rebuild
[ "$bold" != "$bval" ] || exit 117