1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
|
(* Unison file synchronizer: src/uitext.ml *)
(* Copyright 1999-2018, Benjamin C. Pierce
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
open Common
open Lwt
module Body : Uicommon.UI = struct
let debug = Trace.debug "ui"
let dumbtty =
Prefs.createBool "dumbtty"
(try System.getenv "EMACS" <> "" with Not_found -> false)
"!do not change terminal settings in text UI"
("When set to \\verb|true|, this flag makes the text mode user "
^ "interface avoid trying to change any of the terminal settings. "
^ "(Normally, Unison puts the terminal in `raw mode', so that it can "
^ "do things like overwriting the current line.) This is useful, for "
^ "example, when Unison runs in a shell inside of Emacs. "
^ "\n\n"
^ "When \\verb|dumbtty| is set, commands to the user interface need to "
^ "be followed by a carriage return before Unison will execute them. "
^ "(When it is off, Unison "
^ "recognizes keystrokes as soon as they are typed.)\n\n"
^ "This preference has no effect on the graphical user "
^ "interface.")
let silent =
Prefs.createBool "silent" false "print nothing except error messages"
("When this preference is set to {\\tt true}, the textual user "
^ "interface will print nothing at all, except in the case of errors. "
^ "Setting \\texttt{silent} to true automatically sets the "
^ "\\texttt{batch} preference to {\\tt true}.")
let cbreakMode = ref None
let supportSignals = Util.osType = `Unix || Util.isCygwin
let rawTerminal () =
match !cbreakMode with
None -> ()
| Some funs -> funs.System.rawTerminal ()
let defaultTerminal () =
match !cbreakMode with
None -> ()
| Some funs -> funs.System.defaultTerminal ()
let restoreTerminal() =
if supportSignals && not (Prefs.read dumbtty) then
Sys.set_signal Sys.sigcont Sys.Signal_default;
defaultTerminal ();
cbreakMode := None
let setupTerminal() =
if not (Prefs.read dumbtty) then
try
cbreakMode := Some (System.terminalStateFunctions ());
let suspend _ =
defaultTerminal ();
Sys.set_signal Sys.sigtstp Sys.Signal_default;
Unix.kill (Unix.getpid ()) Sys.sigtstp
in
let resume _ =
if supportSignals then
Sys.set_signal Sys.sigtstp (Sys.Signal_handle suspend);
rawTerminal ()
in
if supportSignals then
Sys.set_signal Sys.sigcont (Sys.Signal_handle resume);
resume ()
with Unix.Unix_error _ ->
restoreTerminal ()
let alwaysDisplay message =
print_string message;
flush stdout
let alwaysDisplayAndLog message =
(* alwaysDisplay message;*)
Trace.log (message ^ "\n")
let display message =
if not (Prefs.read silent) then alwaysDisplay message
let displayWhenInteractive message =
if not (Prefs.read Globals.batch) then alwaysDisplay message
let getInput () =
match !cbreakMode with
None ->
let l = input_line stdin in
if l="" then "" else String.sub l 0 1
| Some funs ->
let input_char () =
(* We cannot used buffered I/Os under Windows, as character
'\r' is not passed through (probably due to the code that
turns \r\n into \n) *)
let s = Bytes.create 1 in
let n = Unix.read Unix.stdin s 0 1 in
if n = 0 then raise End_of_file;
if s.[0] = '\003' then raise Sys.Break;
s.[0]
in
funs.System.startReading ();
let c = input_char () in
funs.System.stopReading ();
let c = if c='\n' || c = '\r' then "" else String.make 1 c in
display c;
c
let newLine () =
(* If in dumb mode (i.e. not in cbreak mode) the newline is entered by the
user to validate the input *)
if !cbreakMode <> None then display "\n"
let overwrite () =
if !cbreakMode <> None then display "\r"
let rec selectAction batch actions tryagain =
let formatname = function
"" -> "<ret>"
| " " -> "<spc>"
| "\x7f" -> "<del>"
| "\b" -> "<bsp>"
| n -> n in
let summarizeChoices() =
display "[";
Safelist.iter
(fun (names,doc,action) ->
if (Safelist.nth names 0) = "" then
display (formatname (Safelist.nth names 1)))
actions;
display "] " in
let tryagainOrLoop() =
tryagain ();
selectAction batch actions tryagain in
let rec find n = function
[] -> raise Not_found
| (names,doc,action)::rest ->
if Safelist.mem n names then action else find n rest
in
let doAction a =
if a="?" then
(newLine ();
display "Commands:\n";
Safelist.iter (fun (names,doc,action) ->
let n = Util.concatmap " or " formatname names in
let space = String.make (max 2 (22 - String.length n)) ' ' in
display (" " ^ n ^ space ^ doc ^ "\n"))
actions;
tryagainOrLoop())
else
let action = try Some (find a actions) with Not_found -> None in
match action with
Some action ->
action ()
| None ->
newLine ();
if a="" then
display ("No default command [type '?' for help]\n")
else
display ("Unrecognized command '" ^ String.escaped a
^ "': try again [type '?' for help]\n");
tryagainOrLoop()
in
let handleExn s =
(* Make sure that the error messages start on their own lines and not
* after the prompt. *)
alwaysDisplay "\n";
raise (Util.Fatal ("Failure reading from the standard input ("^s^")\n"))
in
try doAction (match batch with
None ->
summarizeChoices();
getInput ()
| Some i -> i)
with
(* Restart an interrupted system call (which can happen notably when
* the process is put in the background by SIGTSTP). *)
Unix.Unix_error (Unix.EINTR, _, _) -> tryagainOrLoop()
(* Simply print a slightly more informative message than the exception
* itself (e.g. "Uncaught unix error: read failed: Resource temporarily
* unavailable" or "Uncaught exception End_of_file"). *)
| End_of_file -> handleExn "End of file"
| Unix.Unix_error (err, _, _) -> handleExn (Unix.error_message err)
let alwaysDisplayErrors prefix l =
List.iter
(fun err -> alwaysDisplay (Format.sprintf "%s%s\n" prefix err)) l
let alwaysDisplayDetails ri =
alwaysDisplay ((Uicommon.details2string ri " ") ^ "\n");
match ri.replicas with
Problem _ ->
()
| Different diff ->
alwaysDisplayErrors "[root 1]: " diff.errors1;
alwaysDisplayErrors "[root 2]: " diff.errors2
let displayDetails ri =
if not (Prefs.read silent) then alwaysDisplayDetails ri
let displayri ri =
let (r1, action, r2, path) = Uicommon.reconItem2stringList Path.empty ri in
let forced =
match ri.replicas with
Different diff -> diff.direction <> diff.default_direction
| Problem _ -> false
in
let (defaultAction, forcedAction) =
match action with
Uicommon.AError -> ("error", "error")
| Uicommon.ASkip _ -> ("<-?->", "<=?=>")
| Uicommon.ALtoR false -> ("---->", "====>")
| Uicommon.ALtoR true -> ("--?->", "==?=>")
| Uicommon.ARtoL false -> ("<----", "<====")
| Uicommon.ARtoL true -> ("<-?--", "<=?==")
| Uicommon.AMerge -> ("<-M->", "<=M=>")
in
let action = if forced then forcedAction else defaultAction in
let s = Format.sprintf "%s %s %s %s " r1 action r2 path in
match ri.replicas with
Problem _ ->
alwaysDisplay s
| Different {direction = d} when isConflict d ->
alwaysDisplay s
| _ ->
display s
type proceed = ConfirmBeforeProceeding | ProceedImmediately
(* "interact [] rilist" interactively reconciles each list item *)
let interact prilist rilist =
if not (Prefs.read Globals.batch) then display ("\n" ^ Uicommon.roots2string() ^ "\n");
let (r1,r2) = Globals.roots() in
let (host1, host2) = root2hostname r1, root2hostname r2 in
let showdiffs ri =
Uicommon.showDiffs ri
(fun title text ->
try
let pager = System.getenv "PAGER" in
restoreTerminal ();
let out = System.open_process_out pager in
Printf.fprintf out "\n%s\n\n%s\n\n" title text;
let _ = System.close_process_out out in
setupTerminal ()
with Not_found ->
Printf.printf "\n%s\n\n%s\n\n" title text)
(fun s -> Printf.printf "%s\n" s)
Uutil.File.dummy;
true
and ispropschanged = function
{replicas = Different {rc1 = rc1; rc2 = rc2}}
when rc1.status = `PropsChanged &&
(rc2.status = `PropsChanged || rc2.status = `Unchanged) -> true
| {replicas = Different {rc1 = rc1; rc2 = rc2}}
when rc1.status = `Unchanged && rc2.status = `PropsChanged -> true
| _ -> false
and setdirchanged = function
{replicas = Different ({rc1 = rc1; rc2 = rc2} as diff)}
when rc1.status = `Modified && rc2.status = `PropsChanged ->
diff.direction <- Replica1ToReplica2; true
| {replicas = Different ({rc1 = rc1; rc2 = rc2} as diff)}
when rc1.status = `PropsChanged && rc2.status = `Modified ->
diff.direction <- Replica2ToReplica1; true
| {replicas = Different _} -> false
| _ -> true
and setskip = function
{replicas = Different ({direction = Conflict _})} -> true
| {replicas = Different diff} ->
begin diff.direction <- Conflict "skip requested"; true end
| _ -> true
and setdir dir = function
{replicas = Different diff} -> begin diff.direction <- dir; true end
| _ -> true
and invertdir = function
{replicas = Different ({direction = Replica1ToReplica2} as diff)}
-> diff.direction <- Replica2ToReplica1; true
| {replicas = Different ({direction = Replica2ToReplica1} as diff)}
-> diff.direction <- Replica1ToReplica2; true
| {replicas = Different _} -> false
| _ -> true
and setDirectionIfConflict dir = function
{replicas = Different ({direction = Conflict _})} as ri ->
begin Recon.setDirection ri dir `Force; true end
| ri -> begin Recon.setDirection ri dir `Prefer; true end
in
let ripred = ref [] in
let ritest ri = match !ripred with
[] -> true
| test::_ -> test ri in
let rec loop prev =
let rec previous prev ril =
match prev with
({ replicas = Problem s } as pri)::pril ->
displayri pri; display "\n"; display s; display "\n";
previous pril (pri::ril)
| pri::pril -> loop pril (pri::ril)
| [] -> display ("\n" ^ Uicommon.roots2string() ^ "\n"); loop prev ril in
let rec forward n prev ril =
match n, prev, ril with
0, prev, ril -> loop prev ril
| n, [], ril when n < 0 -> loop [] ril
| n, pri::pril, ril when n < 0 -> forward (n+1) pril (pri::ril)
| _, [], [] -> loop [] []
| n, pri::pril, [] when n > 0 -> loop pril [pri]
| n, prev, ri::rest when n > 0 -> forward (n-1) (ri::prev) rest
| _ -> assert false (* to silence the compiler *) in
function
[] -> (ConfirmBeforeProceeding, Safelist.rev prev)
| ri::rest as ril ->
let next() = loop (ri::prev) rest in
let repeat() = loop prev ril in
let ignore pat rest what =
display " ";
Uicommon.addIgnorePattern pat;
display (" Permanently ignoring " ^ what ^ "\n");
begin match !Prefs.profileName with None -> assert false |
Some(n) ->
display (" To un-ignore, edit "
^ System.fspathToPrintString (Prefs.profilePathname n)
^ " and restart " ^ Uutil.myName ^ "\n") end;
let nukeIgnoredRis =
Safelist.filter (fun ri -> not (Globals.shouldIgnore ri.path1)) in
loop (nukeIgnoredRis (ri::prev)) (nukeIgnoredRis ril) in
(* This should work on most terminals: *)
let redisplayri() = overwrite (); displayri ri; display "\n" in
let setripred cmd =
ripred := match cmd, !ripred with
`Unset, [] -> display "Matching condition already disabled\n"; []
| `Unset, _ | `Pop, [_] -> display " Disabling matching condition\n"; []
| `Pop, p::pp::t -> pp::t
| `Push rp, [] -> display " Enabling matching condition\n"; [rp]
| `Push rp, p -> rp::p
| _, [] -> display "Matching condition not enabled\n"; []
| `Op1 op, p::t -> (fun ri -> op (p ri))::t
| `Op2 op, [p] -> display "Missing previous matching condition\n"; [p]
| `Op2 op, p::pp::t -> (fun ri -> op (p ri) (pp ri))::t
| _ -> assert false in
let actOnMatching ?(change=true) ?(fail=Some(fun()->())) f =
(* [f] can have effects on the ri and return false to discard it *)
(* Disabling [change] avoids to redisplay the item, allows [f] to
print a message (info or error) on a separate line and repeats
instead of going to the next item *)
(* When [fail] is [None] if [f] returns false then instead of
executing [fail] and repeating we discard the item and go to the next *)
let discard, err =
match fail with Some e -> false, e | None -> true, fun()->() in
match !ripred with
| [] -> if not change then newLine();
let t = f ri in
if t || not discard
then begin
if change then redisplayri();
if not t then err();
if t && change then next() else repeat()
end else begin
if change then newLine();
loop prev rest
end
| test::_ -> newLine();
let filt = fun ri -> if test ri then f ri || not discard else true in
loop prev (ri::Safelist.filter filt rest)
in
displayri ri;
match ri.replicas with
Problem s -> display "\n"; display s; display "\n"; next()
| Different ({rc1 = _; rc2 = _; direction = dir} as diff) ->
if Prefs.read Uicommon.auto && not (isConflict dir) then begin
display "\n"; next()
end else
let (descr, descl) =
if host1 = host2 then
"left to right", "right to left"
else
"from "^host1^" to "^host2,
"from "^host2^" to "^host1
in
if Prefs.read Globals.batch then begin
display "\n";
if not (Prefs.read Trace.terse) then
displayDetails ri
end;
selectAction
(if Prefs.read Globals.batch then Some " " else None)
[((if (isConflict dir) && not (Prefs.read Globals.batch)
then ["f"] (* Offer no default behavior if we've got a
conflict and we're in interactive mode *)
else ["";"f";" "]),
("follow " ^ Uutil.myName ^ "'s recommendation (if any)"),
(fun () -> newLine();
if (isConflict dir) && not (Prefs.read Globals.batch)
then begin
display "No default action [type '?' for help]\n";
repeat()
end else
next()));
(["n";"j"],
("go to the next item"),
(fun () -> newLine();
next()));
(["p";"b";"k"],
("go back to previous item"),
(fun () -> newLine();
previous prev ril));
(["\x7f";"\b"],
("revert then go back to previous item"),
(fun () ->
Recon.revertToDefaultDirection ri; redisplayri();
previous prev ril));
(["0"],
("go to the start of the list"),
(fun () -> newLine();
loop [] (Safelist.rev_append prev ril)));
(["9"],
("go to the end of the list"),
(fun () -> newLine();
match Safelist.rev_append ril prev with
[] -> loop [] []
| lri::prev -> loop prev [lri]));
(["5"],
("go forward to the middle of the following items"),
(fun () -> newLine();
let l = (Safelist.length ril)/2 in
display (" Moving "^(string_of_int l)^" items forward\n");
forward l prev ril));
(["6"],
("go backward to the middle of the preceding items"),
(fun () -> newLine();
let l = -((Safelist.length prev)+1)/2 in
display (" Moving "^(string_of_int l)^" items backward\n");
forward l prev ril));
(["R"],
("reverse the list"),
(fun () -> newLine();
loop rest (ri::prev)));
(["d"],
("show differences (curr or match)"),
(fun () ->
actOnMatching ~change:false showdiffs));
(["x"],
("show details (curr or match)"),
(fun () ->
actOnMatching ~change:false
(fun ri -> displayDetails ri; true)));
(["L"],
("list all (or matching) following changes tersely"),
(fun () -> newLine();
Safelist.iter
(fun ri -> display " "; displayri ri; display "\n")
(Safelist.filter ritest ril);
repeat()));
(["l"],
("list all (or matching) following changes with details"),
(fun () -> newLine();
Safelist.iter
(fun ri -> display " "; displayri ri; display "\n";
alwaysDisplayDetails ri)
(Safelist.filter ritest ril);
repeat()));
(["A";"*"],
("match all the following"),
(fun () -> newLine();
setripred (`Push (fun _ -> true));
repeat()));
(["1"],
("match all the following that propagate " ^ descr),
(fun () -> newLine();
setripred (`Push (function
{replicas = Different ({direction = Replica1ToReplica2})} -> true
| _ -> false));
repeat()));
(["2"],
("match all the following that propagate " ^ descl),
(fun () -> newLine();
setripred (`Push (function
{replicas = Different ({direction = Replica2ToReplica1})} -> true
| _ -> false));
repeat()));
(["C"],
("match all the following conflicts"),
(fun () -> newLine();
setripred (`Push (function
{replicas = Different ({direction = Conflict _})} -> true
| _ -> false));
repeat()));
(["P";"="],
("match all the following with only props changes"),
(fun () -> newLine();
setripred (`Push ispropschanged);
repeat()));
(["M"],
("match all the following merges"),
(fun () -> newLine();
setripred (`Push (function
{replicas = Different ({direction = Merge})} -> true
| _ -> false));
repeat()));
(["X";"!"],
("invert the matching condition"),
(fun () -> newLine();
setripred (`Op1 not);
repeat()));
(["&"],
("and the last two matching conditions"),
(fun () -> newLine();
setripred (`Op2 (&&));
repeat()));
(["|"],
("or the last two matching conditions"),
(fun () -> newLine();
setripred (`Op2 (||));
repeat()));
(["D";"_"],
("delete/pop the active matching condition"),
(fun () -> newLine();
setripred `Pop;
repeat()));
(["U";"$"],
("unmatch (select current)"),
(fun () -> newLine();
setripred `Unset;
repeat()));
(["r";"u"],
("revert to " ^ Uutil.myName ^ "'s default recommendation (curr or match)"),
(fun () ->
actOnMatching
(fun ri->Recon.revertToDefaultDirection ri; true)));
(["m"],
("merge the versions (curr or match)"),
(fun () ->
actOnMatching (setdir Merge)));
([">";"."],
("propagate from " ^ descr ^ " (curr or match)"),
(fun () ->
actOnMatching (setdir Replica1ToReplica2)));
(["<";","],
("propagate from " ^ descl ^ " (curr or match)"),
(fun () ->
actOnMatching (setdir Replica2ToReplica1)));
(["]";"\""],
("resolve conflicts in favor of the newer (curr or match)"),
(fun () ->
actOnMatching (setDirectionIfConflict `Newer)));
(["[";"'"],
("resolve conflicts in favor of the older (curr or match)"),
(fun () ->
actOnMatching (setDirectionIfConflict `Older)));
(["c"],
("resolve conflicts in favor of changed (curr or match)"),
(fun () ->
actOnMatching
~fail:(Some (fun()->display "Cannot set direction\n"))
setdirchanged));
(["i"],
("invert direction of propagation and go to next item"),
(fun () ->
actOnMatching
~fail:(Some (fun()->display "Cannot invert direction\n"))
invertdir));
(["/";":"],
("skip"),
(fun () ->
actOnMatching setskip));
(["%"],
("skip all the following"),
(fun () -> newLine();
Safelist.iter (fun ri -> setskip ri; ()) rest;
repeat()));
(["-"],
("skip and discard for this session (curr or match)"),
(fun () ->
actOnMatching ~fail:None (fun _->false)));
(["+"],
("skip and discard all the following"),
(fun () -> newLine();
loop prev [ri]));
(["I"],
("ignore this path permanently"),
(fun () -> newLine();
ignore (Uicommon.ignorePath ri.path1) rest
"this path"));
(["E"],
("permanently ignore files with this extension"),
(fun () -> newLine();
ignore (Uicommon.ignoreExt ri.path1) rest
"files with this extension"));
(["N"],
("permanently ignore paths ending with this name"),
(fun () -> newLine();
ignore (Uicommon.ignoreName ri.path1) rest
"files with this name"));
(["s"],
("stop reconciling and go to the proceed menu"),
(fun () -> newLine();
(ConfirmBeforeProceeding, Safelist.rev_append prev ril)));
(["g"],
("proceed immediately to propagating changes"),
(fun () -> newLine();
(ProceedImmediately, Safelist.rev_append prev ril)));
(["q"],
("exit " ^ Uutil.myName ^ " without propagating any changes"),
(fun () -> newLine();
raise Sys.Break))
]
(fun () -> displayri ri)
in loop prilist rilist
let verifyMerge title text =
Printf.printf "%s\n" text;
if Prefs.read Globals.batch then
true
else begin
if Prefs.read Uicommon.confirmmerge then begin
display "Commit results of merge? ";
selectAction
None (* Maybe better: (Some "n") *)
[(["y";"g"],
"Yes: commit",
(fun() -> true));
(["n"],
"No: leave this file unchanged",
(fun () -> false));
]
(fun () -> display "Commit results of merge? ")
end else
true
end
type stateItem =
{ mutable ri : reconItem;
mutable bytesTransferred : Uutil.Filesize.t;
mutable bytesToTransfer : Uutil.Filesize.t }
let doTransport reconItemList =
let items =
Array.map
(fun ri ->
{ri = ri;
bytesTransferred = Uutil.Filesize.zero;
bytesToTransfer = Common.riLength ri})
(Array.of_list reconItemList)
in
let totalBytesTransferred = ref Uutil.Filesize.zero in
let totalBytesToTransfer =
ref
(Array.fold_left
(fun s item -> Uutil.Filesize.add item.bytesToTransfer s)
Uutil.Filesize.zero items)
in
let t0 = Unix.gettimeofday () in
let showProgress i bytes dbg =
let i = Uutil.File.toLine i in
let item = items.(i) in
item.bytesTransferred <- Uutil.Filesize.add item.bytesTransferred bytes;
totalBytesTransferred := Uutil.Filesize.add !totalBytesTransferred bytes;
let v =
(Uutil.Filesize.percentageOfTotalSize
!totalBytesTransferred !totalBytesToTransfer)
in
let t1 = Unix.gettimeofday () in
let remTime =
if v <= 0. then "--:--"
else if v >= 100. then "00:00"
else
let t = truncate ((t1 -. t0) *. (100. -. v) /. v +. 0.5) in
Format.sprintf "%02d:%02d" (t / 60) (t mod 60)
in
Util.set_infos
(Format.sprintf "%s %s ETA" (Util.percent2string v) remTime)
in
if not (Prefs.read Trace.terse) && (Prefs.read Trace.debugmods = []) then
Uutil.setProgressPrinter showProgress;
Transport.logStart ();
let fFailedPaths = ref [] in
let fPartialPaths = ref [] in
let uiWrapper i item f =
Lwt.try_bind f
(fun () ->
if partiallyProblematic item.ri && not (problematic item.ri) then
fPartialPaths := item.ri.path1 :: !fPartialPaths;
Lwt.return ())
(fun e ->
match e with
Util.Transient s ->
let rem =
Uutil.Filesize.sub
item.bytesToTransfer item.bytesTransferred
in
if rem <> Uutil.Filesize.zero then
showProgress (Uutil.File.ofLine i) rem "done";
let m = "[" ^ (Path.toString item.ri.path1) ^ "]: " ^ s in
alwaysDisplay ("Failed " ^ m ^ "\n");
fFailedPaths := item.ri.path1 :: !fFailedPaths;
return ()
| _ ->
fail e) in
let im = Array.length items in
let rec loop i actions pRiThisRound =
if i < im then begin
let item = items.(i) in
let actions =
if pRiThisRound item.ri then
uiWrapper i item
(fun () -> Transport.transportItem item.ri
(Uutil.File.ofLine i) verifyMerge)
:: actions
else
actions
in
loop (i + 1) actions pRiThisRound
end else
actions
in
Lwt_unix.run
(let actions = loop 0 [] (fun ri -> not (Common.isDeletion ri)) in
Lwt_util.join actions);
Lwt_unix.run
(let actions = loop 0 [] Common.isDeletion in
Lwt_util.join actions);
Transport.logFinish ();
Uutil.setProgressPrinter (fun _ _ _ -> ());
Util.set_infos "";
(Safelist.rev !fFailedPaths, Safelist.rev !fPartialPaths)
let setWarnPrinterForInitialization()=
Util.warnPrinter :=
Some(fun s ->
alwaysDisplay "Error: ";
alwaysDisplay s;
alwaysDisplay "\n";
exit Uicommon.fatalExit)
let setWarnPrinter() =
Util.warnPrinter :=
Some(fun s ->
alwaysDisplay "Warning: ";
alwaysDisplay s;
if not (Prefs.read Globals.batch) then begin
display "Press return to continue.";
selectAction None
[(["";" ";"y"],
("Continue"),
(fun () -> ()));
(["n";"q";"x"],
("Exit"),
(fun () ->
alwaysDisplay "\n";
restoreTerminal ();
Lwt_unix.run (Update.unlockArchives ());
exit Uicommon.fatalExit))]
(fun () -> display "Press return to continue.")
end)
let lastMajor = ref ""
let formatStatus major minor =
let s =
if major = !lastMajor then " " ^ minor
else major ^ (if minor="" then "" else "\n " ^ minor)
in
lastMajor := major;
s
let rec interactAndPropagateChanges prevItemList reconItemList
: bool * bool * bool * (Path.t list)
(* anySkipped?, anyPartial?, anyFailures?, failingPaths *) =
let (proceed,newReconItemList) = interact prevItemList reconItemList in
let (updatesToDo, skipped) =
Safelist.fold_left
(fun (howmany, skipped) ri ->
if problematic ri then (howmany, skipped + 1)
else (howmany + 1, skipped))
(0, 0) newReconItemList in
let doit() =
if not (Prefs.read Globals.batch || Prefs.read Trace.terse) then newLine();
if not (Prefs.read Trace.terse) then Trace.status "Propagating updates";
let timer = Trace.startTimer "Transmitting all files" in
let (failedPaths, partialPaths) = doTransport newReconItemList in
let failures = Safelist.length failedPaths in
let partials = Safelist.length partialPaths in
Trace.showTimer timer;
if not (Prefs.read Trace.terse) then Trace.status "Saving synchronizer state";
Update.commitUpdates ();
let trans = updatesToDo - failures in
let summary =
Printf.sprintf
"Synchronization %s at %s (%d item%s transferred, %s%d skipped, %d failed)"
(if failures=0 then "complete" else "incomplete")
(let tm = Util.localtime (Util.time()) in
Printf.sprintf "%02d:%02d:%02d"
tm.Unix.tm_hour tm.Unix.tm_min tm.Unix.tm_sec)
trans (if trans=1 then "" else "s")
(if partials <> 0 then
Format.sprintf "%d partially transferred, " partials
else
"")
skipped
failures in
Trace.log (summary ^ "\n");
if skipped>0 then
Safelist.iter
(fun ri ->
match ri.replicas with
Problem r
| Different {rc1 = _; rc2 = _; direction = Conflict r; default_direction = _} ->
alwaysDisplayAndLog (Printf.sprintf " skipped: %s (%s)"
(Path.toString ri.path1) r)
| _ -> ())
newReconItemList;
if partials>0 then
Safelist.iter
(fun p ->
alwaysDisplayAndLog (" partially transferred: " ^ Path.toString p))
partialPaths;
if failures>0 then
Safelist.iter
(fun p -> alwaysDisplayAndLog (" failed: " ^ (Path.toString p)))
failedPaths;
(skipped > 0, partials > 0, failures > 0, failedPaths) in
if not !Update.foundArchives then Update.commitUpdates ();
if updatesToDo = 0 then begin
(* BCP (3/09): We need to commit the archives even if there are
no updates to propagate because some files (in fact, if we've
just switched to DST on windows, a LOT of files) might have new
modtimes in the archive. *)
(* JV (5/09): Don't save the archive in repeat mode as it has some
costs and its unlikely there is much change to the archives in
this mode. *)
if !Update.foundArchives && Prefs.read Uicommon.repeat = "" then
Update.commitUpdates ();
display "No updates to propagate\n";
if skipped > 0 then begin
let summary =
Printf.sprintf
"Synchronization complete at %s (0 item transferred, %d skipped, 0 failed)"
(let tm = Util.localtime (Util.time()) in
Printf.sprintf "%02d:%02d:%02d"
tm.Unix.tm_hour tm.Unix.tm_min tm.Unix.tm_sec)
skipped in
Trace.log (summary ^ "\n");
Safelist.iter
(fun ri ->
match ri.replicas with
Problem r
| Different {rc1 = _; rc2 = _; direction = Conflict r; default_direction = _} ->
alwaysDisplayAndLog (Printf.sprintf " skipped: %s (%s)"
(Path.toString ri.path1) r)
| _ -> ())
newReconItemList
end;
(skipped > 0, false, false, [])
end else if proceed=ProceedImmediately then begin
doit()
end else
let rec askagain newReconItemList =
displayWhenInteractive "\nProceed with propagating updates? ";
selectAction
(* BCP: I find it counterintuitive that every other prompt except this one
would expect <CR> as a default. But I got talked out of offering a
default here, because of safety considerations (too easy to press
<CR> one time too many). *)
(if Prefs.read Globals.batch then Some "y" else None)
[(["y";"g"],
"Yes: proceed with updates as selected above",
doit);
(["n"],
"No: go through reconciliation process again",
(fun () -> newLine();
Prefs.set Uicommon.auto false;
interactAndPropagateChanges [] newReconItemList));
(["p";"b"],
"go back to the last item of the reconciliation",
(fun () -> newLine();
Prefs.set Uicommon.auto false;
match Safelist.rev newReconItemList with
[] -> interactAndPropagateChanges [] []
| lastri::prev -> interactAndPropagateChanges prev [lastri]));
(["N"],
"sort by Name",
(fun () ->
Sortri.sortByName();
askagain (Sortri.sortReconItems newReconItemList)));
(["S"],
"sort by Size",
(fun () ->
Sortri.sortBySize();
askagain (Sortri.sortReconItems newReconItemList)));
(["W"],
"sort neW first (toggle)",
(fun () ->
Sortri.sortNewFirst();
askagain (Sortri.sortReconItems newReconItemList)));
(["D"],
"Default ordering",
(fun () ->
Sortri.restoreDefaultSettings();
askagain (Sortri.sortReconItems newReconItemList)));
(["R"],
"Reverse the sort order",
(fun () -> askagain (Safelist.rev newReconItemList)));
(["q"],
("exit " ^ Uutil.myName ^ " without propagating any changes"),
(fun () -> newLine();
raise Sys.Break))
]
(fun () -> display "Proceed with propagating updates? ")
in askagain newReconItemList
let checkForDangerousPath dangerousPaths =
if Prefs.read Globals.confirmBigDeletes then begin
if dangerousPaths <> [] then begin
alwaysDisplayAndLog (Uicommon.dangerousPathMsg dangerousPaths);
if Prefs.read Globals.batch then begin
alwaysDisplay "Aborting...\n"; restoreTerminal ();
exit Uicommon.fatalExit
end else begin
displayWhenInteractive "Do you really want to proceed? ";
selectAction
None
[(["y"],
"Continue",
(fun () -> ()));
(["n";"q";"x";""],
"Exit",
(fun () -> alwaysDisplay "\n";
restoreTerminal ();
exit Uicommon.fatalExit))]
(fun () -> display "Do you really want to proceed? ")
end
end
end
let synchronizeOnce ?wantWatcher ?skipRecentFiles pathsOpt =
let showStatus path =
if path = "" then Util.set_infos "" else
let max_len = 70 in
let mid = (max_len - 3) / 2 in
let path =
let l = String.length path in
if l <= max_len then path else
String.sub path 0 (max_len - mid - 3) ^ "..." ^
String.sub path (l - mid) mid
in
let c = "-\\|/".[truncate (mod_float (4. *. Unix.gettimeofday ()) 4.)] in
Util.set_infos (Format.sprintf "%c %s" c path)
in
Trace.status "Looking for changes";
if not (Prefs.read Trace.terse) && (Prefs.read Trace.debugmods = []) then
Uutil.setUpdateStatusPrinter (Some showStatus);
debug (fun() -> Util.msg "temp: Globals.paths = %s\n"
(String.concat " "
(Safelist.map Path.toString (Prefs.read Globals.paths))));
let updates = Update.findUpdates ?wantWatcher pathsOpt in
Uutil.setUpdateStatusPrinter None;
Util.set_infos "";
let (reconItemList, anyEqualUpdates, dangerousPaths) =
Recon.reconcileAll ~allowPartial:true updates in
if reconItemList = [] then begin
(if anyEqualUpdates then
Trace.status ("Nothing to do: replicas have been changed only "
^ "in identical ways since last sync.")
else
Trace.status "Nothing to do: replicas have not changed since last sync.");
(Uicommon.perfectExit, [])
end else begin
checkForDangerousPath dangerousPaths;
let (anySkipped, anyPartial, anyFailures, failedPaths) =
interactAndPropagateChanges [] reconItemList in
let exitStatus = Uicommon.exitCode(anySkipped || anyPartial,anyFailures) in
(exitStatus, failedPaths)
end
(* ----------------- Filesystem watching mode ---------------- *)
let watchinterval = 1. (* Minimal interval between two synchronizations *)
let retrydelay = 5. (* Minimal delay to retry failed paths *)
let maxdelay = 30. *. 60. (* Maximal delay to retry failed paths *)
module PathMap = Map.Make (Path)
let waitForChangesRoot: Common.root -> unit -> unit Lwt.t =
Remote.registerRootCmd
"waitForChanges"
(fun (fspath, _) -> Fswatchold.wait (Update.archiveHash fspath))
let waitForChanges t =
let dt = t -. Unix.gettimeofday () in
if dt > 0. then begin
let timeout = if dt <= maxdelay then [Lwt_unix.sleep dt] else [] in
Lwt_unix.run
(Globals.allRootsMap (fun r -> Lwt.return (waitForChangesRoot r ()))
>>= fun l ->
Lwt.choose (timeout @ l))
end
let synchronizePathsFromFilesystemWatcher () =
let rec loop isStart delayInfo =
let t = Unix.gettimeofday () in
let (delayedPaths, readyPaths) =
PathMap.fold
(fun p (t', _) (delayed, ready) ->
if t' <= t then (delayed, p :: ready) else (p :: delayed, ready))
delayInfo ([], [])
in
let (exitStatus, failedPaths) =
synchronizeOnce ~wantWatcher:() ~skipRecentFiles:()
(if isStart then None else Some (readyPaths, delayedPaths))
in
(* After a failure, we retry at once, then use an exponential backoff *)
let delayInfo =
Safelist.fold_left
(fun newDelayInfo p ->
PathMap.add p
(try
let (t', d) = PathMap.find p delayInfo in
if t' > t then (t', d) else
let d = max retrydelay (min maxdelay (2. *. d)) in
(t +. d, d)
with Not_found ->
(t, 0.))
newDelayInfo)
PathMap.empty
(Safelist.append delayedPaths failedPaths)
in
Lwt_unix.run (Lwt_unix.sleep watchinterval);
let nextTime =
PathMap.fold (fun _ (t, d) t' -> min t t') delayInfo 1e20 in
waitForChanges nextTime;
loop false delayInfo
in
loop true PathMap.empty
(* ----------------- Repetition ---------------- *)
let synchronizeUntilNoFailures repeatMode =
let rec loop triesLeft pathsOpt =
let (exitStatus, failedPaths) =
synchronizeOnce
?wantWatcher:(if repeatMode then Some () else None) pathsOpt in
if failedPaths <> [] && triesLeft <> 0 then begin
loop (triesLeft - 1) (Some (failedPaths, []))
end else begin
exitStatus
end in
loop (Prefs.read Uicommon.retry) None
let rec synchronizeUntilDone () =
let repeatinterval =
if Prefs.read Uicommon.repeat = "" then -1 else
try int_of_string (Prefs.read Uicommon.repeat)
with Failure _ ->
(* If the 'repeat' pref is not a valid number, switch modes... *)
if Prefs.read Uicommon.repeat = "watch" then
synchronizePathsFromFilesystemWatcher()
else
raise (Util.Fatal ("Value of 'repeat' preference ("
^Prefs.read Uicommon.repeat
^") should be either a number or 'watch'\n")) in
let exitStatus = synchronizeUntilNoFailures(repeatinterval >= 0) in
if repeatinterval < 0 then
exitStatus
else begin
(* Do it again *)
Trace.status (Printf.sprintf
"\nSleeping for %d seconds...\n" repeatinterval);
Unix.sleep repeatinterval;
synchronizeUntilDone ()
end
(* ----------------- Startup ---------------- *)
let handleException e =
restoreTerminal();
let msg = Uicommon.exn2string e in
Trace.log (msg ^ "\n");
if not !Trace.sendLogMsgsToStderr then alwaysDisplay ("\n" ^ msg ^ "\n")
let rec start interface =
if interface <> Uicommon.Text then
Util.msg "This Unison binary only provides the text GUI...\n";
begin try
(* Just to make sure something is there... *)
setWarnPrinterForInitialization();
Uicommon.uiInit
(fun s -> Util.msg "%s\n%s\n" Uicommon.shortUsageMsg s; exit 1)
(fun s -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
(fun () -> setWarnPrinter();
if Prefs.read silent then Prefs.set Trace.terse true;
if not (Prefs.read silent)
then Util.msg "%s\n" (Uicommon.contactingServerMsg()))
(fun () -> Some "default")
(fun () -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
(fun () -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
None;
(* Some preference settings imply others... *)
if Prefs.read silent then begin
Prefs.set Globals.batch true;
Prefs.set Trace.terse true;
Prefs.set dumbtty true;
Trace.sendLogMsgsToStderr := false;
end;
if Prefs.read Uicommon.repeat <> "" then begin
Prefs.set Globals.batch true;
end;
(* Tell OCaml that we want to catch Control-C ourselves, so that
we get a chance to reset the terminal before exiting *)
Sys.catch_break true;
(* Put the terminal in cbreak mode if possible *)
if not (Prefs.read Globals.batch) then setupTerminal();
setWarnPrinter();
Trace.statusFormatter := formatStatus;
let exitStatus = synchronizeUntilDone() in
(* Put the terminal back in "sane" mode, if necessary, and quit. *)
restoreTerminal();
exit exitStatus
with
Sys.Break -> begin
(* If we've been killed, then die *)
handleException Sys.Break;
exit Uicommon.fatalExit
end
| e -> begin
(* If any other bad thing happened and the -repeat preference is
set, then restart *)
(* JV: it seems safer to just abort here, as we don't know in which
state Unison is; for instance, if the connection is lost, there
is no point in restarting as Unison will currently not attempt to
establish a new connection. *)
handleException e;
if false (*Prefs.read Uicommon.repeat <> ""*) then begin
Util.msg "Restarting in 10 seconds...\n";
Unix.sleep 10;
start interface
end else
exit Uicommon.fatalExit
end
end
let defaultUi = Uicommon.Text
end
|