gitutils: add diffStrings, diffFiles, and use it in testament to compare expected vs gotten (#17892)
* gitutils: add diffStrings, diffFiles, and use it in testament to compare expected vs gotten * refactor with createTempDir * cleanup * refacotr * PRTEMP fake test spec changes to show effect of diffStrings * add runnableExamples for experimental/diff + cross-reference with gitutils * Revert "PRTEMP fake test spec changes to show effect of diffStrings" This reverts commit 57dc8d642dce6c1127c98b7cbc9edbfe747d4047.
This commit is contained in:
parent
1640508348
commit
20248a68fd
8 changed files with 99 additions and 52 deletions
|
|
@ -4,7 +4,7 @@ internal API for now, API subject to change
|
|||
|
||||
# xxx move other git utilities here; candidate for stdlib.
|
||||
|
||||
import std/[os, osproc, strutils]
|
||||
import std/[os, osproc, strutils, tempfiles]
|
||||
|
||||
const commitHead* = "HEAD"
|
||||
|
||||
|
|
@ -38,3 +38,41 @@ proc isGitRepo*(dir: string): bool =
|
|||
# usually a series of ../), so we know that it's safe to unconditionally
|
||||
# remove trailing whitespaces from the result.
|
||||
result = status == 0 and output.strip() == ""
|
||||
|
||||
proc diffFiles*(path1, path2: string): tuple[output: string, same: bool] =
|
||||
## Returns a human readable diff of files `path1`, `path2`, the exact form of
|
||||
## which is implementation defined.
|
||||
# This could be customized, e.g. non-git diff with `diff -uNdr`, or with
|
||||
# git diff options (e.g. --color-moved, --word-diff).
|
||||
# in general, `git diff` has more options than `diff`.
|
||||
var status = 0
|
||||
(result.output, status) = execCmdEx("git diff --no-index $1 $2" % [path1.quoteShell, path2.quoteShell])
|
||||
doAssert (status == 0) or (status == 1)
|
||||
result.same = status == 0
|
||||
|
||||
proc diffStrings*(a, b: string): tuple[output: string, same: bool] =
|
||||
## Returns a human readable diff of `a`, `b`, the exact form of which is
|
||||
## implementation defined.
|
||||
## See also `experimental.diff`.
|
||||
runnableExamples:
|
||||
let a = "ok1\nok2\nok3\n"
|
||||
let b = "ok1\nok2 alt\nok3\nok4\n"
|
||||
let (c, same) = diffStrings(a, b)
|
||||
doAssert not same
|
||||
let (c2, same2) = diffStrings(a, a)
|
||||
doAssert same2
|
||||
runnableExamples("-r:off"):
|
||||
let a = "ok1\nok2\nok3\n"
|
||||
let b = "ok1\nok2 alt\nok3\nok4\n"
|
||||
echo diffStrings(a, b).output
|
||||
|
||||
template tmpFileImpl(prefix, str): auto =
|
||||
let path = genTempPath(prefix, "")
|
||||
writeFile(path, str)
|
||||
path
|
||||
let patha = tmpFileImpl("diffStrings_a_", a)
|
||||
let pathb = tmpFileImpl("diffStrings_b_", b)
|
||||
defer:
|
||||
removeFile(patha)
|
||||
removeFile(pathb)
|
||||
result = diffFiles(patha, pathb)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue