# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1608347244 -32400
# Node ID 0c320e6032f143a9a4fd0864a903119d93e50ed3
# Parent  300f6e23882a1f1b292f68f4db1badebc9b5cd9f
chg: format code by clang-format version 11.0.1-+rc1-1

test-check-clang-format.t started failing on my Debian sid environment, and
new style looks slightly better. So let's bump the required clang-format
version to 11.

diff -r 300f6e23882a -r 0c320e6032f1 contrib/chg/chg.c
--- a/contrib/chg/chg.c	Sat Dec 19 12:01:58 2020 +0900
+++ b/contrib/chg/chg.c	Sat Dec 19 12:07:24 2020 +0900
@@ -451,9 +451,10 @@
  */
 static int isunsupported(int argc, const char *argv[])
 {
-	enum { SERVE = 1,
-	       DAEMON = 2,
-	       SERVEDAEMON = SERVE | DAEMON,
+	enum {
+		SERVE = 1,
+		DAEMON = 2,
+		SERVEDAEMON = SERVE | DAEMON,
 	};
 	unsigned int state = 0;
 	int i;
diff -r 300f6e23882a -r 0c320e6032f1 contrib/chg/hgclient.c
--- a/contrib/chg/hgclient.c	Sat Dec 19 12:01:58 2020 +0900
+++ b/contrib/chg/hgclient.c	Sat Dec 19 12:07:24 2020 +0900
@@ -26,15 +26,16 @@
 #include "procutil.h"
 #include "util.h"
 
-enum { CAP_GETENCODING = 0x0001,
-       CAP_RUNCOMMAND = 0x0002,
-       /* cHg extension: */
-       CAP_ATTACHIO = 0x0100,
-       CAP_CHDIR = 0x0200,
-       CAP_SETENV = 0x0800,
-       CAP_SETUMASK2 = 0x1000,
-       CAP_VALIDATE = 0x2000,
-       CAP_SETPROCNAME = 0x4000,
+enum {
+	CAP_GETENCODING = 0x0001,
+	CAP_RUNCOMMAND = 0x0002,
+	/* cHg extension: */
+	CAP_ATTACHIO = 0x0100,
+	CAP_CHDIR = 0x0200,
+	CAP_SETENV = 0x0800,
+	CAP_SETUMASK2 = 0x1000,
+	CAP_VALIDATE = 0x2000,
+	CAP_SETPROCNAME = 0x4000,
 };
 
 typedef struct {
diff -r 300f6e23882a -r 0c320e6032f1 tests/hghave.py
--- a/tests/hghave.py	Sat Dec 19 12:01:58 2020 +0900
+++ b/tests/hghave.py	Sat Dec 19 12:07:24 2020 +0900
@@ -594,8 +594,8 @@
 @check("clang-format", "clang-format C code formatter")
 def has_clang_format():
     m = matchoutput('clang-format --version', br'clang-format version (\d+)')
-    # style changed somewhere between 4.x and 6.x
-    return m and int(m.group(1)) >= 6
+    # style changed somewhere between 10.x and 11.x
+    return m and int(m.group(1)) >= 11
 
 
 @check("jshint", "JSHint static code analysis tool")