Edit and Reformat Patches with Cursor Indicator patch

patches/0001-BLENDER-Blender-ID-goth-provider.patch

@@ -1,7 +1,7 @@
-From 15a25804e98da3c122082c62d16b2d1ce4374eb9 Mon Sep 17 00:00:00 2001
+From e9a48aadbffbb3002311cc6e947053030ee9ecc5 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:28:51 +0200
-Subject: [PATCH 01/14] BLENDER: Blender ID goth provider
+Subject: [PATCH 01/18] BLENDER: Blender ID goth provider
 
 Provider authored by Matti Ranta and Arnd Marijnissen.
 ---
@@ -25,7 +25,7 @@ Provider authored by Matti Ranta and Arnd Marijnissen.
  create mode 100644 services/auth/source/oauth2/blenderid/session_test.go
 
 diff --git a/go.mod b/go.mod
-index 422952af9e..98a7954b3c 100644
+index 1ca481e073..086701b536 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -257,6 +257,7 @@ require (
@@ -37,10 +37,10 @@ index 422952af9e..98a7954b3c 100644
  	github.com/mschoch/smat v0.2.0 // indirect
  	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 diff --git a/go.sum b/go.sum
-index e7f6b7c6d9..4b8b54d3fc 100644
+index ebf40cb628..aed57d8836 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -588,6 +588,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
+@@ -589,6 +589,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
  github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
  github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
@@ -242,7 +242,7 @@ index 0000000000..671e5e4f54
 +}
 diff --git a/services/auth/source/oauth2/blenderid/blenderid_test.go b/services/auth/source/oauth2/blenderid/blenderid_test.go
 new file mode 100644
-index 0000000000..2bf4c443d8
+index 0000000000..283ba0898a
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/blenderid_test.go
 @@ -0,0 +1,70 @@
@@ -510,7 +510,7 @@ index 0000000000..52a2d21745
 +}
 diff --git a/services/auth/source/oauth2/blenderid/session_test.go b/services/auth/source/oauth2/blenderid/session_test.go
 new file mode 100644
-index 0000000000..ab7fb974a5
+index 0000000000..7f5b619873
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/session_test.go
 @@ -0,0 +1,51 @@
@@ -593,5 +593,5 @@ index 65cf538ad7..f6f49ada04 100644
 +		}))
  }
 -- 
-2.47.1
+2.49.0
 

patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch

@@ -1,7 +1,7 @@
-From 1b1e8781449eef734dbd5addd81be079436db600 Mon Sep 17 00:00:00 2001
+From 928a045c583cc4f0c631925e848a81446728f52b Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:31:35 +0200
-Subject: [PATCH 02/14] BLENDER: Show warning for target branch switching
+Subject: [PATCH 02/18] BLENDER: Show warning for target branch switching
 
 ---
  templates/repo/issue/view_title.tmpl | 1 +
@@ -20,5 +20,5 @@ index 7bb00ff9a9..19a4331883 100644
  				{{end}}
  			{{else}}
 -- 
-2.47.1
+2.49.0
 

patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch

@@ -1,7 +1,7 @@
-From 4cf49edf4de94065e9ad6e24c4482c2054d6eece Mon Sep 17 00:00:00 2001
+From e19c11cbfe0e7f278aae17cd512560cfc237c00d Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:32:53 +0200
-Subject: [PATCH 03/14] BLENDER: Workaround LFS files not being available in
+Subject: [PATCH 03/18] BLENDER: Workaround LFS files not being available in
  pull requests
 
 Patch taken from issue number 17715, associating the LFS pointer when the
@@ -56,5 +56,5 @@ index c4866edaab..1fa2b7a67f 100644
  				err = &lfs_module.ObjectError{
  					Code:    http.StatusNotFound,
 -- 
-2.47.1
+2.49.0
 

patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch

@@ -1,7 +1,7 @@
-From f30536bba66c393e59822cbd9c194017d174a3b5 Mon Sep 17 00:00:00 2001
+From a0a9521bb42deea2ca46a65f64ddc95a5db795f3 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:33:32 +0200
-Subject: [PATCH 04/14] BLENDER: Don't allow assigning large teams as reviewers
+Subject: [PATCH 04/18] BLENDER: Don't allow assigning large teams as reviewers
 
 To avoid accidentally spamming hundreds of people.
 ---
@@ -66,5 +66,5 @@ index bf0d8cb298..c3b0858aa3 100644
 +	return organization.FilterLargeTeams(organization.GetTeamsWithAccessToRepoUnit(ctx, repo.OwnerID, repo.ID, perm.AccessModeRead, unit.TypePullRequests))
  }
 -- 
