summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorG.raud <graud@gmx.com>2018-02-02 17:51:35 +0100
committerG.raud <graud@gmx.com>2018-02-02 20:46:23 +0100
commit75a59a21c6b676b5b3798fd7349c48c863651d50 (patch)
tree7d1b9e24620ca3e0d97e50d2a9b6ad14835037a3 /src
parent1535a849151c2e806a718e79d87c00dfd9492063 (diff)
downloadunison-75a59a21c6b676b5b3798fd7349c48c863651d50.zip
unison-75a59a21c6b676b5b3798fd7349c48c863651d50.tar.gz
unison-75a59a21c6b676b5b3798fd7349c48c863651d50.tar.bz2
Uitext: let "diff" and "details" operate on matching items
Diffstat (limited to 'src')
-rw-r--r--src/uitext.ml13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/uitext.ml b/src/uitext.ml
index dc0af5a..672aee9 100644
--- a/src/uitext.ml
+++ b/src/uitext.ml
@@ -262,7 +262,8 @@ let interact prilist rilist =
with Not_found ->
Printf.printf "\n%s\n\n%s\n\n" title text)
(fun s -> Printf.printf "%s\n" s)
- Uutil.File.dummy
+ Uutil.File.dummy;
+ true
and setskip = function
{replicas = Different ({direction = Conflict _})} -> ()
| {replicas = Different diff} -> diff.direction <- Conflict "skip requested"
@@ -361,14 +362,12 @@ let interact prilist rilist =
loop rest (ri::prev)));
(["d"],
("show differences"),
- (fun () -> newLine();
- showdiffs ri;
- repeat()));
+ (fun () ->
+ actOnMatching showdiffs));
(["x"],
("show details"),
- (fun () -> newLine();
- displayDetails ri;
- repeat()));
+ (fun () ->
+ actOnMatching (fun ri -> displayDetails ri; true)));
(["L"],
("list all following changes tersely"),
(fun () -> newLine();