From 21a4f62c614f19f6717e6161ec049628aa119f52 Mon Sep 17 00:00:00 2001 From: Alain Jobart Date: Fri, 19 Jul 2013 10:53:25 -0700 Subject: [PATCH] Removing mercurial references. --- bootstrap.sh | 6 ------ misc/{hg => }/gofmt-all | 0 misc/hg/gofmt-hook | 12 ------------ misc/hg/hooks.hgrc | 3 --- misc/hg/linear-tree-hook | 10 ---------- 5 files changed, 31 deletions(-) rename misc/{hg => }/gofmt-all (100%) delete mode 100755 misc/hg/gofmt-hook delete mode 100644 misc/hg/hooks.hgrc delete mode 100755 misc/hg/linear-tree-hook diff --git a/bootstrap.sh b/bootstrap.sh index ec370ed4ce8..09306c5071f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -11,12 +11,6 @@ fi . ./dev.env -diff misc/hg/hooks.hgrc .hg/hgrc | grep -qle '<' -if [ $? != 1 ]; then - echo "installing hgrc hooks" - cat misc/hg/hooks.hgrc >> .hg/hgrc -fi - mkdir -p $VTROOT/dist mkdir -p $VTROOT/bin mkdir -p $VTROOT/lib diff --git a/misc/hg/gofmt-all b/misc/gofmt-all similarity index 100% rename from misc/hg/gofmt-all rename to misc/gofmt-all diff --git a/misc/hg/gofmt-hook b/misc/hg/gofmt-hook deleted file mode 100755 index 91c5dcbc309..00000000000 --- a/misc/hg/gofmt-hook +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -fmt_errs=$(hg st -A | awk '$1 ~ /[ACM]/ && $2 ~ /go$/ { print $2 }' | xargs gofmt -l) -#fmt_errs=$(find . -name '*.go' -exec gofmt -l {} \;) -err_count=$(echo $fmt_errs | awk '{print NF}') - -if [ "$err_count" != 0 ]; then - echo "gofmt errors: $err_count" >&2 - echo "$fmt_errs" >&2 - echo "run ./misc/hg/gofmt-all to fix" >&2 - exit 1 -fi diff --git a/misc/hg/hooks.hgrc b/misc/hg/hooks.hgrc deleted file mode 100644 index f14f9b8ace4..00000000000 --- a/misc/hg/hooks.hgrc +++ /dev/null @@ -1,3 +0,0 @@ -[hooks] -pre-commit.gofmt = ./misc/hg/gofmt-hook -pretxncommit.gofmt = ./misc/hg/gofmt-hook diff --git a/misc/hg/linear-tree-hook b/misc/hg/linear-tree-hook deleted file mode 100755 index 07bb0c92eb4..00000000000 --- a/misc/hg/linear-tree-hook +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -changelog_count=$(hg outgoing | grep '^changeset:' | wc -l) -non_merge_count=$(hg outgoing -M | grep '^changeset:' | wc -l) - -if [ $changelog_count != $non_merge_count ]; then - echo "outgoing files contain merges - reapply as a fresh patch" >&2 - echo "run ./misc/hg/reapply-outgoing to fix" >&2 - exit 1 -fi