-2.47.1
+2.49.0
 

patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch

@@ -1,7 +1,7 @@
-From b7ab7d82754fd5d7ea154d31f991a5da206d96a1 Mon Sep 17 00:00:00 2001
+From 21206ca6201d4b510cffc0068aabd785f5864850 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:58:05 +0200
-Subject: [PATCH 05/14] BLENDER: Support both exclusive and non-exclusive scope
+Subject: [PATCH 05/18] BLENDER: Support both exclusive and non-exclusive scope
  for labels
 
 ---
@@ -149,5 +149,5 @@ index 9b6195a8f4..c8310203c4 100644
  					{{end}}
  				</div>
 -- 
-2.47.1
+2.49.0
 

patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch

@@ -1,7 +1,7 @@
-From fd09d4851658310327e2e110e16963226fdd5954 Mon Sep 17 00:00:00 2001
+From dc145e6f21466387dde81ce41664c4100ee271bb Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 14:00:36 +0200
-Subject: [PATCH 06/14] BLENDER: Projects: button to show/hide issue details
+Subject: [PATCH 06/18] BLENDER: Projects: button to show/hide issue details
  and closed issue
 
 Both are off by default. This is implemented fully on the frontend, so
@@ -14,7 +14,7 @@ all issues and their details are still always loaded.
  4 files changed, 59 insertions(+), 13 deletions(-)
 
 diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
-index 966d3bf604..7f97b13c7d 100644
+index 217ffe6355..9640deee94 100644
 --- a/templates/projects/view.tmpl
 +++ b/templates/projects/view.tmpl
 @@ -19,6 +19,16 @@
@@ -46,7 +46,7 @@ index 966d3bf604..7f97b13c7d 100644
 @@ -178,6 +188,37 @@
  	</div>
  </div>
-
+ 
 +<script>
 +	keyDetails = 'project-show-issue-details:{{.Repository.FullName | JSEscape}}:{{.Project.ID}}';
 +	keyClosed = 'project-show-issue-closed:{{.Repository.FullName | JSEscape}}:{{.Project.ID}}';
@@ -138,7 +138,7 @@ index 2e19e86d7a..e27cf1cbb7 100644
  			</div>
  		{{end}}
  	</div>
-
+ 
 -	{{if or .Labels .Assignees}}
 +	{{if or .Labels}}
  	<div class="issue-card-bottom">
@@ -157,10 +157,10 @@ index 2e19e86d7a..e27cf1cbb7 100644
  	{{end}}
  {{end}}
 diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css
-index 9d462c4c4a..1eafbed75e 100644
+index ef3b036217..ca5057118f 100644
 --- a/web_src/css/features/projects.css
 +++ b/web_src/css/features/projects.css
-@@ -28,7 +28,7 @@
+@@ -16,7 +16,7 @@
    padding: 0.5rem !important;
    width: 320px;
    height: initial;
@@ -181,5 +181,5 @@ index fb832bd05a..4fb9b42f46 100644
 +  margin-left: 0.5em;
  }
 -- 
-2.47.1
+2.49.0
 

patches/0007-BLENDER-Lazy-pull-request-checking.patch

@@ -1,7 +1,7 @@
-From b22cd3a41db335712186cb1bf4c57b9e96ac0dee Mon Sep 17 00:00:00 2001
+From c7ff5bb517d85240efd8915ac065021329e38a7a Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 14:02:04 +0200
-Subject: [PATCH 07/14] BLENDER: Lazy pull request checking
+Subject: [PATCH 07/18] BLENDER: Lazy pull request checking
 
 Delay conflict checking of PRs that had no update in last 24h until page load.
 This solves the problem where after every commit to main, it takes a long time
