Mercurial > hg
comparison tests/test-command-template.t @ 23453:341e4798c24d
jsonchangeset: don't honor whitespace and format-changing diffopts
JSON is meant to be parsed by computers, and format changes can break them.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 18 Nov 2014 22:13:05 -0800 |
parents | 1533e642262d |
children | b9d06fa10ef2 |
comparison
equal
deleted
inserted
replaced
23452:86c0d8c1484f | 23453:341e4798c24d |
---|---|
520 "tags": ["tip"], | 520 "tags": ["tip"], |
521 "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], | 521 "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], |
522 "files": ["fourth", "second", "third"], | 522 "files": ["fourth", "second", "third"], |
523 "diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n", | 523 "diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n", |
524 "diff": "diff -r 29114dbae42b -r 95c24699272e fourth\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/fourth\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+second\ndiff -r 29114dbae42b -r 95c24699272e second\n--- a/second\tMon Jan 12 13:46:40 1970 +0000\n+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n@@ -1,1 +0,0 @@\n-second\ndiff -r 29114dbae42b -r 95c24699272e third\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/third\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+third\n" | 524 "diff": "diff -r 29114dbae42b -r 95c24699272e fourth\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/fourth\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+second\ndiff -r 29114dbae42b -r 95c24699272e second\n--- a/second\tMon Jan 12 13:46:40 1970 +0000\n+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n@@ -1,1 +0,0 @@\n-second\ndiff -r 29114dbae42b -r 95c24699272e third\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/third\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+third\n" |
525 } | |
526 ] | |
527 | |
528 honor --git but not format-breaking diffopts | |
529 $ hg --config diff.noprefix=True log --git -vpr . -Tjson | |
530 [ | |
531 { | |
532 "rev": 8, | |
533 "node": "95c24699272ef57d062b8bccc32c878bf841784a", | |
534 "branch": "default", | |
535 "phase": "draft", | |
536 "user": "test", | |
537 "date": [1577872860, 0], | |
538 "desc": "third", | |
539 "bookmarks": [], | |
540 "tags": ["tip"], | |
541 "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], | |
542 "files": ["fourth", "second", "third"], | |
543 "diff": "diff --git a/second b/fourth\nrename from second\nrename to fourth\ndiff --git a/third b/third\nnew file mode 100644\n--- /dev/null\n+++ b/third\n@@ -0,0 +1,1 @@\n+third\n" | |
525 } | 544 } |
526 ] | 545 ] |
527 | 546 |
528 $ hg log -T json | 547 $ hg log -T json |
529 [ | 548 [ |