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 added,not_added = List.fold_left
+ (fun (a_acc, na_acc) fname ->
+ if List.mem fname (List.map fst files) then
+ a_acc, fname::na_acc
+ else
+ fname::a_acc, na_acc)
+ ([],[]) to_be_added
+ in
+ let committed,not_committed = List.fold_left
+ (fun (c_acc, nc_acc) fname ->
+ if List.mem fname (List.map fst files) then
+ c_acc, fname::nc_acc
+ else
+ fname::c_acc, nc_acc)
+ ([],[]) modified
+ in
+ let conflicts = List.map fst (List.filter
+ (fun (_,f) -> f = Some MatitaFilesystem.MConflict) files)
+ in
+ MatitaAuthentication.set_file_flag u
+ (List.map (fun x -> x, Some MatitaFilesystem.MSynchronized) (added@committed));
+ MatitaAuthentication.set_file_flag u files;
+ out ^ "\n\n" ^ (Printf.sprintf
+ ("COMMIT RESULTS for %s\n" ^^
+ "==============\n" ^^
+ "added and committed (%d of %d): %s\n" ^^
+ "modified and committed (%d of %d): %s\n" ^^
+ "not added: %s\n" ^^
+ "not committed: %s\n" ^^
+ "conflicts: %s\n")
+ u (List.length added) (List.length to_be_added) (String.concat ", " added)
+ (List.length committed) (List.length modified) (String.concat ", " committed)
+ (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)*$" *)
(* prerr_endline ("sending metasenv:\n" ^ res); res *)
;;
-(* let html_of_status s =
- let _,_,metasenv,subst,_ = s#obj in
- let txt = List.fold_left
- (fun acc (nmeta,_ as meta) ->
- let txt0 = snd (ApplyTransformation.ntxt_of_cic_sequent
- ~metasenv ~subst ~map_unicode_to_tex:false 80 s meta)
- in
- prerr_endline ("### txt0 = " ^ txt0);
- ("<B>Goal ?" ^ (string_of_int nmeta) ^ "</B>\n" ^ txt0)::acc)
- [] metasenv
- in
- String.concat "\n\n" txt
-;; *)
-
let html_of_matita s =
let patt1 = Str.regexp "\005" in
let patt2 = Str.regexp "\006" in
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
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
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 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 &&
+ old_flag <> MatitaFilesystem.MAdd 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\""
- ();
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ();
cgi#out_channel#output_string "<response>ok</response>"
with
| File_already_exists ->
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 = MatitaFilesystem.do_global_commit () in
- prerr_endline ("commit errors: " ^ (String.concat " " errors));
+ let out = do_global_commit () in
cgi # set_header
~cache:`No_cache
~content_type:"text/xml; charset=\"utf-8\""
();
- cgi#out_channel#output_string "<response>ok</response>"
+ cgi#out_channel#output_string "<commit>";
+ cgi#out_channel#output_string "<response>ok</response>";
+ cgi#out_channel#output_string ("<details>" ^ out ^ "</details>");
+ cgi#out_channel#output_string "</commit>"
with
| Not_found _ ->
cgi # set_header
let sid = HExtlib.unopt sid in
let uid = MatitaAuthentication.user_of_session sid in
(try
- let files,anomalies = MatitaFilesystem.update_user uid in
- (* let changed = HExtlib.filter_map
- (fun (fl,n) -> if (List.mem MatitaFilesystem.Modified fl) then Some n else None) files
- in
- let changed = String.concat "\n" changed in
- let anomalies = String.concat "\n" anomalies in
- prerr_endline ("Changed:\n" ^ changed ^ "\n\nAnomalies:\n" ^ anomalies); *)
+ let files,anomalies,(added,conflict,del,upd,merged) =
+ MatitaFilesystem.update_user uid
+ 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);
+ let details =
+ Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false () details
+ in
+ MatitaAuthentication.set_file_flag uid files;
cgi # set_header
~cache:`No_cache
~content_type:"text/xml; charset=\"utf-8\""
();
- cgi#out_channel#output_string "<response>ok</response>"
+ cgi#out_channel#output_string "<update>";
+ cgi#out_channel#output_string "<response>ok</response>";
+ cgi#out_channel#output_string ("<details>" ^ details ^ "</details>");
+ cgi#out_channel#output_string "</update>";
with
| Not_found _ ->
cgi # set_header
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
projects / helm.git / blobdiff