From 21d29bf473dd0d89f555dc17e4f2b7b9b4ad6bd1 Mon Sep 17 00:00:00 2001 From: Wilmer Ricciotti Date: Thu, 6 Oct 2011 12:20:27 +0000 Subject: [PATCH] Matitaweb: more changes to commit (now almost usable). --- matitaB/matita/matitaFilesystem.ml | 72 +++++++------- matitaB/matita/matitaFilesystem.mli | 6 +- matitaB/matita/matitadaemon.ml | 141 ++++++++++++++++++++++++++-- 3 files changed, 174 insertions(+), 45 deletions(-) diff --git a/matitaB/matita/matitaFilesystem.ml b/matitaB/matita/matitaFilesystem.ml index 13c40664b..c522d1171 100644 --- a/matitaB/matita/matitaFilesystem.ml +++ b/matitaB/matita/matitaFilesystem.ml @@ -25,10 +25,6 @@ exception SvnError of string;; -let mutex = Mutex.create ();; - -let to_be_committed = ref [];; - let exec_process cmd = let (stdout, stdin, stderr) as chs = Unix.open_process_full cmd [||] in let outlines = ref [] in @@ -106,9 +102,19 @@ let stat_classify line = let count p l = List.length (List.filter p l) +exception Unimplemented + +let matita_flag_of_stat fs = + if List.mem Conflict fs then MConflict + else if List.mem Modified fs then MModified + else if List.mem Add fs then MAdd + else if List.mem Delete fs then raise Unimplemented + else if List.mem NotAdded fs then MUnversioned + else MSynchronized + let stat_user user = let rt_dir = Helm_registry.get "matita.rt_base_dir" in - let repo = Helm_registry.get "matita.weblib" in + let _repo = Helm_registry.get "matita.weblib" in let errno, outlines, errlines = exec_process ("svn stat " ^ rt_dir ^ "/users/" ^ user ^ "/") @@ -120,6 +126,10 @@ let stat_user user = with | SvnAnomaly l -> facc, l::eacc) ([],[]) outlines in + let files = + List.map (fun (fname,flags) -> fname,Some (matita_flag_of_stat flags)) files + in + if errno = 0 then files, anomalies else raise (SvnError ("Anomalies: " ^ (String.concat "\n" anomalies) ^ "\n\n" ^ (string_of_output outlines errlines))) ;; @@ -256,18 +266,9 @@ let reset_lib () = ignore (Sys.command ("rm -rf " ^ to_be_removed)) ;; -(* adds a user to the commit queue; concurrent instances possible, so we - * enclose the update in a CS - *) -let add_user uid = - Mutex.lock mutex; - to_be_committed := uid::List.filter (fun x -> x <> uid) !to_be_committed; - Mutex.unlock mutex; -;; - let update_user user = let rt_dir = Helm_registry.get "matita.rt_base_dir" in - let repo = Helm_registry.get "matita.weblib" in + let _repo = Helm_registry.get "matita.weblib" in let errno, outlines, errlines = exec_process ("svn up --non-interactive " ^ rt_dir ^ "/users/" ^ user ^ "/") @@ -294,31 +295,38 @@ let update_user user = else raise (SvnError (string_of_output outlines errlines)) ;; -(* this function and the next one should only be called by the server itself (or +let add_files user files = + let rt_dir = Helm_registry.get "matita.rt_base_dir" in + let _repo = Helm_registry.get "matita.weblib" in + + let files = String.concat " " + (List.map ((^) (rt_dir ^ "/users/" ^ user ^ "/")) files) in + + let errno, outlines, errlines = + if files <> "" then + exec_process ("svn add --non-interactive " ^ files) + else 0,[],[] + in + if errno = 0 then + "BEGIN ADD - " ^ user ^ ":\n" ^ (string_of_output outlines errlines) ^ "END ADD - " ^ user ^ "\n\n" + else raise (SvnError (string_of_output outlines errlines)) +;; + +(* this function should only be called by the server itself (or * the admin) at a scheduled time, so no concurrent instances and no CS needed * also, svn should already be safe as far as concurrency is concerned *) -let commit user = +let commit user files = let rt_dir = Helm_registry.get "matita.rt_base_dir" in - let repo = Helm_registry.get "matita.weblib" in + let _repo = Helm_registry.get "matita.weblib" in + + let files = String.concat " " + (List.map ((^) (rt_dir ^ "/users/" ^ user ^ "/")) files) in let errno, outlines, errlines = exec_process - ("svn ci --non-interactive --message \"commit by user " ^ user ^ "\" " ^ rt_dir ^ "/users/" ^ user ^ "/") + ("svn ci --non-interactive --message \"commit by user " ^ user ^ "\" " ^ files) in if errno = 0 then "BEGIN COMMIT - " ^ user ^ ":\n" ^ (string_of_output outlines errlines) ^ "END COMMIT - " ^ user ^ "\n\n" else raise (SvnError (string_of_output outlines errlines)) ;; -let do_global_commit () = - prerr_endline ("to be committed: " ^ String.concat " " !to_be_committed); - List.fold_left - (fun (acc,out) u -> - try - let newout = commit u in - acc, out ^ newout - with - | SvnError outstr -> - prerr_endline ("COMMIT OF " ^ user ^ "FAILED:" ^ outstr); - u::acc,out) - ([],"") (List.rev !to_be_committed) -;; diff --git a/matitaB/matita/matitaFilesystem.mli b/matitaB/matita/matitaFilesystem.mli index 0347304ef..f2940f4ce 100644 --- a/matitaB/matita/matitaFilesystem.mli +++ b/matitaB/matita/matitaFilesystem.mli @@ -26,14 +26,14 @@ val reset_lib : unit -> unit (* val commit : string -> unit *) -val add_user : string -> unit +val commit : string -> string list -> string -val do_global_commit : unit -> string list * string +val add_files : string -> string list -> string val update_user : string -> (string * matita_flag option) list * string list * (int*int*int*int*int) -val stat_user : string -> (string * svn_flag list) list * string list +val stat_user : string -> (string * matita_flag option) list * string list val normalize_qfn : string -> string diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml index 95ff43b17..22debcda4 100644 --- a/matitaB/matita/matitadaemon.ml +++ b/matitaB/matita/matitadaemon.ml @@ -9,6 +9,117 @@ let libdir uid = (rt_path ()) ^ "/users/" ^ uid let utf8_length = Netconversion.ustring_length `Enc_utf8 +let mutex = Mutex.create ();; + +let to_be_committed = ref [];; + +(* adds a user to the commit queue; concurrent instances possible, so we + * enclose the update in a CS + *) +let add_user_for_commit uid = + Mutex.lock mutex; + to_be_committed := uid::List.filter (fun x -> x <> uid) !to_be_committed; + Mutex.unlock mutex; +;; + +let do_global_commit () = + prerr_endline ("to be committed: " ^ String.concat " " !to_be_committed); + List.fold_left + (fun out u -> + let ft = MatitaAuthentication.read_ft u in + + (* first we add new files/dirs to the repository *) + let to_be_added = List.map fst + (List.filter (fun (_,flag) -> flag = MatitaFilesystem.MAdd) ft) + in + let out = + try + let newout = MatitaFilesystem.add_files u to_be_added in + out ^ "\n" ^ newout + with + | MatitaFilesystem.SvnError outstr -> + prerr_endline ("ADD OF " ^ u ^ "FAILED:" ^ outstr); + out + in + + (* now we update the local copy (to merge updates from other users) *) + let out = try + let files,anomalies,(added,conflict,del,upd,merged) = + MatitaFilesystem.update_user u + in + let anomalies = String.concat "\n" anomalies in + let details = Printf.sprintf + ("%d new files\n"^^ + "%d deleted files\n"^^ + "%d updated files\n"^^ + "%d merged files\n"^^ + "%d conflicting files\n\n" ^^ + "Anomalies:\n%s") added del upd merged conflict anomalies + in + prerr_endline ("update details:\n" ^ details); + MatitaAuthentication.set_file_flag u files; + out ^ "\n" ^ details + with + | MatitaFilesystem.SvnError outstr -> + prerr_endline ("UPDATE OF " ^ u ^ "FAILED:" ^ outstr); + out + in + + (* we re-read the file table after updating *) + let ft = MatitaAuthentication.read_ft u in + + (* finally we perform the real commit *) + let modified = (List.map fst + (List.filter (fun (_,flag) -> flag = MatitaFilesystem.MModified) ft)) + in + let to_be_committed = to_be_added @ modified + in + let out = try + let newout = MatitaFilesystem.commit u to_be_committed in + out ^ "\n" ^ newout + with + | MatitaFilesystem.SvnError outstr -> + prerr_endline ("COMMIT OF " ^ u ^ "FAILED:" ^ outstr); + out + in + + (* call stat to get the final status *) + let files, anomalies = MatitaFilesystem.stat_user u in + let add_count,not_added = List.fold_left + (fun (ac_acc, na_acc) fname -> + if List.mem fname (List.map fst files) then + ac_acc, fname::na_acc + else + ac_acc+1, na_acc) + (0,[]) to_be_added + in + let commit_count,not_committed = List.fold_left + (fun (cc_acc, nc_acc) fname -> + if List.mem fname (List.map fst files) then + cc_acc, fname::nc_acc + else + cc_acc+1, nc_acc) + (0,[]) modified + in + let conflicts = List.map fst (List.filter + (fun (_,f) -> f = Some MatitaFilesystem.MConflict) files) + in + MatitaAuthentication.set_file_flag u files; + out ^ "\n\n" ^ (Printf.sprintf + ("COMMIT RESULTS for %s\n" ^^ + "==============\n" ^^ + "added and committed: %d of %d\n" ^^ + "modified and committed: %d of %d\n" ^^ + "not added: %s\n" ^^ + "not committed: %s\n" ^^ + "conflicts: %s\n") + u add_count (List.length to_be_added) commit_count + (List.length modified) (String.concat ", " not_added) + (String.concat ", " not_committed) (String.concat ", " conflicts))) + + "" (List.rev !to_be_committed) +;; + (*** from matitaScript.ml ***) (* let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$" *) @@ -242,7 +353,7 @@ let advance0 sid text = let register (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in - let env = cgi#environment in + let _env = cgi#environment in assert (cgi#arguments <> []); let uid = cgi#argument_value "userid" in @@ -349,12 +460,13 @@ let save (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let rel_filename = cgi # argument_value "file" in let filename = libdir uid ^ "/" ^ rel_filename in let force = bool_of_string (cgi#argument_value "force") in + let already_exists = Sys.file_exists filename in - if ((not force) && (Sys.file_exists filename)) then + if ((not force) && already_exists) then raise File_already_exists; if dir = "true" then - Unix.mkdir filename 0o744 + Unix.mkdir filename 0o744 else begin let oc = open_out filename in @@ -366,12 +478,21 @@ let save (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string status#baseuri) status; (* prerr_endline ("adding to the commit queue..."); *) - MatitaFilesystem.add_user uid; + add_user_for_commit uid; (* prerr_endline ("done."); *) end; end; - MatitaAuthentication.set_file_flag uid - [rel_filename, Some MatitaFilesystem.MModified]; + let old_flag = + try + List.assoc rel_filename (MatitaAuthentication.read_ft uid) + with Not_found -> MatitaFilesystem.MUnversioned + in + if old_flag <> MatitaFilesystem.MConflict then + let newflag = + if already_exists then MatitaFilesystem.MModified + else MatitaFilesystem.MAdd + in + MatitaAuthentication.set_file_flag uid [rel_filename, Some newflag]; cgi # set_header ~cache:`No_cache ~content_type:"text/xml; charset=\"utf-8\"" @@ -394,16 +515,16 @@ let save (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let initiate_commit (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in - let env = cgi#environment in + let _env = cgi#environment in (try - let errors,out = MatitaFilesystem.do_global_commit () in + let out = do_global_commit () in cgi # set_header ~cache:`No_cache ~content_type:"text/xml; charset=\"utf-8\"" (); cgi#out_channel#output_string ""; cgi#out_channel#output_string "ok"; - cgi#out_channel#output_string "
" ^ out ^ "
"; + cgi#out_channel#output_string ("
" ^ out ^ "
"); cgi#out_channel#output_string "" with | Not_found _ -> @@ -659,7 +780,7 @@ let viewLib (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let files,anomalies = MatitaFilesystem.stat_user uid in let changed = HExtlib.filter_map - (fun (n,fl) -> if (List.mem MatitaFilesystem.Modified fl) then Some n else None) files + (fun (n,f) -> if (f = Some MatitaFilesystem.MModified) then Some n else None) files in let changed = String.concat "\n" changed in let anomalies = String.concat "\n" anomalies in -- 2.39.2