diff options
| author | G.raud <graud@gmx.com> | 2018-01-27 22:12:50 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-01-28 07:15:54 +0100 |
| commit | e91716a0e6a28eecbdae6b39eab1ec59e10df7df (patch) | |
| tree | adfd72122c27fd1a07cfced01b30315a02be4696 /src | |
| parent | 2b71aa4c05fea27f6620ab78c0ddaa0203a817e7 (diff) | |
| download | unison-e91716a0e6a28eecbdae6b39eab1ec59e10df7df.zip unison-e91716a0e6a28eecbdae6b39eab1ec59e10df7df.tar.gz unison-e91716a0e6a28eecbdae6b39eab1ec59e10df7df.tar.bz2 | |
Uitext.selectAction: take an extra accumulator and pass it down to interact
The accumulator is still unused but will allow a recursive call to
restart the selection not just from the top.
Diffstat (limited to 'src')
| -rw-r--r-- | src/uitext.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index 641a422..f542afe 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -558,10 +558,10 @@ let formatStatus major minor = lastMajor := major; s -let rec interactAndPropagateChanges reconItemList +let rec interactAndPropagateChanges prevItemList reconItemList : bool * bool * bool * (Path.t list) (* anySkipped?, anyPartial?, anyFailures?, failingPaths *) = - let (proceed,newReconItemList) = interact [] reconItemList in + let (proceed,newReconItemList) = interact prevItemList reconItemList in let (updatesToDo, skipped) = Safelist.fold_left (fun (howmany, skipped) ri -> @@ -664,7 +664,7 @@ let rec interactAndPropagateChanges reconItemList (fun () -> Prefs.set Uicommon.auto false; newLine(); - interactAndPropagateChanges newReconItemList)); + interactAndPropagateChanges [] newReconItemList)); (["q"], ("exit " ^ Uutil.myName ^ " without propagating any changes"), fun () -> raise Sys.Break) @@ -734,7 +734,7 @@ let synchronizeOnce ?wantWatcher ?skipRecentFiles pathsOpt = end else begin checkForDangerousPath dangerousPaths; let (anySkipped, anyPartial, anyFailures, failedPaths) = - interactAndPropagateChanges reconItemList in + interactAndPropagateChanges [] reconItemList in let exitStatus = Uicommon.exitCode(anySkipped || anyPartial,anyFailures) in (exitStatus, failedPaths) end |