Mercurial > hg-stable

changeset 48294:e2836d08c88c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: with stable
author Augie Fackler <augie@google.com>
date Mon, 01 Nov 2021 14:59:07 -0400
parents 7a4d187479b6 (current diff) 1ff06ceb070f (diff)
children bf11ff22a9af
files
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/hghave.py	Fri Oct 22 09:45:35 2021 +0200
+++ b/tests/hghave.py	Mon Nov 01 14:59:07 2021 -0400
@@ -611,7 +611,14 @@
 def has_clang_format():
     m = matchoutput('clang-format --version', br'clang-format version (\d+)')
     # style changed somewhere between 10.x and 11.x
-    return m and int(m.group(1)) >= 11
+    if m:
+        return int(m.group(1)) >= 11
+    # Assist Googler contributors, they have a centrally-maintained version of
+    # clang-format that is generally very fresh, but unlike most builds (both
+    # official and unofficial), it does *not* include a version number.
+    return matchoutput(
+        'clang-format --version', br'clang-format .*google3-trunk \([0-9a-f]+\)'
+    )
 
 
 @check("jshint", "JSHint static code analysis tool")