[pull] master from FreeCAD:master

.clang-format

@@ -4,16 +4,18 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: None
 AlignOperands: DontAlign
-AllowAllParametersOfDeclarationOnNextLine: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Empty
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
-AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
+BinPackParameters: false
 BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: false
@@ -25,13 +27,13 @@ BraceWrapping:
   AfterNamespace: true
   AfterUnion: true
   BeforeCatch: true
-  BeforeElse: false
+  BeforeElse: true
   IndentBraces: false
   SplitEmptyFunction: false
   SplitEmptyRecord: true
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeColon
+BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeColon
 ColumnLimit: 100
 CompactNamespaces: false
@@ -47,7 +49,8 @@ ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PackConstructorInitializers: Never
 PointerAlignment: Left
-ReflowComments: false
+ReflowComments: true
+SortIncludes: Never
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
@@ -58,7 +61,7 @@ SpaceBeforeInheritanceColon: false
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 0
+SpacesBeforeTrailingComments: 2
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false

.clang-tidy

@@ -1,8 +1,8 @@
 ---
 Checks:          'clang-diagnostic-*,clang-analyzer-*,boost-*,bugprone-*,
-performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,
+performance-*,readability-*,portability-*,modernize-*,cppcoreguidelines-*,google-explicit-constructor,
 concurrency-*,-modernize-use-trailing-return-type, -modernize-use-nodiscard,
--readability-redundant-access-specifiers'
+-readability-redundant-access-specifiers,-readability-qualified-auto'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false

.git-blame-ignore-revs

@@ -63,4 +63,38 @@ b389f6e602eb42c07c21f37fbcd451e28dd9fbc4
 48365a1df5286c7a5608cd3a5cce0def5e4d5380
 dc5b3cb495002951c3a36c928c55108b0999bc3e
 875f9eaad6a59abd70775c0b67a7f10d92128a5a
-7a8a453746a8e4a845219948591fd17f4494a067
+7a8a453746a8e4a845219948591fd17f4494a067
+8b31d7deb09077bc0cce0ecf6de02c94db262a67
+4a7e1b6d9b12df211cf6fbec61cc8544e4c6bf9d
+129d5882a729327a72b57ec695bb376e84205bd0
+2ae7cc4a94c1ab1dfc0264367c5da4716ea02bfe
+987b4bda2ac8570969dc07fa887bda420f77e441
+ec899d75c6abf45d7ee4dd91ea0f8141a9818446
+233a337ca5d693e4773fecf1de14325752afd658
+9271b6d433578f65df9b469131ece4e4bdbb19aa
+2637527e3a4e132506e8c074b752721d66ae146a
+7681c62468d7b6f4d8af6758324b9ec983340b97 # Test: apply clang format
+4919fa18ff7f9a4cdfdd7896d768c2342e5f9f37 # Surface: apply clang format
+791fe029341aa1dda42376620d52c67ecaca7eea # Sketcher: Reformat to current clang-format standard
+0a8292a850b98d2e66e08e235dfb81b6e7285df1 # Web: apply clang format
+1a960286a4a549a6454155481ce51cad88a51745 # Tests: Reformat to current clang-format standard
+c1825036a6dfd44576da6157bde9fa2fab724d55 # Tools: Reformat to current clang-format standard
+17bf44ec9a5fd7a8f1c7bf0d3c24d63b6c808dbd # Start: apply clang format
+89579cff6e8834e296d5efe6292f019fadedce53 # Addon Manager: Reformat with new Black line length
+c989a8506ecc26e3172c0d18ce4d0f710b5c7d92 # RE: apply clang format
+c6bc17ffc13aee4d38d2938800ef5002fc874fc3 # RE: apply clang format
+6fb2bcafe85eb6bb0c625f37f233b0b09e093963 # MeshPart: apply clang format
+c2bda2f75684ed8bb64813d4a92a5a595181f556 # MeshPart: apply clang format
+ea116dc0332ccfc5797f248b04492a16f421b787 # Inspection: apply clang format
+8d24f0c021a04f19f5463a52e3be1af60fb892f1 # Points: apply clang-formatting
+e3de4f217c4f028523adcb5cb566f4d6a7957abe # minor reformat: break lines, one per item
+d57d14321b408beef7b115331e2cfa7215f59b8a # Web: Final application of pre-commit
+efd11e590d28d72e350b72f02f3f599ef4f704f4 # Test: Final application of pre-commit
+217674de04533afb81da0968483dd5a6c4d88667 # Surface: Final application of pre-commit
+70e046bbd5a7214b5d5ae8f12da5aed502dc89ab # Start: Final application of pre-commit
+db24eeec535f1f43fb3d5b63d24c5171af637880 # RE: Final application of pre-commit
+714cb0a309e243cfb035b046dd8cc543ac514cd2 # Points: Final application of pre-commit
+7593f0c112198a0cf033a0bcf8d55db4e0a0e3f5 # MeshPart: Final application of pre-commit
+b8f8b232cb0882d171cb299e6f6279a516cdd6eb # Inspection: Final application of pre-commit
+c5c2ea3498f402c0c89916c46ddb071e22756622 # Assembly: Final application of pre-commit
+592c992b863549fde52741fd8830418168387695 # Assembly: Apply pre-commit to Assembly files

.github/ISSUE_TEMPLATE/BACKPORT_REQUEST.yml

@@ -0,0 +1,19 @@
+name: Request a Backport
+description: Suggest that a commit from the main development branch be backported to the next point release
+title: "[Backport] "
+labels: ["needs triage", "backport"]
+body:
+  - type: input
+    id: pull_request
+    attributes:
+      label: Original PR
+      description: A link to the PR that contains the commits to be backported
+      placeholder: https://github.com/FreeCAD/FreeCAD/pulls/1234
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description and Justification
+      description: Why should this PR (or individual commit) be backported?
+      placeholder: Please explain why this PR or commit should be backported to the next point release.

.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml

@@ -1,5 +1,5 @@
 name: Report a Problem
-description: File an problem report
+description: Have you found something that does not work well, is too hard to do or is missing altogether? Please create a Problem Report.
 title: "[Problem] "
 labels: ["needs triage"]
 body:
@@ -11,14 +11,12 @@ body:
       options:
       - label: I have searched the existing issues
         required: true
-  - type: dropdown
-    id: version
+  - type: textarea
+    id: description
     attributes:
-      label: Version
-      description: What version of FreeCAD are you running?
-      options:
-        - 0.20 (Release)
-        - 0.21 (Development)
+      label: Problem description
+      description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error.
+      placeholder: Description of the problem
     validations:
       required: true
   - type: textarea
@@ -51,21 +49,13 @@ body:
         - Spreadsheet
         - Techdraw
         - Other (specify in description)
-  - type: textarea
-    id: description
-    attributes:
-      label: Problem description
-      description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error.  
-      placeholder: Description of the problem
-    validations:
-      required: true
   - type: textarea
     id: anything_else
     attributes:
       label: Anything else?
       description: |
         Links? References? Anything that will give us more context about the issue you are encountering!
-        If there is a discussion about the problem on the forum, provide link(s) here. 
+        If there is a discussion about the problem on the forum, provide link(s) here.
 
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. To attach a FCStd file, ZIP it first (GitHub won't recognize the extension otherwise).
     validations: