redo-stamp with REDO_NO_HASH workability fix

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 8749f093dfd8306e9dcb550182e292cf40eac707..30a5cd6520ff59b7e4c13010d7a2e5f22a788cdd 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -33,6 +33,10 @@ import (
        "golang.org/x/crypto/blake2b"
 )
 
+const EnvNoHash = "REDO_NO_HASH"
+
+var NoHash bool
+
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
        if _, err := w.RecordStart(); err != nil {
@@ -48,14 +52,14 @@ func ifcreate(fdDep *os.File, tgt string) error {
        trace(CDebug, "ifcreate: %s <- %s", fdDep.Name(), tgt)
        return recfileWrite(
                fdDep,
-               recfile.Field{Name: "Type", Value: "ifcreate"},
+               recfile.Field{Name: "Type", Value: DepTypeIfcreate},
                recfile.Field{Name: "Target", Value: tgt},
        )
 }
 
 func always(fdDep *os.File) error {
        trace(CDebug, "always: %s", fdDep.Name())
-       return recfileWrite(fdDep, recfile.Field{Name: "Type", Value: "always"})
+       return recfileWrite(fdDep, recfile.Field{Name: "Type", Value: DepTypeAlways})
 }
 
 func stamp(fdDep, src *os.File) error {
@@ -64,12 +68,16 @@ func stamp(fdDep, src *os.File) error {
        if err != nil {
                return err
        }
-       trace(CDebug, "stamp: %s <- %s", fdDep.Name(), hsh)
-       return recfileWrite(
-               fdDep,
-               recfile.Field{Name: "Type", Value: "stamp"},
+       fields := []recfile.Field{
+               recfile.Field{Name: "Type", Value: DepTypeStamp},
                recfile.Field{Name: "Hash", Value: hsh},
-       )
+       }
+       same := StampPrev == hsh
+       if same {
+               fields = append(fields, recfile.Field{Name: "Same", Value: "true"})
+       }
+       trace(CDebug, "stamp: %s <- %s (%v)", fdDep.Name(), hsh, same)
+       return recfileWrite(fdDep, fields...)
 }
 
 func fileCtime(fd *os.File) (string, error) {
@@ -105,7 +113,7 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
                return err
        }
        fields := []recfile.Field{
-               recfile.Field{Name: "Type", Value: "ifchange"},
+               recfile.Field{Name: "Type", Value: DepTypeIfchange},
                recfile.Field{Name: "Target", Value: tgt},
                recfile.Field{Name: "Ctime", Value: ts},
        }
@@ -117,8 +125,7 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
                }
                fields = append(fields, recfile.Field{Name: "Hash", Value: hsh})
        }
-       err = recfileWrite(fdDep, fields...)
-       return err
+       return recfileWrite(fdDep, fields...)
 }
 
 func writeDeps(fdDep *os.File, tgts []string) error {
@@ -127,7 +134,7 @@ func writeDeps(fdDep *os.File, tgts []string) error {
                return nil
        }
        ups := []string{}
-       upLevels := strings.Count(os.Getenv(RedoDirPrefixEnv), "/")
+       upLevels := strings.Count(os.Getenv(EnvDirPrefix), "/")
        for i := 0; i < upLevels; i++ {
                ups = append(ups, "..")
        }