@@ -57,47 +57,6 @@ const captureProcessResult = (
5757 ) ;
5858
5959describe ( "VcsProcess.run" , ( ) => {
60- it . effect . each ( [
61- {
62- name : "Windows index lock" ,
63- stderr : "fatal: Unable to create 'C:\\private\\repo\\.git\\index.lock': File exists.\n" ,
64- locked : true ,
65- } ,
66- {
67- name : "index permission error" ,
68- stderr : "fatal: Unable to create '/private/repo/.git/index.lock': Permission denied\n" ,
69- locked : false ,
70- } ,
71- {
72- name : "a different Git lock" ,
73- stderr : "fatal: Unable to create '/private/repo/.git/config.lock': File exists.\n" ,
74- locked : false ,
75- } ,
76- ] ) ( "distinguishes $name without retaining raw stderr" , ( { stderr, locked } ) =>
77- Effect . gen ( function * ( ) {
78- const error = yield * captureProcessResult (
79- Effect . succeed ( {
80- code : ChildProcessSpawner . ExitCode ( 128 ) ,
81- stdout : "" ,
82- stderr,
83- stdoutTruncated : false ,
84- stderrTruncated : false ,
85- stdoutInvalidUtf8 : false ,
86- stderrInvalidUtf8 : false ,
87- timedOut : false ,
88- } ) ,
89- ) ;
90- expect ( error ) . toMatchObject ( {
91- failureKind : "command-failed" ,
92- detail : locked
93- ? "Git's index is locked. Wait for other Git operations to finish, then try again."
94- : "Process exited with a non-zero status." ,
95- } ) ;
96- expect ( error . message ) . not . toContain ( "private" ) ;
97- expect ( error ) . not . toHaveProperty ( "stderr" ) ;
98- } ) ,
99- ) ;
100-
10160 it . effect ( "explains a locked Git index and allows restore after the lock is released" , ( ) =>
10261 Effect . gen ( function * ( ) {
10362 const fs = yield * FileSystem . FileSystem ;
@@ -120,7 +79,7 @@ describe("VcsProcess.run", () => {
12079 ] ) ;
12180 yield * fs . writeFileString ( file , "after\n" ) ;
12281 const lock = path . join ( cwd , ".git" , "index.lock" ) ;
123- yield * fs . writeFileString ( lock , "" ) ;
82+ yield * fs . writeFileString ( lock , "held by another process\n " ) ;
12483 const restore = [ "restore" , "--source=HEAD" , "--worktree" , "--staged" , "--" , "README.md" ] ;
12584
12685 const error = yield * Effect . flip ( git ( restore ) ) ;
@@ -131,10 +90,8 @@ describe("VcsProcess.run", () => {
13190 detail : "Git's index is locked. Wait for other Git operations to finish, then try again." ,
13291 } ) ;
13392 expect ( error . message ) . not . toContain ( "index.lock" ) ;
134- expect ( error . message ) . toContain ( "Git's index is locked." ) ;
135- expect ( error ) . not . toHaveProperty ( "stderr" ) ;
13693 expect ( yield * fs . readFileString ( file ) ) . toBe ( "after\n" ) ;
137- expect ( yield * fs . exists ( lock ) ) . toBe ( true ) ;
94+ expect ( yield * fs . readFileString ( lock ) ) . toBe ( "held by another process\n" ) ;
13895
13996 yield * fs . remove ( lock ) ;
14097 yield * git ( restore ) ;
@@ -143,7 +100,20 @@ describe("VcsProcess.run", () => {
143100 ) ;
144101
145102 it . effect . each ( [
146- { stderr : "fatal: Unable to create '/private/repo/index.lock': File exists" , retryable : true } ,
103+ {
104+ stderr : "fatal: Unable to create '/private/repo/index.lock': File exists" ,
105+ retryable : true ,
106+ detail : "Git's index is locked. Wait for other Git operations to finish, then try again." ,
107+ } ,
108+ {
109+ stderr : "fatal: Unable to create 'C:\\private\\repo\\.git\\index.lock': File exists." ,
110+ retryable : true ,
111+ detail : "Git's index is locked. Wait for other Git operations to finish, then try again." ,
112+ } ,
113+ {
114+ stderr : "fatal: Unable to create '/private/repo/.git/config.lock': File exists." ,
115+ retryable : true ,
116+ } ,
147117 {
148118 stderr : "fatal: Unable to create '/private/repo/index.lock': Permission denied" ,
149119 retryable : false ,
@@ -160,8 +130,8 @@ describe("VcsProcess.run", () => {
160130 } ,
161131 { stderr : "fatal: index file corrupt" , retryable : false } ,
162132 ] ) (
163- "classifies Git exit retryability without retaining stderr: $stderr" ,
164- ( { stderr, retryable } ) =>
133+ "classifies Git exit retryability and safe detail without retaining stderr: $stderr" ,
134+ ( { stderr, retryable, detail = "Process exited with a non-zero status." } ) =>
165135 Effect . gen ( function * ( ) {
166136 const error = yield * captureProcessResult (
167137 Effect . succeed ( {
@@ -177,8 +147,9 @@ describe("VcsProcess.run", () => {
177147 ) ;
178148 assert . instanceOf ( error , VcsProcessExitError ) ;
179149 expect ( error . retryable === true ) . toBe ( retryable ) ;
150+ expect ( error . detail ) . toBe ( detail ) ;
180151 const encoded = yield * encodeExitError ( error ) ;
181- expect ( encoded ) . not . toContain ( "/ private/repo " ) ;
152+ expect ( encoded ) . not . toContain ( "private" ) ;
182153 } ) ,
183154 ) ;
184155
0 commit comments