From 8f57e0efb3fb38e2edd58fddfdfa58bebad9f105 Mon Sep 17 00:00:00 2001
From: Roger Peppe <rogpeppe@gmail.com>
Date: Mon, 30 Oct 2017 14:24:04 +0000
Subject: [PATCH] diff: fix time format

It seems that the fractional seconds part is optional, so change the format to accept seconds.

Here's a sample diff output by the bzr command which fails to parse currently.

I started adding a test, but it involves more time than I have to spend right now, as the tests rely on reflect.DeepEquals working on time.Time instances, which won't work in general due to monotonic time. I'd suggest using https://godoc.org/github.com/google/go-cmp/cmp#Diff instead.

	=== modified file 'encode.go'
	--- encode.go	2011-11-24 19:47:20 +0000
	+++ encode.go	2011-11-28 13:24:31 +0000
	@@ -250,8 +250,7 @@
	 	e.emitScalar("null", "", "", C.YAML_PLAIN_SCALAR_STYLE)
	 }

	-func (e *encoder) emitScalar(value, anchor, tag string,
	-	style C.yaml_scalar_style_t) {
	+func (e *encoder) emitScalar(value, anchor, tag string, style C.yaml_scalar_style_t) {
	 	var canchor, ctag, cvalue *C.yaml_char_t
	 	var cimplicit C.int
	 	var free func()

	=== modified file 'encode_test.go'
	--- encode_test.go	2011-11-24 19:47:20 +0000
	+++ encode_test.go	2011-11-28 13:24:39 +0000
	@@ -76,6 +76,10 @@
	 		A int "a,omitempty"
	 		B int "b,omitempty"
	 	}{0, 0}},
	+	{"{}\n", &struct {
	+		A *struct{ X int } "a,omitempty"
	+		B int              "b,omitempty"
	+	}{nil, 0}},

	 	// Flow flag
	 	{"a: [1, 2]\n", &struct {

	=== modified file 'goyaml.go'
	--- goyaml.go	2011-11-24 19:47:20 +0000
	+++ goyaml.go	2011-11-28 13:24:39 +0000
	@@ -256,7 +256,7 @@
	 	switch v.Kind() {
	 	case reflect.String:
	 		return len(v.String()) == 0
	-	case reflect.Interface:
	+	case reflect.Interface, reflect.Ptr:
	 		return v.IsNil()
	 	case reflect.Slice:
	 		return v.Len() == 0
---
 diff/diff.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diff/diff.go b/diff/diff.go
index 0f1c530..1457302 100644
--- a/diff/diff.go
+++ b/diff/diff.go
@@ -62,7 +62,7 @@ const hunkHeader = "@@ -%d,%d +%d,%d @@"
 // diffTimeFormat is the time format string for unified diff file
 // header timestamps. See
 // http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html.
-const diffTimeFormat = "2006-01-02 15:04:05.000000000 -0700"
+const diffTimeFormat = "2006-01-02 15:04:05.999999999 -0700"
 
 func (s *Stat) add(o Stat) {
 	s.Added += o.Added