diff -Nru hugo-0.25.1/appveyor.yml hugo-0.26/appveyor.yml
--- hugo-0.25.1/appveyor.yml 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/appveyor.yml 2017-08-07 07:09:19.000000000 +0000
@@ -8,6 +8,7 @@
clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo
install:
+ - git submodule update --init --recursive
- gem install asciidoctor
- pip install docutils
diff -Nru hugo-0.25.1/bench.sh hugo-0.26/bench.sh
--- hugo-0.25.1/bench.sh 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/bench.sh 2017-08-07 07:09:19.000000000 +0000
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+# allow user to override go executable by running as GOEXE=xxx make ...
+GOEXE="${GOEXE-go}"
# Convenience script to
# - For a given branch
@@ -26,10 +28,10 @@
PACKAGE=$2
git checkout $BRANCH
-go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
+"${GOEXE}" test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
git checkout master
-go test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
+"${GOEXE}" test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
-benchcmp /tmp/bench-$PACKAGE-master.txt /tmp/bench-$PACKAGE-$BRANCH.txt
\ No newline at end of file
+benchcmp /tmp/bench-$PACKAGE-master.txt /tmp/bench-$PACKAGE-$BRANCH.txt
diff -Nru hugo-0.25.1/benchSite.sh hugo-0.26/benchSite.sh
--- hugo-0.25.1/benchSite.sh 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/benchSite.sh 2017-08-07 07:09:19.000000000 +0000
@@ -1,9 +1,12 @@
#!/bin/bash
+# allow user to override go executable by running as GOEXE=xxx make ...
+GOEXE="${GOEXE-go}"
+
# Send in a regexp mathing the benchmarks you want to run, i.e. './benchSite.sh "YAML"'.
# Note the quotes, which will be needed for more complex expressions.
# The above will run all variations, but only for front matter YAML.
echo "Running with BenchmarkSiteBuilding/${1}"
-go test -run="NONE" -bench="BenchmarkSiteBuilding/${1}$" -test.benchmem=true ./hugolib -memprofile mem.prof -cpuprofile cpu.prof
\ No newline at end of file
+"${GOEXE}" test -run="NONE" -bench="BenchmarkSiteBuilding/${1}$" -test.benchmem=true ./hugolib -memprofile mem.prof -cpuprofile cpu.prof
diff -Nru hugo-0.25.1/CODEOWNERS hugo-0.26/CODEOWNERS
--- hugo-0.25.1/CODEOWNERS 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/CODEOWNERS 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# See https://github.com/blog/2392-introducing-code-owners
-
-# These owners will be the default owners for everything in the repo.
-* @bep
-
-tpl/* @moorereason @bep
-docs/* @digitalcraftsman
-snapcraft.yaml @anthonyfok
-Dockerfile @anthonyfok
-i18n/* @bogem
\ No newline at end of file
diff -Nru hugo-0.25.1/commands/hugo.go hugo-0.26/commands/hugo.go
--- hugo-0.25.1/commands/hugo.go 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/commands/hugo.go 2017-08-07 07:09:19.000000000 +0000
@@ -143,6 +143,7 @@
renderToMemory bool // for benchmark testing
verbose bool
verboseLog bool
+ debug bool
quiet bool
)
@@ -263,6 +264,7 @@
// init initializes flags.
func init() {
HugoCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
+ HugoCmd.PersistentFlags().BoolVarP(&debug, "debug", "", false, "debug output")
HugoCmd.PersistentFlags().BoolVar(&logging, "log", false, "enable Logging")
HugoCmd.PersistentFlags().StringVar(&logFile, "logFile", "", "log File path (if set, logging enabled automatically)")
HugoCmd.PersistentFlags().BoolVar(&verboseLog, "verboseLog", false, "verbose logging")
@@ -432,8 +434,15 @@
stdoutThreshold = jww.LevelInfo
}
+ if cfg.GetBool("debug") {
+ stdoutThreshold = jww.LevelDebug
+ }
+
if verboseLog {
logThreshold = jww.LevelInfo
+ if cfg.GetBool("debug") {
+ logThreshold = jww.LevelDebug
+ }
}
// The global logger is used in some few cases.
@@ -446,7 +455,7 @@
}
func (c *commandeer) initializeFlags(cmd *cobra.Command) {
- persFlagKeys := []string{"verbose", "logFile"}
+ persFlagKeys := []string{"debug", "verbose", "logFile"}
flagKeys := []string{
"cleanDestinationDir",
"buildDrafts",
diff -Nru hugo-0.25.1/commands/new.go hugo-0.26/commands/new.go
--- hugo-0.25.1/commands/new.go 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/commands/new.go 2017-08-07 07:09:19.000000000 +0000
@@ -347,7 +347,7 @@
homepage = "http://example.com/"
tags = []
features = []
-min_version = "0.25.1"
+min_version = "0.26"
[author]
name = ""
diff -Nru hugo-0.25.1/CONTRIBUTING.md hugo-0.26/CONTRIBUTING.md
--- hugo-0.25.1/CONTRIBUTING.md 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/CONTRIBUTING.md 2017-08-07 07:09:19.000000000 +0000
@@ -7,6 +7,10 @@
The Hugo community and maintainers are [very active](https://github.com/gohugoio/hugo/pulse/monthly) and helpful, and the project benefits greatly from this activity. We created a [step by step guide](https://gohugo.io/tutorials/how-to-contribute-to-hugo/) if you're unfamiliar with GitHub or contributing to open source projects in general.
+*Note that this repository only contains the actual source code of Hugo. For **only** documentation-related pull requests / issues please refer to the [hugoDocs](https://github.com/gohugoio/hugoDocs) repository.*
+
+*Pull requests that contain changes on the code base **and** related documentation, e.g. for a new feature, shall remain a single, atomic one.*
+
## Table of Contents
* [Asking Support Questions](#asking-support-questions)
@@ -93,7 +97,7 @@
### Fetch the Sources From GitHub
```
-go get github.com/kardianos/govendor
+go get -u github.com/kardianos/govendor
govendor get github.com/gohugoio/hugo
```
diff -Nru hugo-0.25.1/create/content_template_handler.go hugo-0.26/create/content_template_handler.go
--- hugo-0.25.1/create/content_template_handler.go 2017-07-14 12:59:47.000000000 +0000
+++ hugo-0.26/create/content_template_handler.go 2017-08-07 07:09:19.000000000 +0000
@@ -49,6 +49,7 @@
}
const (
+ // ArchetypeTemplateTemplate is used as inital template when adding an archetype template.
ArchetypeTemplateTemplate = `---
title: "{{ replace .TranslationBaseName "-" " " | title }}"
date: {{ .Date }}
@@ -123,7 +124,7 @@
if !bytes.Contains(archetypeContent, []byte("date")) || !bytes.Contains(archetypeContent, []byte("title")) {
// TODO(bep) remove some time in the future.
- s.Log.FEEDBACK.Println(fmt.Sprintf(`WARNING: date and/or title missing from archetype file %q.
+ s.Log.FEEDBACK.Println(fmt.Sprintf(`WARNING: date and/or title missing from archetype file %q.
From Hugo 0.24 this must be provided in the archetype file itself, if needed. Example:
%s
`, archetypeFilename, ArchetypeTemplateTemplate))
diff -Nru hugo-0.25.1/debian/changelog hugo-0.26/debian/changelog
--- hugo-0.25.1/debian/changelog 2017-08-03 08:06:42.000000000 +0000
+++ hugo-0.26/debian/changelog 2017-11-13 18:45:19.000000000 +0000
@@ -1,3 +1,24 @@
+hugo (0.26-1) unstable; urgency=medium
+
+ * New upstream version 0.26
+ * Update dependencies:
+ - Replace golang-github-bep-inflect-dev with
+ golang-github-markbates-inflect-dev
+ - Add golang-github-jdkato-prose-dev
+ * Update Files listing in debian/copyright
+ * Upgrade debian/watch to version 4 format
+ * Reformat debian/control with "cme fix dpkg", and bump Standards-Version
+ to 4.1.1: Change -dev package priority from extra to optional
+ * Refresh 002-do-not-use-git-information-in-docs.patch
+ * Delete 003-accommodate-gccgo-in-TestMethodToName.patch which has been
+ accepted upstream, see https://github.com/gohugoio/hugo/pull/3747
+ * Delete 001-disable-google-analytics-in-docs.patch
+ which cannot be applied to Hugo's revamped documentation
+ * Disable "hugo -s docs" run because Git submodule
+ docs/themes/gohugoioTheme is not checked out
+
+ -- Anthony Fok