From 1a35367e1282e27a49636ca6aab3ce80ef4db150 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Wed, 11 Nov 2020 23:52:56 -0500
Subject: [PATCH] Adds show working tree changes to settings UI

---
 package.json                                       |  2 +-
 .../apps/settings/partials/views.commits.html      |  2 +-
 .../apps/settings/partials/views.repositories.html | 75 +++++++++++++---------
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 22e2d0e..9fe2577 100644
--- a/package.json
+++ b/package.json
@@ -1982,7 +1982,7 @@
 				},
 				"gitlens.views.repositories.includeWorkingTree": {
 					"type": "boolean",
-					"default": true,
+					"default": false,
 					"markdownDescription": "Specifies whether to include working tree file status for each repository in the _Repositories_ view",
 					"scope": "window"
 				},
diff --git a/src/webviews/apps/settings/partials/views.commits.html b/src/webviews/apps/settings/partials/views.commits.html
index 92442cf..bc01eb9 100644
--- a/src/webviews/apps/settings/partials/views.commits.html
+++ b/src/webviews/apps/settings/partials/views.commits.html
@@ -35,7 +35,7 @@
 								value="working"
 								data-setting
 							/>
-							<label for="views.commits.showBranchComparison">Show a comparison of the </label>
+							<label for="views.commits.showBranchComparison">Show a comparison of the</label>
 							<div class="select-container">
 								<select
 									id="views.commits.showBranchComparison"
diff --git a/src/webviews/apps/settings/partials/views.repositories.html b/src/webviews/apps/settings/partials/views.repositories.html
index 6b773ae..b3a06a3 100644
--- a/src/webviews/apps/settings/partials/views.repositories.html
+++ b/src/webviews/apps/settings/partials/views.repositories.html
@@ -28,6 +28,49 @@
 			<div class="section__content">
 				<div class="settings settings--fixed ml-1">
 					<div class="setting" data-enablement="views.repositories.enabled">
+						<div class="setting__input">
+							<input
+								id="views.repositories.autoRefresh"
+								name="views.repositories.autoRefresh"
+								type="checkbox"
+								data-setting
+								disabled
+							/>
+							<label for="views.repositories.autoRefresh"
+								>Automatically refresh when a repository or the file system changes</label
+							>
+						</div>
+					</div>
+
+					<div class="setting" data-enablement="views.repositories.enabled">
+						<div class="setting__input">
+							<input
+								id="views.repositories.autoReveal"
+								name="views.repositories.autoReveal"
+								type="checkbox"
+								data-setting
+								disabled
+							/>
+							<label for="views.repositories.autoReveal"
+								>Automatically reveal repository when opening files</label
+							>
+						</div>
+					</div>
+
+					<div class="setting" data-enablement="views.repositories.enabled">
+						<div class="setting__input">
+							<input
+								id="views.repositories.includeWorkingTree"
+								name="views.repositories.includeWorkingTree"
+								type="checkbox"
+								data-setting
+								disabled
+							/>
+							<label for="views.repositories.includeWorkingTree">Show working tree file changes</label>
+						</div>
+					</div>
+
+					<div class="setting" data-enablement="views.repositories.enabled">
 						<div class="setting__input setting__input--inner-select">
 							<input
 								id="views.repositories.showBranchComparison"
@@ -37,7 +80,7 @@
 								data-setting
 								disabled
 							/>
-							<label for="views.repositories.showBranchComparison">Show a comparison of the </label>
+							<label for="views.repositories.showBranchComparison">Show a comparison of the</label>
 							<div class="select-container">
 								<select
 									id="views.repositories.showBranchComparison"
@@ -210,36 +253,6 @@
 							<label for="views.repositories.avatars">Use author avatars</label>
 						</div>
 					</div>
-
-					<div class="setting" data-enablement="views.repositories.enabled">
-						<div class="setting__input">
-							<input
-								id="views.repositories.autoRefresh"
-								name="views.repositories.autoRefresh"
-								type="checkbox"
-								data-setting
-								disabled
-							/>
-							<label for="views.repositories.autoRefresh">
-								Automatically refreshes when the file system or any repository changes
-							</label>
-						</div>
-					</div>
-
-					<div class="setting" data-enablement="views.repositories.enabled">
-						<div class="setting__input">
-							<input
-								id="views.repositories.autoReveal"
-								name="views.repositories.autoReveal"
-								type="checkbox"
-								data-setting
-								disabled
-							/>
-							<label for="views.repositories.autoReveal">
-								Automatically reveal repositories when opening files
-							</label>
-						</div>
-					</div>
 				</div>
 			</div>