Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Diff transcript shows correct order #81

Merged
merged 1 commit into from
Apr 10, 2017
Merged

Diff transcript shows correct order #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/scala/scala/tools/partest/nest/Runner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,11 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner, val nestUI: NestU
b.toList
}

// diff logfile checkfile
def currentDiff = {
val logged = file2String(logFile).linesIfNonEmpty.toList
val (other, othername) = if (checkFile.canRead) (filteredCheck, checkFile.getName) else (Nil, "empty")
compareContents(original = other, revised = logged, originalName = othername, revisedName = logFile.getName)
val (checked, checkname) = if (checkFile.canRead) (filteredCheck, checkFile.getName) else (Nil, "empty")
compareContents(original = logged, revised = checked, originalName = logFile.getName, revisedName = checkname)
}

val gitRunner = List("/usr/local/bin/git", "/usr/bin/git") map (f => new java.io.File(f)) find (_.canRead)
Expand Down Expand Up @@ -392,8 +393,11 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner, val nestUI: NestU
val bestDiff =
if (updating.isEmpty) ""
else if (checkFile.canRead)
withTempFile(outFile, fileBase, filteredCheck) { f =>
gitDiff(logFile, f) getOrElse f"diff $logFile $checkFile%n$diff"
gitRunner match {
case None => diff
case _ => withTempFile(outFile, fileBase, filteredCheck) { f =>
gitDiff(logFile, f) getOrElse diff
}
}
else diff
_transcript append bestDiff
Expand Down