From 33c7cd505b15343ab05bb5551df2ad30ebbd17ab Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 29 Dec 2015 18:33:43 +0000
Subject: [PATCH] MFstable/10 r292879:

MFC r265842,r266120,r266121,r266959,r267148,r269985,r281789,r282261,r285064:

r265842 (by eadler):

arcconfig: add one

Add a .arcconfig to allow arc to work in its usual way.

r266120 (by bapt):

Add project name to the arc config it is still required when arcanist is used with SVN

r266121 (by bapt):

Add the missing coma

r266959 (by eadler):

arc: add linting for python files

r267148 (by bapt):

Prevent arc commands from overwriting history

r269985 (by gjb):

Update the URL to the phabricator instance.

Sponsored by:	The FreeBSD Foundation

r281789 (by eadler):

phabricator related changes:
	- don't lint either contrib or crypto: these are both externally written
	  directories
	- add additional linters for spelling (check common typos like teh ->
	  the)
	- chmod linter checks for executible bit on bad files
	- merge-conflict checks for merge conflict tokens then may have been
	  resolved incorrectly
	- filename checks for back characters in filenames
	- json for json syntax correctness

	- remove history.immutable: it is meaningless on subversion, and causes
	  workflow problems when trying to use git.  It it set to 'true' by
	  default with hg

r282261 (by eadler):

Phabricator: enable "history.immutable":
	With certain arc workflows leaving history.immutable as false
	results in using the upstream template instead of our usual
	commit template.  Since the git workflow issues alluded to in my
	prior commit message can be worked around, set history.immutable
	once again.

r285064 (by mat):

Add repository.callsign, to help arcanist figure out what repo it's
doing things on when not using Subversion.

With hat:	phabric-admin@
Sponsored by:	Absolight


git-svn-id: svn://svn.freebsd.org/base/stable/9@292880 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 .arcconfig |  6 ++++++
 .arclint   | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 .arcconfig
 create mode 100644 .arclint

diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 000000000..54153b9bd
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,6 @@
+{
+	"project.name": "S",
+	"repository.callsign" : "S",
+	"phabricator.uri" : "https://reviews.freebsd.org/",
+	"history.immutable" : true
+}
diff --git a/.arclint b/.arclint
new file mode 100644
index 000000000..31bda09b1
--- /dev/null
+++ b/.arclint
@@ -0,0 +1,25 @@
+{
+  "exclude": "(contrib|crypto)",
+  "linters": {
+    "python": {
+      "type": "pep8",
+      "include": "(\\.py$)"
+    },
+    "spelling": {
+      "type": "spelling"
+    },
+    "chmod": {
+      "type": "chmod"
+    },
+    "merge-conflict": {
+      "type": "merge-conflict"
+    },
+    "filename": {
+      "type": "filename"
+    },
+    "json": {
+      "type": "json",
+      "include": "(\\.arclint|\\.json$)"
+    }
+  }
+}
-- 
2.45.0