Skip to content

Commit

Permalink
spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
faldor20 committed Jun 18, 2024
1 parent a1fb8f5 commit e519d00
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions jj_tui/bin/file_view.ml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ module Make (Vars : Global_vars.Vars) = struct

let selected_file = Lwd.var ""

let rec command_mapping =
let rec command_mapping =
[
{
key = 'm'
; description = "Move commit"
; description = "Move file to other commit"
; cmd =
PromptThen
( "Revision to move file to"
Expand All @@ -35,8 +35,8 @@ module Make (Vars : Global_vars.Vars) = struct
confirm_prompt
("discard all changes to '" ^ selected ^ "' in this revision")
(Cmd [ "restore"; selected ]))
};
{
}
; {
key = 'h'
; description = "Show help"
; cmd =
Expand Down
5 changes: 2 additions & 3 deletions jj_tui/bin/jj_ui.ml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ open Jj_tui
module W = Nottui_widgets
module Wd = Widgets


module Ui = struct
include Nottui.Ui

Expand Down Expand Up @@ -135,9 +134,9 @@ module Make (Vars : Global_vars.Vars) = struct
while true do
Eio.Time.sleep clock 5.0;
(*we need to lock this becasue we could end up updating while the ui is rendering*)
Vars.render_mutex|>Eio.Mutex.lock;
Vars.render_mutex |> Eio.Mutex.lock;
update_status ~cause_snapshot:true ();
Vars.render_mutex|>Eio.Mutex.unlock;
Vars.render_mutex |> Eio.Mutex.unlock
done;
`Stop_daemon);
let$* running = Lwd.get ui_state.view in
Expand Down

0 comments on commit e519d00

Please sign in to comment.