@@ -118,10 +118,10 @@ index baca1511a2..af19214412 100644
  			if err := prPatchCheckerQueue.Push(strconv.FormatInt(prID, 10)); err != nil {
  				log.Error("Error adding PR[%d] to the pull requests patch checking queue %v", prID, err)
 diff --git a/services/pull/pull.go b/services/pull/pull.go
-index 98bd28a4a5..87a5d40f7c 100644
+index 11718c2f87..d856e505ef 100644
 --- a/services/pull/pull.go
 +++ b/services/pull/pull.go
-@@ -455,7 +455,7 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
+@@ -479,7 +479,7 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
  					log.Error("UpdateCommitDivergence: %v", err)
  				}
  			}
@@ -131,5 +131,5 @@ index 98bd28a4a5..87a5d40f7c 100644
  	})
  }
 -- 
-2.47.1
+2.49.0
 

patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch

@@ -1,7 +1,7 @@
-From 91fecdeb64112cfbf99eea85a9c87739863a476c Mon Sep 17 00:00:00 2001
+From 619f7a041405989c2e1b7fec3cdff6783384f26d Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 14:04:02 +0200
-Subject: [PATCH 08/14] BLENDER: Remember login for OAuth / Blender ID
+Subject: [PATCH 08/18] BLENDER: Remember login for OAuth / Blender ID
 
 Otherwise for some browsers, users have to login again for every session.
 ---
@@ -41,5 +41,5 @@ index 75f94de0ed..5b58bc6337 100644
  		ctx.Csrf.PrepareForSessionUser(ctx)
 
 -- 
-2.47.1
+2.49.0
 

patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch

@@ -1,15 +1,15 @@
-From c91d42fa91177ce42cd01aee0e1d09d26f8dda47 Mon Sep 17 00:00:00 2001
+From d5dd5fed65a963e7564f00f9ec4bc80cd6b00519 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 14:04:49 +0200
-Subject: [PATCH 09/14] BLENDER: Always login with Blender ID, unless
+Subject: [PATCH 09/18] BLENDER: Always login with Blender ID, unless
  noredirect is specified
 
 ---
  routers/web/auth/auth.go | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
-index 8ddb9730c3..99c423e782 100644
+index ee70889a53..2910d7bc39 100644
 --- a/routers/web/auth/auth.go
 +++ b/routers/web/auth/auth.go
 @@ -160,6 +160,26 @@ func CheckAutoLogin(ctx *context.Context) bool {
@@ -39,7 +39,7 @@ index 8ddb9730c3..99c423e782 100644
  func prepareSignInPageData(ctx *context.Context) {
  	ctx.Data["Title"] = ctx.Tr("sign_in")
  	ctx.Data["OAuth2Providers"], _ = oauth2.GetOAuth2Providers(ctx, optional.Some(true))
-@@ -180,6 +200,10 @@ func SignIn(ctx *context.Context) {
+@@ -181,6 +201,10 @@ func SignIn(ctx *context.Context) {
  	if CheckAutoLogin(ctx) {
  		return
  	}
@@ -51,5 +51,5 @@ index 8ddb9730c3..99c423e782 100644
  		RedirectAfterLogin(ctx)
  		return
 -- 
-2.47.1
+2.49.0
 

patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch

@@ -1,7 +1,7 @@
-From 285a38894bb72c74881bf66cf5ecc75d634fa280 Mon Sep 17 00:00:00 2001
+From 3a7478dce8bd171b9537ab8ba827a3366f932a54 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 14:05:47 +0200
-Subject: [PATCH 10/14] BLENDER: Allow non-local users to be renamed
+Subject: [PATCH 10/18] BLENDER: Allow non-local users to be renamed
 
 For Blender ID hook to do this.
 ---
@@ -33,5 +33,5 @@ index 7bde642412..5dda32f708 100644
  	if err := user_model.IsUsableUsername(newUserName); err != nil {
  		return err
 -- 
-2.47.1
+2.49.0
 

patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch

@@ -1,7 +1,7 @@
-From f0298ae745baf28da6fa2c7904709547eacaacfa Mon Sep 17 00:00:00 2001
+From ffc6d64f27593ca7bf8c080401a787532f4848eb Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 14:07:25 +0200
-Subject: [PATCH 11/14] BLENDER: Workaround internal server error comparing
+Subject: [PATCH 11/18] BLENDER: Workaround internal server error comparing
  branches on some repos
 
 https://projects.blender.org/infrastructure/blender-projects-platform/issues/61
@@ -30,5 +30,5 @@ index 16fcdcf4c8..91d61d2158 100644
  	}
 
 -- 
-2.47.1
+2.49.0