Chris@315
|
1 (*
|
Chris@315
|
2 DO NOT EDIT THIS FILE.
|
Chris@315
|
3 This file is automatically generated from the individual
|
Chris@318
|
4 source files in the Repoint repository.
|
Chris@315
|
5 *)
|
Chris@303
|
6
|
Chris@303
|
7 (*
|
Chris@318
|
8 Repoint
|
Chris@303
|
9
|
Chris@303
|
10 A simple manager for third-party source code dependencies
|
Chris@303
|
11
|
Chris@318
|
12 Copyright 2018 Chris Cannam, Particular Programs Ltd,
|
Chris@315
|
13 and Queen Mary, University of London
|
Chris@303
|
14
|
Chris@303
|
15 Permission is hereby granted, free of charge, to any person
|
Chris@303
|
16 obtaining a copy of this software and associated documentation
|
Chris@303
|
17 files (the "Software"), to deal in the Software without
|
Chris@303
|
18 restriction, including without limitation the rights to use, copy,
|
Chris@303
|
19 modify, merge, publish, distribute, sublicense, and/or sell copies
|
Chris@303
|
20 of the Software, and to permit persons to whom the Software is
|
Chris@303
|
21 furnished to do so, subject to the following conditions:
|
Chris@303
|
22
|
Chris@303
|
23 The above copyright notice and this permission notice shall be
|
Chris@303
|
24 included in all copies or substantial portions of the Software.
|
Chris@303
|
25
|
Chris@303
|
26 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
Chris@303
|
27 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
Chris@303
|
28 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
Chris@303
|
29 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
|
Chris@303
|
30 ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
|
Chris@303
|
31 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
Chris@303
|
32 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
Chris@303
|
33
|
Chris@315
|
34 Except as contained in this notice, the names of Chris Cannam,
|
Chris@315
|
35 Particular Programs Ltd, and Queen Mary, University of London
|
Chris@315
|
36 shall not be used in advertising or otherwise to promote the sale,
|
Chris@315
|
37 use or other dealings in this Software without prior written
|
Chris@315
|
38 authorization.
|
Chris@303
|
39 *)
|
Chris@303
|
40
|
Chris@334
|
41 val repoint_version = "1.1"
|
Chris@303
|
42
|
Chris@303
|
43
|
Chris@303
|
44 datatype vcs =
|
Chris@303
|
45 HG |
|
Chris@317
|
46 GIT |
|
Chris@317
|
47 SVN
|
Chris@303
|
48
|
Chris@303
|
49 datatype source =
|
Chris@303
|
50 URL_SOURCE of string |
|
Chris@303
|
51 SERVICE_SOURCE of {
|
Chris@303
|
52 service : string,
|
Chris@303
|
53 owner : string option,
|
Chris@303
|
54 repo : string option
|
Chris@303
|
55 }
|
Chris@303
|
56
|
Chris@314
|
57 type id_or_tag = string
|
Chris@314
|
58
|
Chris@303
|
59 datatype pin =
|
Chris@303
|
60 UNPINNED |
|
Chris@314
|
61 PINNED of id_or_tag
|
Chris@303
|
62
|
Chris@303
|
63 datatype libstate =
|
Chris@303
|
64 ABSENT |
|
Chris@303
|
65 CORRECT |
|
Chris@303
|
66 SUPERSEDED |
|
Chris@303
|
67 WRONG
|
Chris@303
|
68
|
Chris@303
|
69 datatype localstate =
|
Chris@303
|
70 MODIFIED |
|
Chris@314
|
71 LOCK_MISMATCHED |
|
Chris@314
|
72 CLEAN
|
Chris@303
|
73
|
Chris@303
|
74 datatype branch =
|
Chris@303
|
75 BRANCH of string |
|
Chris@303
|
76 DEFAULT_BRANCH
|
Chris@303
|
77
|
Chris@303
|
78 (* If we can recover from an error, for example by reporting failure
|
Chris@303
|
79 for this one thing and going on to the next thing, then the error
|
Chris@303
|
80 should usually be returned through a result type rather than an
|
Chris@303
|
81 exception. *)
|
Chris@303
|
82
|
Chris@303
|
83 datatype 'a result =
|
Chris@303
|
84 OK of 'a |
|
Chris@303
|
85 ERROR of string
|
Chris@303
|
86
|
Chris@303
|
87 type libname = string
|
Chris@303
|
88
|
Chris@303
|
89 type libspec = {
|
Chris@303
|
90 libname : libname,
|
Chris@303
|
91 vcs : vcs,
|
Chris@303
|
92 source : source,
|
Chris@303
|
93 branch : branch,
|
Chris@314
|
94 project_pin : pin,
|
Chris@314
|
95 lock_pin : pin
|
Chris@303
|
96 }
|
Chris@303
|
97
|
Chris@303
|
98 type lock = {
|
Chris@303
|
99 libname : libname,
|
Chris@303
|
100 id_or_tag : id_or_tag
|
Chris@303
|
101 }
|
Chris@314
|
102
|
Chris@303
|
103 type remote_spec = {
|
Chris@303
|
104 anon : string option,
|
Chris@303
|
105 auth : string option
|
Chris@303
|
106 }
|
Chris@303
|
107
|
Chris@303
|
108 type provider = {
|
Chris@303
|
109 service : string,
|
Chris@303
|
110 supports : vcs list,
|
Chris@303
|
111 remote_spec : remote_spec
|
Chris@303
|
112 }
|
Chris@303
|
113
|
Chris@303
|
114 type account = {
|
Chris@303
|
115 service : string,
|
Chris@303
|
116 login : string
|
Chris@303
|
117 }
|
Chris@303
|
118
|
Chris@303
|
119 type context = {
|
Chris@303
|
120 rootpath : string,
|
Chris@303
|
121 extdir : string,
|
Chris@303
|
122 providers : provider list,
|
Chris@303
|
123 accounts : account list
|
Chris@303
|
124 }
|
Chris@303
|
125
|
Chris@303
|
126 type userconfig = {
|
Chris@303
|
127 providers : provider list,
|
Chris@303
|
128 accounts : account list
|
Chris@303
|
129 }
|
Chris@303
|
130
|
Chris@303
|
131 type project = {
|
Chris@303
|
132 context : context,
|
Chris@303
|
133 libs : libspec list
|
Chris@303
|
134 }
|
Chris@303
|
135
|
Chris@318
|
136 structure RepointFilenames = struct
|
Chris@318
|
137 val project_file = "repoint-project.json"
|
Chris@318
|
138 val project_lock_file = "repoint-lock.json"
|
Chris@334
|
139 val project_completion_file = ".repoint.point"
|
Chris@318
|
140 val user_config_file = ".repoint.json"
|
Chris@318
|
141 val archive_dir = ".repoint-archive"
|
Chris@303
|
142 end
|
Chris@303
|
143
|
Chris@303
|
144 signature VCS_CONTROL = sig
|
Chris@303
|
145
|
Chris@318
|
146 (** Check whether the given VCS is installed and working *)
|
Chris@318
|
147 val is_working : context -> bool result
|
Chris@318
|
148
|
Chris@303
|
149 (** Test whether the library is present locally at all *)
|
Chris@303
|
150 val exists : context -> libname -> bool result
|
Chris@303
|
151
|
Chris@303
|
152 (** Return the id (hash) of the current revision for the library *)
|
Chris@303
|
153 val id_of : context -> libname -> id_or_tag result
|
Chris@303
|
154
|
Chris@303
|
155 (** Test whether the library is at the given id *)
|
Chris@303
|
156 val is_at : context -> libname * id_or_tag -> bool result
|
Chris@303
|
157
|
Chris@303
|
158 (** Test whether the library is on the given branch, i.e. is at
|
Chris@303
|
159 the branch tip or an ancestor of it *)
|
Chris@303
|
160 val is_on_branch : context -> libname * branch -> bool result
|
Chris@303
|
161
|
Chris@303
|
162 (** Test whether the library is at the newest revision for the
|
Chris@303
|
163 given branch. False may indicate that the branch has advanced
|
Chris@303
|
164 or that the library is not on the branch at all. This function
|
Chris@303
|
165 may use the network to check for new revisions *)
|
Chris@317
|
166 val is_newest : context -> libname * source * branch -> bool result
|
Chris@303
|
167
|
Chris@303
|
168 (** Test whether the library is at the newest revision available
|
Chris@303
|
169 locally for the given branch. False may indicate that the
|
Chris@303
|
170 branch has advanced or that the library is not on the branch
|
Chris@303
|
171 at all. This function must not use the network *)
|
Chris@303
|
172 val is_newest_locally : context -> libname * branch -> bool result
|
Chris@303
|
173
|
Chris@303
|
174 (** Test whether the library has been modified in the local
|
Chris@303
|
175 working copy *)
|
Chris@303
|
176 val is_modified_locally : context -> libname -> bool result
|
Chris@303
|
177
|
Chris@303
|
178 (** Check out, i.e. clone a fresh copy of, the repo for the given
|
Chris@303
|
179 library on the given branch *)
|
Chris@303
|
180 val checkout : context -> libname * source * branch -> unit result
|
Chris@303
|
181
|
Chris@317
|
182 (** Update the library to the given branch tip. Assumes that a
|
Chris@317
|
183 local copy of the library already exists *)
|
Chris@317
|
184 val update : context -> libname * source * branch -> unit result
|
Chris@303
|
185
|
Chris@303
|
186 (** Update the library to the given specific id or tag *)
|
Chris@317
|
187 val update_to : context -> libname * source * id_or_tag -> unit result
|
Chris@317
|
188
|
Chris@317
|
189 (** Return a URL from which the library can be cloned, given that
|
Chris@317
|
190 the local copy already exists. For a DVCS this can be the
|
Chris@317
|
191 local copy, but for a centralised VCS it will have to be the
|
Chris@317
|
192 remote repository URL. Used for archiving *)
|
Chris@317
|
193 val copy_url_for : context -> libname -> string result
|
Chris@303
|
194 end
|
Chris@303
|
195
|
Chris@303
|
196 signature LIB_CONTROL = sig
|
Chris@303
|
197 val review : context -> libspec -> (libstate * localstate) result
|
Chris@303
|
198 val status : context -> libspec -> (libstate * localstate) result
|
Chris@317
|
199 val update : context -> libspec -> unit result
|
Chris@314
|
200 val id_of : context -> libspec -> id_or_tag result
|
Chris@318
|
201 val is_working : context -> vcs -> bool result
|
Chris@303
|
202 end
|
Chris@303
|
203
|
Chris@303
|
204 structure FileBits :> sig
|
Chris@303
|
205 val extpath : context -> string
|
Chris@303
|
206 val libpath : context -> libname -> string
|
Chris@303
|
207 val subpath : context -> libname -> string -> string
|
Chris@303
|
208 val command_output : context -> libname -> string list -> string result
|
Chris@303
|
209 val command : context -> libname -> string list -> unit result
|
Chris@317
|
210 val file_url : string -> string
|
Chris@303
|
211 val file_contents : string -> string
|
Chris@303
|
212 val mydir : unit -> string
|
Chris@303
|
213 val homedir : unit -> string
|
Chris@303
|
214 val mkpath : string -> unit result
|
Chris@315
|
215 val rmpath : string -> unit result
|
Chris@317
|
216 val nonempty_dir_exists : string -> bool
|
Chris@303
|
217 val project_spec_path : string -> string
|
Chris@303
|
218 val project_lock_path : string -> string
|
Chris@334
|
219 val project_completion_path : string -> string
|
Chris@303
|
220 val verbose : unit -> bool
|
Chris@303
|
221 end = struct
|
Chris@303
|
222
|
Chris@303
|
223 fun verbose () =
|
Chris@318
|
224 case OS.Process.getEnv "REPOINT_VERBOSE" of
|
Chris@303
|
225 SOME "0" => false
|
Chris@303
|
226 | SOME _ => true
|
Chris@303
|
227 | NONE => false
|
Chris@303
|
228
|
Chris@317
|
229 fun split_relative path desc =
|
Chris@317
|
230 case OS.Path.fromString path of
|
Chris@317
|
231 { isAbs = true, ... } => raise Fail (desc ^ " may not be absolute")
|
Chris@317
|
232 | { arcs, ... } => arcs
|
Chris@317
|
233
|
Chris@303
|
234 fun extpath ({ rootpath, extdir, ... } : context) =
|
Chris@303
|
235 let val { isAbs, vol, arcs } = OS.Path.fromString rootpath
|
Chris@303
|
236 in OS.Path.toString {
|
Chris@303
|
237 isAbs = isAbs,
|
Chris@303
|
238 vol = vol,
|
Chris@317
|
239 arcs = arcs @
|
Chris@317
|
240 split_relative extdir "extdir"
|
Chris@303
|
241 }
|
Chris@303
|
242 end
|
Chris@303
|
243
|
Chris@303
|
244 fun subpath ({ rootpath, extdir, ... } : context) libname remainder =
|
Chris@303
|
245 (* NB libname is allowed to be a path fragment, e.g. foo/bar *)
|
Chris@303
|
246 let val { isAbs, vol, arcs } = OS.Path.fromString rootpath
|
Chris@303
|
247 in OS.Path.toString {
|
Chris@303
|
248 isAbs = isAbs,
|
Chris@303
|
249 vol = vol,
|
Chris@317
|
250 arcs = arcs @
|
Chris@317
|
251 split_relative extdir "extdir" @
|
Chris@317
|
252 split_relative libname "library path" @
|
Chris@317
|
253 split_relative remainder "subpath"
|
Chris@303
|
254 }
|
Chris@303
|
255 end
|
Chris@303
|
256
|
Chris@303
|
257 fun libpath context "" =
|
Chris@303
|
258 extpath context
|
Chris@303
|
259 | libpath context libname =
|
Chris@303
|
260 subpath context libname ""
|
Chris@303
|
261
|
Chris@303
|
262 fun project_file_path rootpath filename =
|
Chris@303
|
263 let val { isAbs, vol, arcs } = OS.Path.fromString rootpath
|
Chris@303
|
264 in OS.Path.toString {
|
Chris@303
|
265 isAbs = isAbs,
|
Chris@303
|
266 vol = vol,
|
Chris@303
|
267 arcs = arcs @ [ filename ]
|
Chris@303
|
268 }
|
Chris@303
|
269 end
|
Chris@303
|
270
|
Chris@303
|
271 fun project_spec_path rootpath =
|
Chris@318
|
272 project_file_path rootpath (RepointFilenames.project_file)
|
Chris@303
|
273
|
Chris@303
|
274 fun project_lock_path rootpath =
|
Chris@318
|
275 project_file_path rootpath (RepointFilenames.project_lock_file)
|
Chris@303
|
276
|
Chris@334
|
277 fun project_completion_path rootpath =
|
Chris@334
|
278 project_file_path rootpath (RepointFilenames.project_completion_file)
|
Chris@334
|
279
|
Chris@303
|
280 fun trim str =
|
Chris@303
|
281 hd (String.fields (fn x => x = #"\n" orelse x = #"\r") str)
|
Chris@317
|
282
|
Chris@317
|
283 fun file_url path =
|
Chris@317
|
284 let val forward_path =
|
Chris@317
|
285 String.translate (fn #"\\" => "/" |
|
Chris@317
|
286 c => Char.toString c)
|
Chris@317
|
287 (OS.Path.mkCanonical path)
|
Chris@317
|
288 in
|
Chris@317
|
289 (* Path is expected to be absolute already, but if it
|
Chris@317
|
290 starts with a drive letter, we'll need an extra slash *)
|
Chris@317
|
291 case explode forward_path of
|
Chris@317
|
292 #"/"::rest => "file:///" ^ implode rest
|
Chris@317
|
293 | _ => "file:///" ^ forward_path
|
Chris@317
|
294 end
|
Chris@303
|
295
|
Chris@303
|
296 fun file_contents filename =
|
Chris@303
|
297 let val stream = TextIO.openIn filename
|
Chris@303
|
298 fun read_all str acc =
|
Chris@303
|
299 case TextIO.inputLine str of
|
Chris@303
|
300 SOME line => read_all str (trim line :: acc)
|
Chris@303
|
301 | NONE => rev acc
|
Chris@303
|
302 val contents = read_all stream []
|
Chris@303
|
303 val _ = TextIO.closeIn stream
|
Chris@303
|
304 in
|
Chris@303
|
305 String.concatWith "\n" contents
|
Chris@303
|
306 end
|
Chris@303
|
307
|
Chris@303
|
308 fun expand_commandline cmdlist =
|
Chris@318
|
309 (* We are quite strict about what we accept here, except
|
Chris@303
|
310 for the first element in cmdlist which is assumed to be a
|
Chris@318
|
311 known command location rather than arbitrary user input. *)
|
Chris@303
|
312 let open Char
|
Chris@303
|
313 fun quote arg =
|
Chris@303
|
314 if List.all
|
Chris@303
|
315 (fn c => isAlphaNum c orelse c = #"-" orelse c = #"_")
|
Chris@303
|
316 (explode arg)
|
Chris@303
|
317 then arg
|
Chris@303
|
318 else "\"" ^ arg ^ "\""
|
Chris@303
|
319 fun check arg =
|
Chris@318
|
320 let val valid = explode " /#:;?,._-{}@=+"
|
Chris@303
|
321 in
|
Chris@303
|
322 app (fn c =>
|
Chris@303
|
323 if isAlphaNum c orelse
|
Chris@318
|
324 List.exists (fn v => v = c) valid orelse
|
Chris@318
|
325 c > chr 127
|
Chris@303
|
326 then ()
|
Chris@303
|
327 else raise Fail ("Invalid character '" ^
|
Chris@303
|
328 (Char.toString c) ^
|
Chris@303
|
329 "' in command list"))
|
Chris@303
|
330 (explode arg);
|
Chris@303
|
331 arg
|
Chris@303
|
332 end
|
Chris@303
|
333 in
|
Chris@303
|
334 String.concatWith " "
|
Chris@303
|
335 (map quote
|
Chris@303
|
336 (hd cmdlist :: map check (tl cmdlist)))
|
Chris@303
|
337 end
|
Chris@303
|
338
|
Chris@303
|
339 val tick_cycle = ref 0
|
Chris@303
|
340 val tick_chars = Vector.fromList (map String.str (explode "|/-\\"))
|
Chris@303
|
341
|
Chris@303
|
342 fun tick libname cmdlist =
|
Chris@303
|
343 let val n = Vector.length tick_chars
|
Chris@303
|
344 fun pad_to n str =
|
Chris@303
|
345 if n <= String.size str then str
|
Chris@303
|
346 else pad_to n (str ^ " ")
|
Chris@303
|
347 val name = if libname <> "" then libname
|
Chris@303
|
348 else if cmdlist = nil then ""
|
Chris@303
|
349 else hd (rev cmdlist)
|
Chris@303
|
350 in
|
Chris@303
|
351 print (" " ^
|
Chris@303
|
352 Vector.sub(tick_chars, !tick_cycle) ^ " " ^
|
Chris@318
|
353 pad_to 70 name ^
|
Chris@303
|
354 "\r");
|
Chris@303
|
355 tick_cycle := (if !tick_cycle = n - 1 then 0 else 1 + !tick_cycle)
|
Chris@303
|
356 end
|
Chris@303
|
357
|
Chris@303
|
358 fun run_command context libname cmdlist redirect =
|
Chris@303
|
359 let open OS
|
Chris@303
|
360 val dir = libpath context libname
|
Chris@303
|
361 val cmd = expand_commandline cmdlist
|
Chris@303
|
362 val _ = if verbose ()
|
Chris@318
|
363 then print ("\n=== " ^ dir ^ "\n<<< " ^ cmd ^ "\n")
|
Chris@303
|
364 else tick libname cmdlist
|
Chris@303
|
365 val _ = FileSys.chDir dir
|
Chris@303
|
366 val status = case redirect of
|
Chris@303
|
367 NONE => Process.system cmd
|
Chris@303
|
368 | SOME file => Process.system (cmd ^ ">" ^ file)
|
Chris@303
|
369 in
|
Chris@303
|
370 if Process.isSuccess status
|
Chris@303
|
371 then OK ()
|
Chris@303
|
372 else ERROR ("Command failed: " ^ cmd ^ " (in dir " ^ dir ^ ")")
|
Chris@303
|
373 end
|
Chris@303
|
374 handle ex => ERROR ("Unable to run command: " ^ exnMessage ex)
|
Chris@303
|
375
|
Chris@303
|
376 fun command context libname cmdlist =
|
Chris@303
|
377 run_command context libname cmdlist NONE
|
Chris@303
|
378
|
Chris@303
|
379 fun command_output context libname cmdlist =
|
Chris@303
|
380 let open OS
|
Chris@303
|
381 val tmpFile = FileSys.tmpName ()
|
Chris@303
|
382 val result = run_command context libname cmdlist (SOME tmpFile)
|
Chris@303
|
383 val contents = file_contents tmpFile
|
Chris@317
|
384 val _ = if verbose ()
|
Chris@318
|
385 then print (">>> \"" ^ contents ^ "\"\n")
|
Chris@317
|
386 else ()
|
Chris@303
|
387 in
|
Chris@303
|
388 FileSys.remove tmpFile handle _ => ();
|
Chris@303
|
389 case result of
|
Chris@303
|
390 OK () => OK contents
|
Chris@303
|
391 | ERROR e => ERROR e
|
Chris@303
|
392 end
|
Chris@303
|
393
|
Chris@303
|
394 fun mydir () =
|
Chris@303
|
395 let open OS
|
Chris@303
|
396 val { dir, file } = Path.splitDirFile (CommandLine.name ())
|
Chris@303
|
397 in
|
Chris@303
|
398 FileSys.realPath
|
Chris@303
|
399 (if Path.isAbsolute dir
|
Chris@303
|
400 then dir
|
Chris@303
|
401 else Path.concat (FileSys.getDir (), dir))
|
Chris@303
|
402 end
|
Chris@303
|
403
|
Chris@303
|
404 fun homedir () =
|
Chris@303
|
405 (* Failure is not routine, so we use an exception here *)
|
Chris@303
|
406 case (OS.Process.getEnv "HOME",
|
Chris@303
|
407 OS.Process.getEnv "HOMEPATH") of
|
Chris@303
|
408 (SOME home, _) => home
|
Chris@303
|
409 | (NONE, SOME home) => home
|
Chris@303
|
410 | (NONE, NONE) =>
|
Chris@303
|
411 raise Fail "Failed to look up home directory from environment"
|
Chris@303
|
412
|
Chris@317
|
413 fun mkpath' path =
|
Chris@303
|
414 if OS.FileSys.isDir path handle _ => false
|
Chris@303
|
415 then OK ()
|
Chris@303
|
416 else case OS.Path.fromString path of
|
Chris@303
|
417 { arcs = nil, ... } => OK ()
|
Chris@303
|
418 | { isAbs = false, ... } => ERROR "mkpath requires absolute path"
|
Chris@303
|
419 | { isAbs, vol, arcs } =>
|
Chris@317
|
420 case mkpath' (OS.Path.toString { (* parent *)
|
Chris@317
|
421 isAbs = isAbs,
|
Chris@317
|
422 vol = vol,
|
Chris@317
|
423 arcs = rev (tl (rev arcs)) }) of
|
Chris@303
|
424 ERROR e => ERROR e
|
Chris@303
|
425 | OK () => ((OS.FileSys.mkDir path; OK ())
|
Chris@303
|
426 handle OS.SysErr (e, _) =>
|
Chris@303
|
427 ERROR ("Directory creation failed: " ^ e))
|
Chris@315
|
428
|
Chris@317
|
429 fun mkpath path =
|
Chris@317
|
430 mkpath' (OS.Path.mkCanonical path)
|
Chris@317
|
431
|
Chris@317
|
432 fun dir_contents dir =
|
Chris@315
|
433 let open OS
|
Chris@315
|
434 fun files_from dirstream =
|
Chris@315
|
435 case FileSys.readDir dirstream of
|
Chris@315
|
436 NONE => []
|
Chris@315
|
437 | SOME file =>
|
Chris@315
|
438 (* readDir is supposed to filter these,
|
Chris@315
|
439 but let's be extra cautious: *)
|
Chris@315
|
440 if file = Path.parentArc orelse file = Path.currentArc
|
Chris@315
|
441 then files_from dirstream
|
Chris@315
|
442 else file :: files_from dirstream
|
Chris@317
|
443 val stream = FileSys.openDir dir
|
Chris@317
|
444 val files = map (fn f => Path.joinDirFile
|
Chris@317
|
445 { dir = dir, file = f })
|
Chris@317
|
446 (files_from stream)
|
Chris@317
|
447 val _ = FileSys.closeDir stream
|
Chris@317
|
448 in
|
Chris@317
|
449 files
|
Chris@317
|
450 end
|
Chris@317
|
451
|
Chris@317
|
452 fun rmpath' path =
|
Chris@317
|
453 let open OS
|
Chris@315
|
454 fun remove path =
|
Chris@315
|
455 if FileSys.isLink path (* dangling links bother isDir *)
|
Chris@315
|
456 then FileSys.remove path
|
Chris@315
|
457 else if FileSys.isDir path
|
Chris@317
|
458 then (app remove (dir_contents path); FileSys.rmDir path)
|
Chris@315
|
459 else FileSys.remove path
|
Chris@315
|
460 in
|
Chris@315
|
461 (remove path; OK ())
|
Chris@315
|
462 handle SysErr (e, _) => ERROR ("Path removal failed: " ^ e)
|
Chris@315
|
463 end
|
Chris@317
|
464
|
Chris@317
|
465 fun rmpath path =
|
Chris@317
|
466 rmpath' (OS.Path.mkCanonical path)
|
Chris@317
|
467
|
Chris@317
|
468 fun nonempty_dir_exists path =
|
Chris@317
|
469 let open OS.FileSys
|
Chris@317
|
470 in
|
Chris@317
|
471 (not (isLink path) andalso
|
Chris@317
|
472 isDir path andalso
|
Chris@317
|
473 dir_contents path <> [])
|
Chris@317
|
474 handle _ => false
|
Chris@317
|
475 end
|
Chris@317
|
476
|
Chris@303
|
477 end
|
Chris@303
|
478
|
Chris@303
|
479 functor LibControlFn (V: VCS_CONTROL) :> LIB_CONTROL = struct
|
Chris@303
|
480
|
Chris@303
|
481 (* Valid states for unpinned libraries:
|
Chris@303
|
482
|
Chris@303
|
483 - CORRECT: We are on the right branch and are up-to-date with
|
Chris@303
|
484 it as far as we can tell. (If not using the network, this
|
Chris@303
|
485 should be reported to user as "Present" rather than "Correct"
|
Chris@303
|
486 as the remote repo may have advanced without us knowing.)
|
Chris@303
|
487
|
Chris@303
|
488 - SUPERSEDED: We are on the right branch but we can see that
|
Chris@303
|
489 there is a newer revision either locally or on the remote (in
|
Chris@303
|
490 Git terms, we are at an ancestor of the desired branch tip).
|
Chris@303
|
491
|
Chris@303
|
492 - WRONG: We are on the wrong branch (in Git terms, we are not
|
Chris@303
|
493 at the desired branch tip or any ancestor of it).
|
Chris@303
|
494
|
Chris@303
|
495 - ABSENT: Repo doesn't exist here at all.
|
Chris@303
|
496
|
Chris@303
|
497 Valid states for pinned libraries:
|
Chris@303
|
498
|
Chris@303
|
499 - CORRECT: We are at the pinned revision.
|
Chris@303
|
500
|
Chris@303
|
501 - WRONG: We are at any revision other than the pinned one.
|
Chris@303
|
502
|
Chris@303
|
503 - ABSENT: Repo doesn't exist here at all.
|
Chris@303
|
504 *)
|
Chris@303
|
505
|
Chris@314
|
506 fun check with_network context
|
Chris@317
|
507 ({ libname, source, branch,
|
Chris@317
|
508 project_pin, lock_pin, ... } : libspec) =
|
Chris@303
|
509 let fun check_unpinned () =
|
Chris@317
|
510 let val newest =
|
Chris@317
|
511 if with_network
|
Chris@317
|
512 then V.is_newest context (libname, source, branch)
|
Chris@317
|
513 else V.is_newest_locally context (libname, branch)
|
Chris@303
|
514 in
|
Chris@317
|
515 case newest of
|
Chris@303
|
516 ERROR e => ERROR e
|
Chris@303
|
517 | OK true => OK CORRECT
|
Chris@303
|
518 | OK false =>
|
Chris@303
|
519 case V.is_on_branch context (libname, branch) of
|
Chris@303
|
520 ERROR e => ERROR e
|
Chris@303
|
521 | OK true => OK SUPERSEDED
|
Chris@303
|
522 | OK false => OK WRONG
|
Chris@303
|
523 end
|
Chris@303
|
524 fun check_pinned target =
|
Chris@303
|
525 case V.is_at context (libname, target) of
|
Chris@303
|
526 ERROR e => ERROR e
|
Chris@303
|
527 | OK true => OK CORRECT
|
Chris@303
|
528 | OK false => OK WRONG
|
Chris@314
|
529 fun check_remote () =
|
Chris@314
|
530 case project_pin of
|
Chris@303
|
531 UNPINNED => check_unpinned ()
|
Chris@303
|
532 | PINNED target => check_pinned target
|
Chris@314
|
533 fun check_local () =
|
Chris@314
|
534 case V.is_modified_locally context libname of
|
Chris@314
|
535 ERROR e => ERROR e
|
Chris@314
|
536 | OK true => OK MODIFIED
|
Chris@314
|
537 | OK false =>
|
Chris@314
|
538 case lock_pin of
|
Chris@314
|
539 UNPINNED => OK CLEAN
|
Chris@314
|
540 | PINNED target =>
|
Chris@314
|
541 case V.is_at context (libname, target) of
|
Chris@314
|
542 ERROR e => ERROR e
|
Chris@314
|
543 | OK true => OK CLEAN
|
Chris@314
|
544 | OK false => OK LOCK_MISMATCHED
|
Chris@303
|
545 in
|
Chris@303
|
546 case V.exists context libname of
|
Chris@303
|
547 ERROR e => ERROR e
|
Chris@314
|
548 | OK false => OK (ABSENT, CLEAN)
|
Chris@303
|
549 | OK true =>
|
Chris@314
|
550 case (check_remote (), check_local ()) of
|
Chris@303
|
551 (ERROR e, _) => ERROR e
|
Chris@303
|
552 | (_, ERROR e) => ERROR e
|
Chris@314
|
553 | (OK r, OK l) => OK (r, l)
|
Chris@303
|
554 end
|
Chris@303
|
555
|
Chris@303
|
556 val review = check true
|
Chris@303
|
557 val status = check false
|
Chris@314
|
558
|
Chris@314
|
559 fun update context
|
Chris@314
|
560 ({ libname, source, branch,
|
Chris@314
|
561 project_pin, lock_pin, ... } : libspec) =
|
Chris@303
|
562 let fun update_unpinned () =
|
Chris@317
|
563 case V.is_newest context (libname, source, branch) of
|
Chris@303
|
564 ERROR e => ERROR e
|
Chris@317
|
565 | OK true => OK ()
|
Chris@317
|
566 | OK false => V.update context (libname, source, branch)
|
Chris@303
|
567 fun update_pinned target =
|
Chris@303
|
568 case V.is_at context (libname, target) of
|
Chris@303
|
569 ERROR e => ERROR e
|
Chris@317
|
570 | OK true => OK ()
|
Chris@317
|
571 | OK false => V.update_to context (libname, source, target)
|
Chris@303
|
572 fun update' () =
|
Chris@314
|
573 case lock_pin of
|
Chris@314
|
574 PINNED target => update_pinned target
|
Chris@314
|
575 | UNPINNED =>
|
Chris@314
|
576 case project_pin of
|
Chris@314
|
577 PINNED target => update_pinned target
|
Chris@314
|
578 | UNPINNED => update_unpinned ()
|
Chris@303
|
579 in
|
Chris@303
|
580 case V.exists context libname of
|
Chris@303
|
581 ERROR e => ERROR e
|
Chris@303
|
582 | OK true => update' ()
|
Chris@303
|
583 | OK false =>
|
Chris@303
|
584 case V.checkout context (libname, source, branch) of
|
Chris@303
|
585 ERROR e => ERROR e
|
Chris@303
|
586 | OK () => update' ()
|
Chris@303
|
587 end
|
Chris@314
|
588
|
Chris@314
|
589 fun id_of context ({ libname, ... } : libspec) =
|
Chris@314
|
590 V.id_of context libname
|
Chris@318
|
591
|
Chris@318
|
592 fun is_working context vcs =
|
Chris@318
|
593 V.is_working context
|
Chris@314
|
594
|
Chris@303
|
595 end
|
Chris@303
|
596
|
Chris@303
|
597 (* Simple Standard ML JSON parser
|
Chris@303
|
598 https://bitbucket.org/cannam/sml-simplejson
|
Chris@318
|
599 Copyright 2017 Chris Cannam. BSD licence.
|
Chris@303
|
600 Parts based on the JSON parser in the Ponyo library by Phil Eaton.
|
Chris@303
|
601 *)
|
Chris@303
|
602
|
Chris@303
|
603 signature JSON = sig
|
Chris@303
|
604
|
Chris@303
|
605 datatype json = OBJECT of (string * json) list
|
Chris@303
|
606 | ARRAY of json list
|
Chris@303
|
607 | NUMBER of real
|
Chris@303
|
608 | STRING of string
|
Chris@303
|
609 | BOOL of bool
|
Chris@303
|
610 | NULL
|
Chris@303
|
611
|
Chris@303
|
612 datatype 'a result = OK of 'a
|
Chris@303
|
613 | ERROR of string
|
Chris@303
|
614
|
Chris@303
|
615 val parse : string -> json result
|
Chris@303
|
616 val serialise : json -> string
|
Chris@303
|
617 val serialiseIndented : json -> string
|
Chris@303
|
618
|
Chris@303
|
619 end
|
Chris@303
|
620
|
Chris@303
|
621 structure Json :> JSON = struct
|
Chris@303
|
622
|
Chris@303
|
623 datatype json = OBJECT of (string * json) list
|
Chris@303
|
624 | ARRAY of json list
|
Chris@303
|
625 | NUMBER of real
|
Chris@303
|
626 | STRING of string
|
Chris@303
|
627 | BOOL of bool
|
Chris@303
|
628 | NULL
|
Chris@303
|
629
|
Chris@303
|
630 datatype 'a result = OK of 'a
|
Chris@303
|
631 | ERROR of string
|
Chris@303
|
632
|
Chris@303
|
633 structure T = struct
|
Chris@303
|
634 datatype token = NUMBER of char list
|
Chris@303
|
635 | STRING of string
|
Chris@303
|
636 | BOOL of bool
|
Chris@303
|
637 | NULL
|
Chris@303
|
638 | CURLY_L
|
Chris@303
|
639 | CURLY_R
|
Chris@303
|
640 | SQUARE_L
|
Chris@303
|
641 | SQUARE_R
|
Chris@303
|
642 | COLON
|
Chris@303
|
643 | COMMA
|
Chris@303
|
644
|
Chris@303
|
645 fun toString t =
|
Chris@303
|
646 case t of NUMBER digits => implode digits
|
Chris@303
|
647 | STRING s => s
|
Chris@303
|
648 | BOOL b => Bool.toString b
|
Chris@303
|
649 | NULL => "null"
|
Chris@303
|
650 | CURLY_L => "{"
|
Chris@303
|
651 | CURLY_R => "}"
|
Chris@303
|
652 | SQUARE_L => "["
|
Chris@303
|
653 | SQUARE_R => "]"
|
Chris@303
|
654 | COLON => ":"
|
Chris@303
|
655 | COMMA => ","
|
Chris@303
|
656 end
|
Chris@303
|
657
|
Chris@303
|
658 fun bmpToUtf8 cp = (* convert a codepoint in Unicode BMP to utf8 bytes *)
|
Chris@303
|
659 let open Word
|
Chris@303
|
660 infix 6 orb andb >>
|
Chris@303
|
661 in
|
Chris@303
|
662 map (Char.chr o toInt)
|
Chris@303
|
663 (if cp < 0wx80 then
|
Chris@303
|
664 [cp]
|
Chris@303
|
665 else if cp < 0wx800 then
|
Chris@303
|
666 [0wxc0 orb (cp >> 0w6), 0wx80 orb (cp andb 0wx3f)]
|
Chris@303
|
667 else if cp < 0wx10000 then
|
Chris@303
|
668 [0wxe0 orb (cp >> 0w12),
|
Chris@303
|
669 0wx80 orb ((cp >> 0w6) andb 0wx3f),
|
Chris@303
|
670 0wx80 orb (cp andb 0wx3f)]
|
Chris@303
|
671 else raise Fail ("Invalid BMP point " ^ (Word.toString cp)))
|
Chris@303
|
672 end
|
Chris@303
|
673
|
Chris@303
|
674 fun error pos text = ERROR (text ^ " at character position " ^
|
Chris@303
|
675 Int.toString (pos - 1))
|
Chris@303
|
676 fun token_error pos = error pos ("Unexpected token")
|
Chris@303
|
677
|
Chris@303
|
678 fun lexNull pos acc (#"u" :: #"l" :: #"l" :: xs) =
|
Chris@303
|
679 lex (pos + 3) (T.NULL :: acc) xs
|
Chris@303
|
680 | lexNull pos acc _ = token_error pos
|
Chris@303
|
681
|
Chris@303
|
682 and lexTrue pos acc (#"r" :: #"u" :: #"e" :: xs) =
|
Chris@303
|
683 lex (pos + 3) (T.BOOL true :: acc) xs
|
Chris@303
|
684 | lexTrue pos acc _ = token_error pos
|
Chris@303
|
685
|
Chris@303
|
686 and lexFalse pos acc (#"a" :: #"l" :: #"s" :: #"e" :: xs) =
|
Chris@303
|
687 lex (pos + 4) (T.BOOL false :: acc) xs
|
Chris@303
|
688 | lexFalse pos acc _ = token_error pos
|
Chris@303
|
689
|
Chris@303
|
690 and lexChar tok pos acc xs =
|
Chris@303
|
691 lex pos (tok :: acc) xs
|
Chris@303
|
692
|
Chris@303
|
693 and lexString pos acc cc =
|
Chris@303
|
694 let datatype escaped = ESCAPED | NORMAL
|
Chris@303
|
695 fun lexString' pos text ESCAPED [] =
|
Chris@303
|
696 error pos "End of input during escape sequence"
|
Chris@303
|
697 | lexString' pos text NORMAL [] =
|
Chris@303
|
698 error pos "End of input during string"
|
Chris@303
|
699 | lexString' pos text ESCAPED (x :: xs) =
|
Chris@303
|
700 let fun esc c = lexString' (pos + 1) (c :: text) NORMAL xs
|
Chris@303
|
701 in case x of
|
Chris@303
|
702 #"\"" => esc x
|
Chris@303
|
703 | #"\\" => esc x
|
Chris@303
|
704 | #"/" => esc x
|
Chris@303
|
705 | #"b" => esc #"\b"
|
Chris@303
|
706 | #"f" => esc #"\f"
|
Chris@303
|
707 | #"n" => esc #"\n"
|
Chris@303
|
708 | #"r" => esc #"\r"
|
Chris@303
|
709 | #"t" => esc #"\t"
|
Chris@303
|
710 | _ => error pos ("Invalid escape \\" ^
|
Chris@303
|
711 Char.toString x)
|
Chris@303
|
712 end
|
Chris@303
|
713 | lexString' pos text NORMAL (#"\\" :: #"u" ::a::b::c::d:: xs) =
|
Chris@303
|
714 if List.all Char.isHexDigit [a,b,c,d]
|
Chris@303
|
715 then case Word.fromString ("0wx" ^ (implode [a,b,c,d])) of
|
Chris@303
|
716 SOME w => (let val utf = rev (bmpToUtf8 w) in
|
Chris@303
|
717 lexString' (pos + 6) (utf @ text)
|
Chris@303
|
718 NORMAL xs
|
Chris@303
|
719 end
|
Chris@303
|
720 handle Fail err => error pos err)
|
Chris@303
|
721 | NONE => error pos "Invalid Unicode BMP escape sequence"
|
Chris@303
|
722 else error pos "Invalid Unicode BMP escape sequence"
|
Chris@303
|
723 | lexString' pos text NORMAL (x :: xs) =
|
Chris@303
|
724 if Char.ord x < 0x20
|
Chris@303
|
725 then error pos "Invalid unescaped control character"
|
Chris@303
|
726 else
|
Chris@303
|
727 case x of
|
Chris@303
|
728 #"\"" => OK (rev text, xs, pos + 1)
|
Chris@303
|
729 | #"\\" => lexString' (pos + 1) text ESCAPED xs
|
Chris@303
|
730 | _ => lexString' (pos + 1) (x :: text) NORMAL xs
|
Chris@303
|
731 in
|
Chris@303
|
732 case lexString' pos [] NORMAL cc of
|
Chris@303
|
733 OK (text, rest, newpos) =>
|
Chris@303
|
734 lex newpos (T.STRING (implode text) :: acc) rest
|
Chris@303
|
735 | ERROR e => ERROR e
|
Chris@303
|
736 end
|
Chris@303
|
737
|
Chris@303
|
738 and lexNumber firstChar pos acc cc =
|
Chris@303
|
739 let val valid = explode ".+-e"
|
Chris@303
|
740 fun lexNumber' pos digits [] = (rev digits, [], pos)
|
Chris@303
|
741 | lexNumber' pos digits (x :: xs) =
|
Chris@303
|
742 if x = #"E" then lexNumber' (pos + 1) (#"e" :: digits) xs
|
Chris@303
|
743 else if Char.isDigit x orelse List.exists (fn c => x = c) valid
|
Chris@303
|
744 then lexNumber' (pos + 1) (x :: digits) xs
|
Chris@303
|
745 else (rev digits, x :: xs, pos)
|
Chris@303
|
746 val (digits, rest, newpos) =
|
Chris@303
|
747 lexNumber' (pos - 1) [] (firstChar :: cc)
|
Chris@303
|
748 in
|
Chris@303
|
749 case digits of
|
Chris@303
|
750 [] => token_error pos
|
Chris@303
|
751 | _ => lex newpos (T.NUMBER digits :: acc) rest
|
Chris@303
|
752 end
|
Chris@303
|
753
|
Chris@303
|
754 and lex pos acc [] = OK (rev acc)
|
Chris@303
|
755 | lex pos acc (x::xs) =
|
Chris@303
|
756 (case x of
|
Chris@303
|
757 #" " => lex
|
Chris@303
|
758 | #"\t" => lex
|
Chris@303
|
759 | #"\n" => lex
|
Chris@303
|
760 | #"\r" => lex
|
Chris@303
|
761 | #"{" => lexChar T.CURLY_L
|
Chris@303
|
762 | #"}" => lexChar T.CURLY_R
|
Chris@303
|
763 | #"[" => lexChar T.SQUARE_L
|
Chris@303
|
764 | #"]" => lexChar T.SQUARE_R
|
Chris@303
|
765 | #":" => lexChar T.COLON
|
Chris@303
|
766 | #"," => lexChar T.COMMA
|
Chris@303
|
767 | #"\"" => lexString
|
Chris@303
|
768 | #"t" => lexTrue
|
Chris@303
|
769 | #"f" => lexFalse
|
Chris@303
|
770 | #"n" => lexNull
|
Chris@303
|
771 | x => lexNumber x) (pos + 1) acc xs
|
Chris@303
|
772
|
Chris@303
|
773 fun show [] = "end of input"
|
Chris@303
|
774 | show (tok :: _) = T.toString tok
|
Chris@303
|
775
|
Chris@303
|
776 fun parseNumber digits =
|
Chris@303
|
777 (* Note lexNumber already case-insensitised the E for us *)
|
Chris@303
|
778 let open Char
|
Chris@303
|
779
|
Chris@303
|
780 fun okExpDigits [] = false
|
Chris@303
|
781 | okExpDigits (c :: []) = isDigit c
|
Chris@303
|
782 | okExpDigits (c :: cs) = isDigit c andalso okExpDigits cs
|
Chris@303
|
783
|
Chris@303
|
784 fun okExponent [] = false
|
Chris@303
|
785 | okExponent (#"+" :: cs) = okExpDigits cs
|
Chris@303
|
786 | okExponent (#"-" :: cs) = okExpDigits cs
|
Chris@303
|
787 | okExponent cc = okExpDigits cc
|
Chris@303
|
788
|
Chris@303
|
789 fun okFracTrailing [] = true
|
Chris@303
|
790 | okFracTrailing (c :: cs) =
|
Chris@303
|
791 (isDigit c andalso okFracTrailing cs) orelse
|
Chris@303
|
792 (c = #"e" andalso okExponent cs)
|
Chris@303
|
793
|
Chris@303
|
794 fun okFraction [] = false
|
Chris@303
|
795 | okFraction (c :: cs) =
|
Chris@303
|
796 isDigit c andalso okFracTrailing cs
|
Chris@303
|
797
|
Chris@303
|
798 fun okPosTrailing [] = true
|
Chris@303
|
799 | okPosTrailing (#"." :: cs) = okFraction cs
|
Chris@303
|
800 | okPosTrailing (#"e" :: cs) = okExponent cs
|
Chris@303
|
801 | okPosTrailing (c :: cs) =
|
Chris@303
|
802 isDigit c andalso okPosTrailing cs
|
Chris@303
|
803
|
Chris@303
|
804 fun okPositive [] = false
|
Chris@303
|
805 | okPositive (#"0" :: []) = true
|
Chris@303
|
806 | okPositive (#"0" :: #"." :: cs) = okFraction cs
|
Chris@303
|
807 | okPositive (#"0" :: #"e" :: cs) = okExponent cs
|
Chris@303
|
808 | okPositive (#"0" :: cs) = false
|
Chris@303
|
809 | okPositive (c :: cs) = isDigit c andalso okPosTrailing cs
|
Chris@303
|
810
|
Chris@303
|
811 fun okNumber (#"-" :: cs) = okPositive cs
|
Chris@303
|
812 | okNumber cc = okPositive cc
|
Chris@303
|
813 in
|
Chris@303
|
814 if okNumber digits
|
Chris@303
|
815 then case Real.fromString (implode digits) of
|
Chris@303
|
816 NONE => ERROR "Number out of range"
|
Chris@303
|
817 | SOME r => OK r
|
Chris@303
|
818 else ERROR ("Invalid number \"" ^ (implode digits) ^ "\"")
|
Chris@303
|
819 end
|
Chris@303
|
820
|
Chris@303
|
821 fun parseObject (T.CURLY_R :: xs) = OK (OBJECT [], xs)
|
Chris@303
|
822 | parseObject tokens =
|
Chris@303
|
823 let fun parsePair (T.STRING key :: T.COLON :: xs) =
|
Chris@303
|
824 (case parseTokens xs of
|
Chris@303
|
825 ERROR e => ERROR e
|
Chris@303
|
826 | OK (j, xs) => OK ((key, j), xs))
|
Chris@303
|
827 | parsePair other =
|
Chris@303
|
828 ERROR ("Object key/value pair expected around \"" ^
|
Chris@303
|
829 show other ^ "\"")
|
Chris@303
|
830 fun parseObject' acc [] = ERROR "End of input during object"
|
Chris@303
|
831 | parseObject' acc tokens =
|
Chris@303
|
832 case parsePair tokens of
|
Chris@303
|
833 ERROR e => ERROR e
|
Chris@303
|
834 | OK (pair, T.COMMA :: xs) =>
|
Chris@303
|
835 parseObject' (pair :: acc) xs
|
Chris@303
|
836 | OK (pair, T.CURLY_R :: xs) =>
|
Chris@303
|
837 OK (OBJECT (rev (pair :: acc)), xs)
|
Chris@303
|
838 | OK (_, _) => ERROR "Expected , or } after object element"
|
Chris@303
|
839 in
|
Chris@303
|
840 parseObject' [] tokens
|
Chris@303
|
841 end
|
Chris@303
|
842
|
Chris@303
|
843 and parseArray (T.SQUARE_R :: xs) = OK (ARRAY [], xs)
|
Chris@303
|
844 | parseArray tokens =
|
Chris@303
|
845 let fun parseArray' acc [] = ERROR "End of input during array"
|
Chris@303
|
846 | parseArray' acc tokens =
|
Chris@303
|
847 case parseTokens tokens of
|
Chris@303
|
848 ERROR e => ERROR e
|
Chris@303
|
849 | OK (j, T.COMMA :: xs) => parseArray' (j :: acc) xs
|
Chris@303
|
850 | OK (j, T.SQUARE_R :: xs) => OK (ARRAY (rev (j :: acc)), xs)
|
Chris@303
|
851 | OK (_, _) => ERROR "Expected , or ] after array element"
|
Chris@303
|
852 in
|
Chris@303
|
853 parseArray' [] tokens
|
Chris@303
|
854 end
|
Chris@303
|
855
|
Chris@303
|
856 and parseTokens [] = ERROR "Value expected"
|
Chris@303
|
857 | parseTokens (tok :: xs) =
|
Chris@303
|
858 (case tok of
|
Chris@303
|
859 T.NUMBER d => (case parseNumber d of
|
Chris@303
|
860 OK r => OK (NUMBER r, xs)
|
Chris@303
|
861 | ERROR e => ERROR e)
|
Chris@303
|
862 | T.STRING s => OK (STRING s, xs)
|
Chris@303
|
863 | T.BOOL b => OK (BOOL b, xs)
|
Chris@303
|
864 | T.NULL => OK (NULL, xs)
|
Chris@303
|
865 | T.CURLY_L => parseObject xs
|
Chris@303
|
866 | T.SQUARE_L => parseArray xs
|
Chris@303
|
867 | _ => ERROR ("Unexpected token " ^ T.toString tok ^
|
Chris@303
|
868 " before " ^ show xs))
|
Chris@303
|
869
|
Chris@303
|
870 fun parse str =
|
Chris@303
|
871 case lex 1 [] (explode str) of
|
Chris@303
|
872 ERROR e => ERROR e
|
Chris@303
|
873 | OK tokens => case parseTokens tokens of
|
Chris@303
|
874 OK (value, []) => OK value
|
Chris@303
|
875 | OK (_, _) => ERROR "Extra data after input"
|
Chris@303
|
876 | ERROR e => ERROR e
|
Chris@303
|
877
|
Chris@303
|
878 fun stringEscape s =
|
Chris@303
|
879 let fun esc x = [x, #"\\"]
|
Chris@303
|
880 fun escape' acc [] = rev acc
|
Chris@303
|
881 | escape' acc (x :: xs) =
|
Chris@303
|
882 escape' (case x of
|
Chris@303
|
883 #"\"" => esc x @ acc
|
Chris@303
|
884 | #"\\" => esc x @ acc
|
Chris@303
|
885 | #"\b" => esc #"b" @ acc
|
Chris@303
|
886 | #"\f" => esc #"f" @ acc
|
Chris@303
|
887 | #"\n" => esc #"n" @ acc
|
Chris@303
|
888 | #"\r" => esc #"r" @ acc
|
Chris@303
|
889 | #"\t" => esc #"t" @ acc
|
Chris@303
|
890 | _ =>
|
Chris@303
|
891 let val c = Char.ord x
|
Chris@303
|
892 in
|
Chris@303
|
893 if c < 0x20
|
Chris@303
|
894 then let val hex = Word.toString (Word.fromInt c)
|
Chris@303
|
895 in (rev o explode) (if c < 0x10
|
Chris@303
|
896 then ("\\u000" ^ hex)
|
Chris@303
|
897 else ("\\u00" ^ hex))
|
Chris@303
|
898 end @ acc
|
Chris@303
|
899 else
|
Chris@303
|
900 x :: acc
|
Chris@303
|
901 end)
|
Chris@303
|
902 xs
|
Chris@303
|
903 in
|
Chris@303
|
904 implode (escape' [] (explode s))
|
Chris@303
|
905 end
|
Chris@303
|
906
|
Chris@303
|
907 fun serialise json =
|
Chris@303
|
908 case json of
|
Chris@303
|
909 OBJECT pp => "{" ^ String.concatWith
|
Chris@303
|
910 "," (map (fn (key, value) =>
|
Chris@303
|
911 serialise (STRING key) ^ ":" ^
|
Chris@303
|
912 serialise value) pp) ^
|
Chris@303
|
913 "}"
|
Chris@303
|
914 | ARRAY arr => "[" ^ String.concatWith "," (map serialise arr) ^ "]"
|
Chris@303
|
915 | NUMBER n => implode (map (fn #"~" => #"-" | c => c)
|
Chris@303
|
916 (explode (Real.toString n)))
|
Chris@303
|
917 | STRING s => "\"" ^ stringEscape s ^ "\""
|
Chris@303
|
918 | BOOL b => Bool.toString b
|
Chris@303
|
919 | NULL => "null"
|
Chris@303
|
920
|
Chris@303
|
921 fun serialiseIndented json =
|
Chris@303
|
922 let fun indent 0 = ""
|
Chris@303
|
923 | indent i = " " ^ indent (i - 1)
|
Chris@303
|
924 fun serialiseIndented' i json =
|
Chris@303
|
925 let val ser = serialiseIndented' (i + 1)
|
Chris@303
|
926 in
|
Chris@303
|
927 case json of
|
Chris@303
|
928 OBJECT [] => "{}"
|
Chris@303
|
929 | ARRAY [] => "[]"
|
Chris@303
|
930 | OBJECT pp => "{\n" ^ indent (i + 1) ^
|
Chris@303
|
931 String.concatWith
|
Chris@303
|
932 (",\n" ^ indent (i + 1))
|
Chris@303
|
933 (map (fn (key, value) =>
|
Chris@303
|
934 ser (STRING key) ^ ": " ^
|
Chris@303
|
935 ser value) pp) ^
|
Chris@303
|
936 "\n" ^ indent i ^ "}"
|
Chris@303
|
937 | ARRAY arr => "[\n" ^ indent (i + 1) ^
|
Chris@303
|
938 String.concatWith
|
Chris@303
|
939 (",\n" ^ indent (i + 1))
|
Chris@303
|
940 (map ser arr) ^
|
Chris@303
|
941 "\n" ^ indent i ^ "]"
|
Chris@303
|
942 | other => serialise other
|
Chris@303
|
943 end
|
Chris@303
|
944 in
|
Chris@303
|
945 serialiseIndented' 0 json ^ "\n"
|
Chris@303
|
946 end
|
Chris@303
|
947
|
Chris@303
|
948 end
|
Chris@303
|
949
|
Chris@303
|
950
|
Chris@303
|
951 structure JsonBits :> sig
|
Chris@318
|
952 exception Config of string
|
Chris@303
|
953 val load_json_from : string -> Json.json (* filename -> json *)
|
Chris@303
|
954 val save_json_to : string -> Json.json -> unit
|
Chris@303
|
955 val lookup_optional : Json.json -> string list -> Json.json option
|
Chris@303
|
956 val lookup_optional_string : Json.json -> string list -> string option
|
Chris@303
|
957 val lookup_mandatory : Json.json -> string list -> Json.json
|
Chris@303
|
958 val lookup_mandatory_string : Json.json -> string list -> string
|
Chris@303
|
959 end = struct
|
Chris@303
|
960
|
Chris@318
|
961 exception Config of string
|
Chris@318
|
962
|
Chris@303
|
963 fun load_json_from filename =
|
Chris@303
|
964 case Json.parse (FileBits.file_contents filename) of
|
Chris@303
|
965 Json.OK json => json
|
Chris@318
|
966 | Json.ERROR e => raise Config ("Failed to parse file: " ^ e)
|
Chris@303
|
967
|
Chris@303
|
968 fun save_json_to filename json =
|
Chris@303
|
969 (* using binary I/O to avoid ever writing CR/LF line endings *)
|
Chris@303
|
970 let val jstr = Json.serialiseIndented json
|
Chris@303
|
971 val stream = BinIO.openOut filename
|
Chris@303
|
972 in
|
Chris@303
|
973 BinIO.output (stream, Byte.stringToBytes jstr);
|
Chris@303
|
974 BinIO.closeOut stream
|
Chris@303
|
975 end
|
Chris@303
|
976
|
Chris@303
|
977 fun lookup_optional json kk =
|
Chris@303
|
978 let fun lookup key =
|
Chris@303
|
979 case json of
|
Chris@303
|
980 Json.OBJECT kvs =>
|
Chris@318
|
981 (case List.filter (fn (k, v) => k = key) kvs of
|
Chris@318
|
982 [] => NONE
|
Chris@318
|
983 | [(_,v)] => SOME v
|
Chris@318
|
984 | _ => raise Config ("Duplicate key: " ^
|
Chris@318
|
985 (String.concatWith " -> " kk)))
|
Chris@318
|
986 | _ => raise Config "Object expected"
|
Chris@303
|
987 in
|
Chris@303
|
988 case kk of
|
Chris@303
|
989 [] => NONE
|
Chris@303
|
990 | key::[] => lookup key
|
Chris@303
|
991 | key::kk => case lookup key of
|
Chris@303
|
992 NONE => NONE
|
Chris@303
|
993 | SOME j => lookup_optional j kk
|
Chris@303
|
994 end
|
Chris@303
|
995
|
Chris@303
|
996 fun lookup_optional_string json kk =
|
Chris@303
|
997 case lookup_optional json kk of
|
Chris@303
|
998 SOME (Json.STRING s) => SOME s
|
Chris@318
|
999 | SOME _ => raise Config ("Value (if present) must be string: " ^
|
Chris@318
|
1000 (String.concatWith " -> " kk))
|
Chris@303
|
1001 | NONE => NONE
|
Chris@303
|
1002
|
Chris@303
|
1003 fun lookup_mandatory json kk =
|
Chris@303
|
1004 case lookup_optional json kk of
|
Chris@303
|
1005 SOME v => v
|
Chris@318
|
1006 | NONE => raise Config ("Value is mandatory: " ^
|
Chris@318
|
1007 (String.concatWith " -> " kk))
|
Chris@303
|
1008
|
Chris@303
|
1009 fun lookup_mandatory_string json kk =
|
Chris@303
|
1010 case lookup_optional json kk of
|
Chris@303
|
1011 SOME (Json.STRING s) => s
|
Chris@318
|
1012 | _ => raise Config ("Value must be string: " ^
|
Chris@318
|
1013 (String.concatWith " -> " kk))
|
Chris@303
|
1014 end
|
Chris@303
|
1015
|
Chris@303
|
1016 structure Provider :> sig
|
Chris@303
|
1017 val load_providers : Json.json -> provider list
|
Chris@303
|
1018 val load_more_providers : provider list -> Json.json -> provider list
|
Chris@303
|
1019 val remote_url : context -> vcs -> source -> libname -> string
|
Chris@303
|
1020 end = struct
|
Chris@303
|
1021
|
Chris@303
|
1022 val known_providers : provider list =
|
Chris@303
|
1023 [ {
|
Chris@303
|
1024 service = "bitbucket",
|
Chris@303
|
1025 supports = [HG, GIT],
|
Chris@303
|
1026 remote_spec = {
|
Chris@303
|
1027 anon = SOME "https://bitbucket.org/{owner}/{repository}",
|
Chris@303
|
1028 auth = SOME "ssh://{vcs}@bitbucket.org/{owner}/{repository}"
|
Chris@303
|
1029 }
|
Chris@303
|
1030 },
|
Chris@303
|
1031 {
|
Chris@303
|
1032 service = "github",
|
Chris@303
|
1033 supports = [GIT],
|
Chris@303
|
1034 remote_spec = {
|
Chris@303
|
1035 anon = SOME "https://github.com/{owner}/{repository}",
|
Chris@303
|
1036 auth = SOME "ssh://{vcs}@github.com/{owner}/{repository}"
|
Chris@303
|
1037 }
|
Chris@303
|
1038 }
|
Chris@303
|
1039 ]
|
Chris@303
|
1040
|
Chris@303
|
1041 fun vcs_name vcs =
|
Chris@317
|
1042 case vcs of HG => "hg"
|
Chris@317
|
1043 | GIT => "git"
|
Chris@317
|
1044 | SVN => "svn"
|
Chris@303
|
1045
|
Chris@303
|
1046 fun vcs_from_name name =
|
Chris@317
|
1047 case name of "hg" => HG
|
Chris@317
|
1048 | "git" => GIT
|
Chris@317
|
1049 | "svn" => SVN
|
Chris@303
|
1050 | other => raise Fail ("Unknown vcs name \"" ^ name ^ "\"")
|
Chris@303
|
1051
|
Chris@303
|
1052 fun load_more_providers previously_loaded json =
|
Chris@303
|
1053 let open JsonBits
|
Chris@303
|
1054 fun load pjson pname : provider =
|
Chris@303
|
1055 {
|
Chris@303
|
1056 service = pname,
|
Chris@303
|
1057 supports =
|
Chris@303
|
1058 case lookup_mandatory pjson ["vcs"] of
|
Chris@303
|
1059 Json.ARRAY vv =>
|
Chris@303
|
1060 map (fn (Json.STRING v) => vcs_from_name v
|
Chris@303
|
1061 | _ => raise Fail "Strings expected in vcs array")
|
Chris@303
|
1062 vv
|
Chris@303
|
1063 | _ => raise Fail "Array expected for vcs",
|
Chris@303
|
1064 remote_spec = {
|
Chris@303
|
1065 anon = lookup_optional_string pjson ["anonymous"],
|
Chris@303
|
1066 auth = lookup_optional_string pjson ["authenticated"]
|
Chris@303
|
1067 }
|
Chris@303
|
1068 }
|
Chris@303
|
1069 val loaded =
|
Chris@303
|
1070 case lookup_optional json ["services"] of
|
Chris@303
|
1071 NONE => []
|
Chris@303
|
1072 | SOME (Json.OBJECT pl) => map (fn (k, v) => load v k) pl
|
Chris@303
|
1073 | _ => raise Fail "Object expected for services in config"
|
Chris@303
|
1074 val newly_loaded =
|
Chris@303
|
1075 List.filter (fn p => not (List.exists (fn pp => #service p =
|
Chris@303
|
1076 #service pp)
|
Chris@303
|
1077 previously_loaded))
|
Chris@303
|
1078 loaded
|
Chris@303
|
1079 in
|
Chris@303
|
1080 previously_loaded @ newly_loaded
|
Chris@303
|
1081 end
|
Chris@303
|
1082
|
Chris@303
|
1083 fun load_providers json =
|
Chris@303
|
1084 load_more_providers known_providers json
|
Chris@303
|
1085
|
Chris@303
|
1086 fun expand_spec spec { vcs, service, owner, repo } login =
|
Chris@303
|
1087 (* ugly *)
|
Chris@303
|
1088 let fun replace str =
|
Chris@303
|
1089 case str of
|
Chris@303
|
1090 "vcs" => vcs_name vcs
|
Chris@303
|
1091 | "service" => service
|
Chris@303
|
1092 | "owner" =>
|
Chris@303
|
1093 (case owner of
|
Chris@303
|
1094 SOME ostr => ostr
|
Chris@303
|
1095 | NONE => raise Fail ("Owner not specified for service " ^
|
Chris@303
|
1096 service))
|
Chris@303
|
1097 | "repository" => repo
|
Chris@303
|
1098 | "account" =>
|
Chris@303
|
1099 (case login of
|
Chris@303
|
1100 SOME acc => acc
|
Chris@303
|
1101 | NONE => raise Fail ("Account not given for service " ^
|
Chris@303
|
1102 service))
|
Chris@303
|
1103 | other => raise Fail ("Unknown variable \"" ^ other ^
|
Chris@303
|
1104 "\" in spec for service " ^ service)
|
Chris@303
|
1105 fun expand' acc sstr =
|
Chris@303
|
1106 case Substring.splitl (fn c => c <> #"{") sstr of
|
Chris@303
|
1107 (pfx, sfx) =>
|
Chris@303
|
1108 if Substring.isEmpty sfx
|
Chris@303
|
1109 then rev (pfx :: acc)
|
Chris@303
|
1110 else
|
Chris@303
|
1111 case Substring.splitl (fn c => c <> #"}") sfx of
|
Chris@303
|
1112 (tok, remainder) =>
|
Chris@303
|
1113 if Substring.isEmpty remainder
|
Chris@303
|
1114 then rev (tok :: pfx :: acc)
|
Chris@303
|
1115 else let val replacement =
|
Chris@303
|
1116 replace
|
Chris@303
|
1117 (* tok begins with "{": *)
|
Chris@303
|
1118 (Substring.string
|
Chris@303
|
1119 (Substring.triml 1 tok))
|
Chris@303
|
1120 in
|
Chris@303
|
1121 expand' (Substring.full replacement ::
|
Chris@303
|
1122 pfx :: acc)
|
Chris@303
|
1123 (* remainder begins with "}": *)
|
Chris@303
|
1124 (Substring.triml 1 remainder)
|
Chris@303
|
1125 end
|
Chris@303
|
1126 in
|
Chris@303
|
1127 Substring.concat (expand' [] (Substring.full spec))
|
Chris@303
|
1128 end
|
Chris@303
|
1129
|
Chris@303
|
1130 fun provider_url req login providers =
|
Chris@303
|
1131 case providers of
|
Chris@303
|
1132 [] => raise Fail ("Unknown service \"" ^ (#service req) ^
|
Chris@303
|
1133 "\" for vcs \"" ^ (vcs_name (#vcs req)) ^ "\"")
|
Chris@303
|
1134 | ({ service, supports, remote_spec : remote_spec } :: rest) =>
|
Chris@303
|
1135 if service <> (#service req) orelse
|
Chris@303
|
1136 not (List.exists (fn v => v = (#vcs req)) supports)
|
Chris@303
|
1137 then provider_url req login rest
|
Chris@303
|
1138 else
|
Chris@303
|
1139 case (login, #auth remote_spec, #anon remote_spec) of
|
Chris@303
|
1140 (SOME _, SOME auth, _) => expand_spec auth req login
|
Chris@303
|
1141 | (SOME _, _, SOME anon) => expand_spec anon req NONE
|
Chris@303
|
1142 | (NONE, _, SOME anon) => expand_spec anon req NONE
|
Chris@303
|
1143 | _ => raise Fail ("No suitable anonymous or authenticated " ^
|
Chris@303
|
1144 "URL spec provided for service \"" ^
|
Chris@303
|
1145 service ^ "\"")
|
Chris@303
|
1146
|
Chris@303
|
1147 fun login_for ({ accounts, ... } : context) service =
|
Chris@303
|
1148 case List.find (fn a => service = #service a) accounts of
|
Chris@303
|
1149 SOME { login, ... } => SOME login
|
Chris@303
|
1150 | NONE => NONE
|
Chris@317
|
1151
|
Chris@317
|
1152 fun reponame_for path =
|
Chris@317
|
1153 case String.tokens (fn c => c = #"/") path of
|
Chris@317
|
1154 [] => raise Fail "Non-empty library path required"
|
Chris@317
|
1155 | toks => hd (rev toks)
|
Chris@317
|
1156
|
Chris@303
|
1157 fun remote_url (context : context) vcs source libname =
|
Chris@303
|
1158 case source of
|
Chris@303
|
1159 URL_SOURCE u => u
|
Chris@303
|
1160 | SERVICE_SOURCE { service, owner, repo } =>
|
Chris@303
|
1161 provider_url { vcs = vcs,
|
Chris@303
|
1162 service = service,
|
Chris@303
|
1163 owner = owner,
|
Chris@303
|
1164 repo = case repo of
|
Chris@303
|
1165 SOME r => r
|
Chris@317
|
1166 | NONE => reponame_for libname }
|
Chris@303
|
1167 (login_for context service)
|
Chris@303
|
1168 (#providers context)
|
Chris@303
|
1169 end
|
Chris@303
|
1170
|
Chris@303
|
1171 structure HgControl :> VCS_CONTROL = struct
|
Chris@317
|
1172
|
Chris@317
|
1173 (* Pulls always use an explicit URL, never just the default
|
Chris@317
|
1174 remote, in order to ensure we update properly if the location
|
Chris@317
|
1175 given in the project file changes. *)
|
Chris@317
|
1176
|
Chris@303
|
1177 type vcsstate = { id: string, modified: bool,
|
Chris@303
|
1178 branch: string, tags: string list }
|
Chris@303
|
1179
|
Chris@318
|
1180 val hg_program = "hg"
|
Chris@318
|
1181
|
Chris@317
|
1182 val hg_args = [ "--config", "ui.interactive=true",
|
Chris@317
|
1183 "--config", "ui.merge=:merge" ]
|
Chris@303
|
1184
|
Chris@303
|
1185 fun hg_command context libname args =
|
Chris@318
|
1186 FileBits.command context libname (hg_program :: hg_args @ args)
|
Chris@303
|
1187
|
Chris@303
|
1188 fun hg_command_output context libname args =
|
Chris@318
|
1189 FileBits.command_output context libname (hg_program :: hg_args @ args)
|
Chris@318
|
1190
|
Chris@318
|
1191 fun is_working context =
|
Chris@318
|
1192 case hg_command_output context "" ["--version"] of
|
Chris@318
|
1193 OK "" => OK false
|
Chris@318
|
1194 | OK _ => OK true
|
Chris@318
|
1195 | ERROR e => ERROR e
|
Chris@318
|
1196
|
Chris@303
|
1197 fun exists context libname =
|
Chris@303
|
1198 OK (OS.FileSys.isDir (FileBits.subpath context libname ".hg"))
|
Chris@303
|
1199 handle _ => OK false
|
Chris@303
|
1200
|
Chris@303
|
1201 fun remote_for context (libname, source) =
|
Chris@303
|
1202 Provider.remote_url context HG source libname
|
Chris@303
|
1203
|
Chris@303
|
1204 fun current_state context libname : vcsstate result =
|
Chris@303
|
1205 let fun is_branch text = text <> "" andalso #"(" = hd (explode text)
|
Chris@303
|
1206 and extract_branch b =
|
Chris@303
|
1207 if is_branch b (* need to remove enclosing parens *)
|
Chris@303
|
1208 then (implode o rev o tl o rev o tl o explode) b
|
Chris@303
|
1209 else "default"
|
Chris@303
|
1210 and is_modified id = id <> "" andalso #"+" = hd (rev (explode id))
|
Chris@303
|
1211 and extract_id id =
|
Chris@303
|
1212 if is_modified id (* need to remove trailing "+" *)
|
Chris@303
|
1213 then (implode o rev o tl o rev o explode) id
|
Chris@303
|
1214 else id
|
Chris@303
|
1215 and split_tags tags = String.tokens (fn c => c = #"/") tags
|
Chris@303
|
1216 and state_for (id, branch, tags) =
|
Chris@303
|
1217 OK { id = extract_id id,
|
Chris@303
|
1218 modified = is_modified id,
|
Chris@303
|
1219 branch = extract_branch branch,
|
Chris@303
|
1220 tags = split_tags tags }
|
Chris@303
|
1221 in
|
Chris@303
|
1222 case hg_command_output context libname ["id"] of
|
Chris@303
|
1223 ERROR e => ERROR e
|
Chris@303
|
1224 | OK out =>
|
Chris@303
|
1225 case String.tokens (fn x => x = #" ") out of
|
Chris@303
|
1226 [id, branch, tags] => state_for (id, branch, tags)
|
Chris@303
|
1227 | [id, other] => if is_branch other
|
Chris@303
|
1228 then state_for (id, other, "")
|
Chris@303
|
1229 else state_for (id, "", other)
|
Chris@303
|
1230 | [id] => state_for (id, "", "")
|
Chris@303
|
1231 | _ => ERROR ("Unexpected output from hg id: " ^ out)
|
Chris@303
|
1232 end
|
Chris@303
|
1233
|
Chris@303
|
1234 fun branch_name branch = case branch of
|
Chris@303
|
1235 DEFAULT_BRANCH => "default"
|
Chris@303
|
1236 | BRANCH "" => "default"
|
Chris@303
|
1237 | BRANCH b => b
|
Chris@303
|
1238
|
Chris@303
|
1239 fun id_of context libname =
|
Chris@303
|
1240 case current_state context libname of
|
Chris@303
|
1241 ERROR e => ERROR e
|
Chris@303
|
1242 | OK { id, ... } => OK id
|
Chris@303
|
1243
|
Chris@303
|
1244 fun is_at context (libname, id_or_tag) =
|
Chris@303
|
1245 case current_state context libname of
|
Chris@303
|
1246 ERROR e => ERROR e
|
Chris@303
|
1247 | OK { id, tags, ... } =>
|
Chris@303
|
1248 OK (String.isPrefix id_or_tag id orelse
|
Chris@303
|
1249 String.isPrefix id id_or_tag orelse
|
Chris@303
|
1250 List.exists (fn t => t = id_or_tag) tags)
|
Chris@303
|
1251
|
Chris@303
|
1252 fun is_on_branch context (libname, b) =
|
Chris@303
|
1253 case current_state context libname of
|
Chris@303
|
1254 ERROR e => ERROR e
|
Chris@303
|
1255 | OK { branch, ... } => OK (branch = branch_name b)
|
Chris@303
|
1256
|
Chris@303
|
1257 fun is_newest_locally context (libname, branch) =
|
Chris@303
|
1258 case hg_command_output context libname
|
Chris@303
|
1259 ["log", "-l1",
|
Chris@303
|
1260 "-b", branch_name branch,
|
Chris@303
|
1261 "--template", "{node}"] of
|
Chris@317
|
1262 ERROR e => OK false (* desired branch does not exist *)
|
Chris@303
|
1263 | OK newest_in_repo => is_at context (libname, newest_in_repo)
|
Chris@303
|
1264
|
Chris@317
|
1265 fun pull context (libname, source) =
|
Chris@317
|
1266 let val url = remote_for context (libname, source)
|
Chris@317
|
1267 in
|
Chris@317
|
1268 hg_command context libname
|
Chris@317
|
1269 (if FileBits.verbose ()
|
Chris@317
|
1270 then ["pull", url]
|
Chris@317
|
1271 else ["pull", "-q", url])
|
Chris@317
|
1272 end
|
Chris@303
|
1273
|
Chris@317
|
1274 fun is_newest context (libname, source, branch) =
|
Chris@303
|
1275 case is_newest_locally context (libname, branch) of
|
Chris@303
|
1276 ERROR e => ERROR e
|
Chris@303
|
1277 | OK false => OK false
|
Chris@303
|
1278 | OK true =>
|
Chris@317
|
1279 case pull context (libname, source) of
|
Chris@303
|
1280 ERROR e => ERROR e
|
Chris@303
|
1281 | _ => is_newest_locally context (libname, branch)
|
Chris@303
|
1282
|
Chris@303
|
1283 fun is_modified_locally context libname =
|
Chris@303
|
1284 case current_state context libname of
|
Chris@303
|
1285 ERROR e => ERROR e
|
Chris@303
|
1286 | OK { modified, ... } => OK modified
|
Chris@303
|
1287
|
Chris@303
|
1288 fun checkout context (libname, source, branch) =
|
Chris@303
|
1289 let val url = remote_for context (libname, source)
|
Chris@303
|
1290 in
|
Chris@317
|
1291 (* make the lib dir rather than just the ext dir, since
|
Chris@317
|
1292 the lib dir might be nested and hg will happily check
|
Chris@317
|
1293 out into an existing empty dir anyway *)
|
Chris@317
|
1294 case FileBits.mkpath (FileBits.libpath context libname) of
|
Chris@303
|
1295 ERROR e => ERROR e
|
Chris@303
|
1296 | _ => hg_command context ""
|
Chris@303
|
1297 ["clone", "-u", branch_name branch,
|
Chris@303
|
1298 url, libname]
|
Chris@303
|
1299 end
|
Chris@303
|
1300
|
Chris@317
|
1301 fun update context (libname, source, branch) =
|
Chris@317
|
1302 let val pull_result = pull context (libname, source)
|
Chris@303
|
1303 in
|
Chris@303
|
1304 case hg_command context libname ["update", branch_name branch] of
|
Chris@303
|
1305 ERROR e => ERROR e
|
Chris@303
|
1306 | _ =>
|
Chris@303
|
1307 case pull_result of
|
Chris@303
|
1308 ERROR e => ERROR e
|
Chris@317
|
1309 | _ => OK ()
|
Chris@303
|
1310 end
|
Chris@303
|
1311
|
Chris@317
|
1312 fun update_to context (libname, _, "") =
|
Chris@303
|
1313 ERROR "Non-empty id (tag or revision id) required for update_to"
|
Chris@317
|
1314 | update_to context (libname, source, id) =
|
Chris@317
|
1315 let val pull_result = pull context (libname, source)
|
Chris@303
|
1316 in
|
Chris@303
|
1317 case hg_command context libname ["update", "-r", id] of
|
Chris@317
|
1318 OK _ => OK ()
|
Chris@303
|
1319 | ERROR e =>
|
Chris@303
|
1320 case pull_result of
|
Chris@303
|
1321 ERROR e' => ERROR e' (* this was the ur-error *)
|
Chris@303
|
1322 | _ => ERROR e
|
Chris@303
|
1323 end
|
Chris@317
|
1324
|
Chris@317
|
1325 fun copy_url_for context libname =
|
Chris@317
|
1326 OK (FileBits.file_url (FileBits.libpath context libname))
|
Chris@317
|
1327
|
Chris@303
|
1328 end
|
Chris@303
|
1329
|
Chris@303
|
1330 structure GitControl :> VCS_CONTROL = struct
|
Chris@303
|
1331
|
Chris@303
|
1332 (* With Git repos we always operate in detached HEAD state. Even
|
Chris@317
|
1333 the master branch is checked out using a remote reference
|
Chris@318
|
1334 (repoint/master). The remote we use is always named repoint, and we
|
Chris@317
|
1335 update it to the expected URL each time we fetch, in order to
|
Chris@317
|
1336 ensure we update properly if the location given in the project
|
Chris@317
|
1337 file changes. The origin remote is unused. *)
|
Chris@303
|
1338
|
Chris@318
|
1339 val git_program = "git"
|
Chris@318
|
1340
|
Chris@303
|
1341 fun git_command context libname args =
|
Chris@318
|
1342 FileBits.command context libname (git_program :: args)
|
Chris@303
|
1343
|
Chris@303
|
1344 fun git_command_output context libname args =
|
Chris@318
|
1345 FileBits.command_output context libname (git_program :: args)
|
Chris@318
|
1346
|
Chris@318
|
1347 fun is_working context =
|
Chris@318
|
1348 case git_command_output context "" ["--version"] of
|
Chris@318
|
1349 OK "" => OK false
|
Chris@318
|
1350 | OK _ => OK true
|
Chris@318
|
1351 | ERROR e => ERROR e
|
Chris@303
|
1352
|
Chris@303
|
1353 fun exists context libname =
|
Chris@303
|
1354 OK (OS.FileSys.isDir (FileBits.subpath context libname ".git"))
|
Chris@303
|
1355 handle _ => OK false
|
Chris@303
|
1356
|
Chris@303
|
1357 fun remote_for context (libname, source) =
|
Chris@303
|
1358 Provider.remote_url context GIT source libname
|
Chris@303
|
1359
|
Chris@303
|
1360 fun branch_name branch = case branch of
|
Chris@303
|
1361 DEFAULT_BRANCH => "master"
|
Chris@303
|
1362 | BRANCH "" => "master"
|
Chris@303
|
1363 | BRANCH b => b
|
Chris@303
|
1364
|
Chris@318
|
1365 val our_remote = "repoint"
|
Chris@317
|
1366
|
Chris@317
|
1367 fun remote_branch_name branch = our_remote ^ "/" ^ branch_name branch
|
Chris@303
|
1368
|
Chris@303
|
1369 fun checkout context (libname, source, branch) =
|
Chris@303
|
1370 let val url = remote_for context (libname, source)
|
Chris@303
|
1371 in
|
Chris@317
|
1372 (* make the lib dir rather than just the ext dir, since
|
Chris@317
|
1373 the lib dir might be nested and git will happily check
|
Chris@317
|
1374 out into an existing empty dir anyway *)
|
Chris@317
|
1375 case FileBits.mkpath (FileBits.libpath context libname) of
|
Chris@303
|
1376 OK () => git_command context ""
|
Chris@317
|
1377 ["clone", "--origin", our_remote,
|
Chris@317
|
1378 "--branch", branch_name branch,
|
Chris@303
|
1379 url, libname]
|
Chris@303
|
1380 | ERROR e => ERROR e
|
Chris@303
|
1381 end
|
Chris@303
|
1382
|
Chris@317
|
1383 fun add_our_remote context (libname, source) =
|
Chris@317
|
1384 (* When we do the checkout ourselves (above), we add the
|
Chris@317
|
1385 remote at the same time. But if the repo was cloned by
|
Chris@317
|
1386 someone else, we'll need to do it after the fact. Git
|
Chris@317
|
1387 doesn't seem to have a means to add a remote or change its
|
Chris@317
|
1388 url if it already exists; seems we have to do this: *)
|
Chris@317
|
1389 let val url = remote_for context (libname, source)
|
Chris@317
|
1390 in
|
Chris@317
|
1391 case git_command context libname
|
Chris@317
|
1392 ["remote", "set-url", our_remote, url] of
|
Chris@317
|
1393 OK () => OK ()
|
Chris@317
|
1394 | ERROR e => git_command context libname
|
Chris@317
|
1395 ["remote", "add", "-f", our_remote, url]
|
Chris@317
|
1396 end
|
Chris@317
|
1397
|
Chris@303
|
1398 (* NB git rev-parse HEAD shows revision id of current checkout;
|
Chris@303
|
1399 git rev-list -1 <tag> shows revision id of revision with that tag *)
|
Chris@303
|
1400
|
Chris@303
|
1401 fun id_of context libname =
|
Chris@303
|
1402 git_command_output context libname ["rev-parse", "HEAD"]
|
Chris@303
|
1403
|
Chris@303
|
1404 fun is_at context (libname, id_or_tag) =
|
Chris@303
|
1405 case id_of context libname of
|
Chris@317
|
1406 ERROR e => OK false (* HEAD nonexistent, expected in empty repo *)
|
Chris@303
|
1407 | OK id =>
|
Chris@303
|
1408 if String.isPrefix id_or_tag id orelse
|
Chris@303
|
1409 String.isPrefix id id_or_tag
|
Chris@303
|
1410 then OK true
|
Chris@318
|
1411 else is_at_tag context (libname, id, id_or_tag)
|
Chris@318
|
1412
|
Chris@318
|
1413 and is_at_tag context (libname, id, tag) =
|
Chris@318
|
1414 (* For annotated tags (with message) show-ref returns the tag
|
Chris@318
|
1415 object ref rather than that of the revision being tagged;
|
Chris@318
|
1416 we need the subsequent rev-list to chase that up. In fact
|
Chris@318
|
1417 the rev-list on its own is enough to get us the id direct
|
Chris@318
|
1418 from the tag name, but it fails with an error if the tag
|
Chris@318
|
1419 doesn't exist, whereas we want to handle that quietly in
|
Chris@318
|
1420 case the tag simply hasn't been pulled yet *)
|
Chris@318
|
1421 case git_command_output context libname
|
Chris@318
|
1422 ["show-ref", "refs/tags/" ^ tag, "--"] of
|
Chris@318
|
1423 OK "" => OK false (* Not a tag *)
|
Chris@318
|
1424 | ERROR _ => OK false
|
Chris@318
|
1425 | OK s =>
|
Chris@318
|
1426 let val tag_ref = hd (String.tokens (fn c => c = #" ") s)
|
Chris@318
|
1427 in
|
Chris@303
|
1428 case git_command_output context libname
|
Chris@318
|
1429 ["rev-list", "-1", tag_ref] of
|
Chris@318
|
1430 OK tagged => OK (id = tagged)
|
Chris@303
|
1431 | ERROR _ => OK false
|
Chris@318
|
1432 end
|
Chris@318
|
1433
|
Chris@303
|
1434 fun branch_tip context (libname, branch) =
|
Chris@317
|
1435 (* We don't have access to the source info or the network
|
Chris@317
|
1436 here, as this is used by status (e.g. via is_on_branch) as
|
Chris@317
|
1437 well as review. It's possible the remote branch won't exist,
|
Chris@317
|
1438 e.g. if the repo was checked out by something other than
|
Chris@318
|
1439 Repoint, and if that's the case, we can't add it here; we'll
|
Chris@317
|
1440 just have to fail, since checking against local branches
|
Chris@317
|
1441 instead could produce the wrong result. *)
|
Chris@303
|
1442 git_command_output context libname
|
Chris@303
|
1443 ["rev-list", "-1",
|
Chris@317
|
1444 remote_branch_name branch, "--"]
|
Chris@303
|
1445
|
Chris@303
|
1446 fun is_newest_locally context (libname, branch) =
|
Chris@303
|
1447 case branch_tip context (libname, branch) of
|
Chris@317
|
1448 ERROR e => OK false
|
Chris@303
|
1449 | OK rev => is_at context (libname, rev)
|
Chris@303
|
1450
|
Chris@303
|
1451 fun is_on_branch context (libname, branch) =
|
Chris@303
|
1452 case branch_tip context (libname, branch) of
|
Chris@317
|
1453 ERROR e => OK false
|
Chris@303
|
1454 | OK rev =>
|
Chris@303
|
1455 case is_at context (libname, rev) of
|
Chris@303
|
1456 ERROR e => ERROR e
|
Chris@303
|
1457 | OK true => OK true
|
Chris@303
|
1458 | OK false =>
|
Chris@303
|
1459 case git_command context libname
|
Chris@303
|
1460 ["merge-base", "--is-ancestor",
|
Chris@303
|
1461 "HEAD", remote_branch_name branch] of
|
Chris@303
|
1462 ERROR e => OK false (* cmd returns non-zero for no *)
|
Chris@303
|
1463 | _ => OK true
|
Chris@303
|
1464
|
Chris@317
|
1465 fun fetch context (libname, source) =
|
Chris@317
|
1466 case add_our_remote context (libname, source) of
|
Chris@303
|
1467 ERROR e => ERROR e
|
Chris@317
|
1468 | _ => git_command context libname ["fetch", our_remote]
|
Chris@317
|
1469
|
Chris@317
|
1470 fun is_newest context (libname, source, branch) =
|
Chris@317
|
1471 case add_our_remote context (libname, source) of
|
Chris@317
|
1472 ERROR e => ERROR e
|
Chris@317
|
1473 | OK () =>
|
Chris@317
|
1474 case is_newest_locally context (libname, branch) of
|
Chris@303
|
1475 ERROR e => ERROR e
|
Chris@317
|
1476 | OK false => OK false
|
Chris@317
|
1477 | OK true =>
|
Chris@317
|
1478 case fetch context (libname, source) of
|
Chris@317
|
1479 ERROR e => ERROR e
|
Chris@317
|
1480 | _ => is_newest_locally context (libname, branch)
|
Chris@303
|
1481
|
Chris@303
|
1482 fun is_modified_locally context libname =
|
Chris@303
|
1483 case git_command_output context libname ["status", "--porcelain"] of
|
Chris@303
|
1484 ERROR e => ERROR e
|
Chris@303
|
1485 | OK "" => OK false
|
Chris@303
|
1486 | OK _ => OK true
|
Chris@303
|
1487
|
Chris@303
|
1488 (* This function updates to the latest revision on a branch rather
|
Chris@303
|
1489 than to a specific id or tag. We can't just checkout the given
|
Chris@303
|
1490 branch, as that will succeed even if the branch isn't up to
|
Chris@303
|
1491 date. We could checkout the branch and then fetch and merge,
|
Chris@303
|
1492 but it's perhaps cleaner not to maintain a local branch at all,
|
Chris@303
|
1493 but instead checkout the remote branch as a detached head. *)
|
Chris@303
|
1494
|
Chris@317
|
1495 fun update context (libname, source, branch) =
|
Chris@317
|
1496 case fetch context (libname, source) of
|
Chris@303
|
1497 ERROR e => ERROR e
|
Chris@303
|
1498 | _ =>
|
Chris@303
|
1499 case git_command context libname ["checkout", "--detach",
|
Chris@303
|
1500 remote_branch_name branch] of
|
Chris@303
|
1501 ERROR e => ERROR e
|
Chris@317
|
1502 | _ => OK ()
|
Chris@303
|
1503
|
Chris@303
|
1504 (* This function is dealing with a specific id or tag, so if we
|
Chris@303
|
1505 can successfully check it out (detached) then that's all we
|
Chris@303
|
1506 need to do, regardless of whether fetch succeeded or not. We do
|
Chris@303
|
1507 attempt the fetch first, though, purely in order to avoid ugly
|
Chris@303
|
1508 error messages in the common case where we're being asked to
|
Chris@303
|
1509 update to a new pin (from the lock file) that hasn't been
|
Chris@303
|
1510 fetched yet. *)
|
Chris@303
|
1511
|
Chris@317
|
1512 fun update_to context (libname, _, "") =
|
Chris@303
|
1513 ERROR "Non-empty id (tag or revision id) required for update_to"
|
Chris@317
|
1514 | update_to context (libname, source, id) =
|
Chris@317
|
1515 let val fetch_result = fetch context (libname, source)
|
Chris@303
|
1516 in
|
Chris@303
|
1517 case git_command context libname ["checkout", "--detach", id] of
|
Chris@317
|
1518 OK _ => OK ()
|
Chris@303
|
1519 | ERROR e =>
|
Chris@303
|
1520 case fetch_result of
|
Chris@303
|
1521 ERROR e' => ERROR e' (* this was the ur-error *)
|
Chris@303
|
1522 | _ => ERROR e
|
Chris@303
|
1523 end
|
Chris@317
|
1524
|
Chris@317
|
1525 fun copy_url_for context libname =
|
Chris@317
|
1526 OK (FileBits.file_url (FileBits.libpath context libname))
|
Chris@303
|
1527
|
Chris@303
|
1528 end
|
Chris@303
|
1529
|
Chris@318
|
1530 (* SubXml - A parser for a subset of XML
|
Chris@318
|
1531 https://bitbucket.org/cannam/sml-subxml
|
Chris@318
|
1532 Copyright 2018 Chris Cannam. BSD licence.
|
Chris@318
|
1533 *)
|
Chris@318
|
1534
|
Chris@318
|
1535 signature SUBXML = sig
|
Chris@318
|
1536
|
Chris@318
|
1537 datatype node = ELEMENT of { name : string, children : node list }
|
Chris@318
|
1538 | ATTRIBUTE of { name : string, value : string }
|
Chris@318
|
1539 | TEXT of string
|
Chris@318
|
1540 | CDATA of string
|
Chris@318
|
1541 | COMMENT of string
|
Chris@318
|
1542
|
Chris@318
|
1543 datatype document = DOCUMENT of { name : string, children : node list }
|
Chris@318
|
1544
|
Chris@318
|
1545 datatype 'a result = OK of 'a
|
Chris@318
|
1546 | ERROR of string
|
Chris@318
|
1547
|
Chris@318
|
1548 val parse : string -> document result
|
Chris@318
|
1549 val serialise : document -> string
|
Chris@318
|
1550
|
Chris@318
|
1551 end
|
Chris@318
|
1552
|
Chris@318
|
1553 structure SubXml :> SUBXML = struct
|
Chris@318
|
1554
|
Chris@318
|
1555 datatype node = ELEMENT of { name : string, children : node list }
|
Chris@318
|
1556 | ATTRIBUTE of { name : string, value : string }
|
Chris@318
|
1557 | TEXT of string
|
Chris@318
|
1558 | CDATA of string
|
Chris@318
|
1559 | COMMENT of string
|
Chris@318
|
1560
|
Chris@318
|
1561 datatype document = DOCUMENT of { name : string, children : node list }
|
Chris@318
|
1562
|
Chris@318
|
1563 datatype 'a result = OK of 'a
|
Chris@318
|
1564 | ERROR of string
|
Chris@318
|
1565
|
Chris@318
|
1566 structure T = struct
|
Chris@318
|
1567 datatype token = ANGLE_L
|
Chris@318
|
1568 | ANGLE_R
|
Chris@318
|
1569 | ANGLE_SLASH_L
|
Chris@318
|
1570 | SLASH_ANGLE_R
|
Chris@318
|
1571 | EQUAL
|
Chris@318
|
1572 | NAME of string
|
Chris@318
|
1573 | TEXT of string
|
Chris@318
|
1574 | CDATA of string
|
Chris@318
|
1575 | COMMENT of string
|
Chris@318
|
1576
|
Chris@318
|
1577 fun name t =
|
Chris@318
|
1578 case t of ANGLE_L => "<"
|
Chris@318
|
1579 | ANGLE_R => ">"
|
Chris@318
|
1580 | ANGLE_SLASH_L => "</"
|
Chris@318
|
1581 | SLASH_ANGLE_R => "/>"
|
Chris@318
|
1582 | EQUAL => "="
|
Chris@318
|
1583 | NAME s => "name \"" ^ s ^ "\""
|
Chris@318
|
1584 | TEXT s => "text"
|
Chris@318
|
1585 | CDATA _ => "CDATA section"
|
Chris@318
|
1586 | COMMENT _ => "comment"
|
Chris@318
|
1587 end
|
Chris@318
|
1588
|
Chris@318
|
1589 structure Lex :> sig
|
Chris@318
|
1590 val lex : string -> T.token list result
|
Chris@318
|
1591 end = struct
|
Chris@318
|
1592
|
Chris@318
|
1593 fun error pos text =
|
Chris@318
|
1594 ERROR (text ^ " at character position " ^ Int.toString (pos-1))
|
Chris@318
|
1595 fun tokenError pos token =
|
Chris@318
|
1596 error pos ("Unexpected token '" ^ Char.toString token ^ "'")
|
Chris@318
|
1597
|
Chris@318
|
1598 val nameEnd = explode " \t\n\r\"'</>!=?"
|
Chris@318
|
1599
|
Chris@318
|
1600 fun quoted quote pos acc cc =
|
Chris@318
|
1601 let fun quoted' pos text [] =
|
Chris@318
|
1602 error pos "Document ends during quoted string"
|
Chris@318
|
1603 | quoted' pos text (x::xs) =
|
Chris@318
|
1604 if x = quote
|
Chris@318
|
1605 then OK (rev text, xs, pos+1)
|
Chris@318
|
1606 else quoted' (pos+1) (x::text) xs
|
Chris@318
|
1607 in
|
Chris@318
|
1608 case quoted' pos [] cc of
|
Chris@318
|
1609 ERROR e => ERROR e
|
Chris@318
|
1610 | OK (text, rest, newpos) =>
|
Chris@318
|
1611 inside newpos (T.TEXT (implode text) :: acc) rest
|
Chris@318
|
1612 end
|
Chris@318
|
1613
|
Chris@318
|
1614 and name first pos acc cc =
|
Chris@318
|
1615 let fun name' pos text [] =
|
Chris@318
|
1616 error pos "Document ends during name"
|
Chris@318
|
1617 | name' pos text (x::xs) =
|
Chris@318
|
1618 if List.find (fn c => c = x) nameEnd <> NONE
|
Chris@318
|
1619 then OK (rev text, (x::xs), pos)
|
Chris@318
|
1620 else name' (pos+1) (x::text) xs
|
Chris@318
|
1621 in
|
Chris@318
|
1622 case name' (pos-1) [] (first::cc) of
|
Chris@318
|
1623 ERROR e => ERROR e
|
Chris@318
|
1624 | OK ([], [], pos) => error pos "Document ends before name"
|
Chris@318
|
1625 | OK ([], (x::xs), pos) => tokenError pos x
|
Chris@318
|
1626 | OK (text, rest, pos) =>
|
Chris@318
|
1627 inside pos (T.NAME (implode text) :: acc) rest
|
Chris@318
|
1628 end
|
Chris@318
|
1629
|
Chris@318
|
1630 and comment pos acc cc =
|
Chris@318
|
1631 let fun comment' pos text cc =
|
Chris@318
|
1632 case cc of
|
Chris@318
|
1633 #"-" :: #"-" :: #">" :: xs => OK (rev text, xs, pos+3)
|
Chris@318
|
1634 | x :: xs => comment' (pos+1) (x::text) xs
|
Chris@318
|
1635 | [] => error pos "Document ends during comment"
|
Chris@318
|
1636 in
|
Chris@318
|
1637 case comment' pos [] cc of
|
Chris@318
|
1638 ERROR e => ERROR e
|
Chris@318
|
1639 | OK (text, rest, pos) =>
|
Chris@318
|
1640 outside pos (T.COMMENT (implode text) :: acc) rest
|
Chris@318
|
1641 end
|
Chris@318
|
1642
|
Chris@318
|
1643 and instruction pos acc cc =
|
Chris@318
|
1644 case cc of
|
Chris@318
|
1645 #"?" :: #">" :: xs => outside (pos+2) acc xs
|
Chris@318
|
1646 | #">" :: _ => tokenError pos #">"
|
Chris@318
|
1647 | x :: xs => instruction (pos+1) acc xs
|
Chris@318
|
1648 | [] => error pos "Document ends during processing instruction"
|
Chris@318
|
1649
|
Chris@318
|
1650 and cdata pos acc cc =
|
Chris@318
|
1651 let fun cdata' pos text cc =
|
Chris@318
|
1652 case cc of
|
Chris@318
|
1653 #"]" :: #"]" :: #">" :: xs => OK (rev text, xs, pos+3)
|
Chris@318
|
1654 | x :: xs => cdata' (pos+1) (x::text) xs
|
Chris@318
|
1655 | [] => error pos "Document ends during CDATA section"
|
Chris@318
|
1656 in
|
Chris@318
|
1657 case cdata' pos [] cc of
|
Chris@318
|
1658 ERROR e => ERROR e
|
Chris@318
|
1659 | OK (text, rest, pos) =>
|
Chris@318
|
1660 outside pos (T.CDATA (implode text) :: acc) rest
|
Chris@318
|
1661 end
|
Chris@318
|
1662
|
Chris@318
|
1663 and doctype pos acc cc =
|
Chris@318
|
1664 case cc of
|
Chris@318
|
1665 #">" :: xs => outside (pos+1) acc xs
|
Chris@318
|
1666 | x :: xs => doctype (pos+1) acc xs
|
Chris@318
|
1667 | [] => error pos "Document ends during DOCTYPE"
|
Chris@318
|
1668
|
Chris@318
|
1669 and declaration pos acc cc =
|
Chris@318
|
1670 case cc of
|
Chris@318
|
1671 #"-" :: #"-" :: xs =>
|
Chris@318
|
1672 comment (pos+2) acc xs
|
Chris@318
|
1673 | #"[" :: #"C" :: #"D" :: #"A" :: #"T" :: #"A" :: #"[" :: xs =>
|
Chris@318
|
1674 cdata (pos+7) acc xs
|
Chris@318
|
1675 | #"D" :: #"O" :: #"C" :: #"T" :: #"Y" :: #"P" :: #"E" :: xs =>
|
Chris@318
|
1676 doctype (pos+7) acc xs
|
Chris@318
|
1677 | [] => error pos "Document ends during declaration"
|
Chris@318
|
1678 | _ => error pos "Unsupported declaration type"
|
Chris@318
|
1679
|
Chris@318
|
1680 and left pos acc cc =
|
Chris@318
|
1681 case cc of
|
Chris@318
|
1682 #"/" :: xs => inside (pos+1) (T.ANGLE_SLASH_L :: acc) xs
|
Chris@318
|
1683 | #"!" :: xs => declaration (pos+1) acc xs
|
Chris@318
|
1684 | #"?" :: xs => instruction (pos+1) acc xs
|
Chris@318
|
1685 | xs => inside pos (T.ANGLE_L :: acc) xs
|
Chris@318
|
1686
|
Chris@318
|
1687 and slash pos acc cc =
|
Chris@318
|
1688 case cc of
|
Chris@318
|
1689 #">" :: xs => outside (pos+1) (T.SLASH_ANGLE_R :: acc) xs
|
Chris@318
|
1690 | x :: _ => tokenError pos x
|
Chris@318
|
1691 | [] => error pos "Document ends before element closed"
|
Chris@318
|
1692
|
Chris@318
|
1693 and close pos acc xs = outside pos (T.ANGLE_R :: acc) xs
|
Chris@318
|
1694
|
Chris@318
|
1695 and equal pos acc xs = inside pos (T.EQUAL :: acc) xs
|
Chris@318
|
1696
|
Chris@318
|
1697 and outside pos acc [] = OK acc
|
Chris@318
|
1698 | outside pos acc cc =
|
Chris@318
|
1699 let fun textOf text = T.TEXT (implode (rev text))
|
Chris@318
|
1700 fun outside' pos [] acc [] = OK acc
|
Chris@318
|
1701 | outside' pos text acc [] = OK (textOf text :: acc)
|
Chris@318
|
1702 | outside' pos text acc (x::xs) =
|
Chris@318
|
1703 case x of
|
Chris@318
|
1704 #"<" => if text = []
|
Chris@318
|
1705 then left (pos+1) acc xs
|
Chris@318
|
1706 else left (pos+1) (textOf text :: acc) xs
|
Chris@318
|
1707 | x => outside' (pos+1) (x::text) acc xs
|
Chris@318
|
1708 in
|
Chris@318
|
1709 outside' pos [] acc cc
|
Chris@318
|
1710 end
|
Chris@318
|
1711
|
Chris@318
|
1712 and inside pos acc [] = error pos "Document ends within tag"
|
Chris@318
|
1713 | inside pos acc (#"<"::_) = tokenError pos #"<"
|
Chris@318
|
1714 | inside pos acc (x::xs) =
|
Chris@318
|
1715 (case x of
|
Chris@318
|
1716 #" " => inside | #"\t" => inside
|
Chris@318
|
1717 | #"\n" => inside | #"\r" => inside
|
Chris@318
|
1718 | #"\"" => quoted x | #"'" => quoted x
|
Chris@318
|
1719 | #"/" => slash | #">" => close | #"=" => equal
|
Chris@318
|
1720 | x => name x) (pos+1) acc xs
|
Chris@318
|
1721
|
Chris@318
|
1722 fun lex str =
|
Chris@318
|
1723 case outside 1 [] (explode str) of
|
Chris@318
|
1724 ERROR e => ERROR e
|
Chris@318
|
1725 | OK tokens => OK (rev tokens)
|
Chris@318
|
1726 end
|
Chris@318
|
1727
|
Chris@318
|
1728 structure Parse :> sig
|
Chris@318
|
1729 val parse : string -> document result
|
Chris@318
|
1730 end = struct
|
Chris@318
|
1731
|
Chris@318
|
1732 fun show [] = "end of input"
|
Chris@318
|
1733 | show (tok :: _) = T.name tok
|
Chris@318
|
1734
|
Chris@318
|
1735 fun error toks text = ERROR (text ^ " before " ^ show toks)
|
Chris@318
|
1736
|
Chris@318
|
1737 fun attribute elt name toks =
|
Chris@318
|
1738 case toks of
|
Chris@318
|
1739 T.EQUAL :: T.TEXT value :: xs =>
|
Chris@318
|
1740 namedElement {
|
Chris@318
|
1741 name = #name elt,
|
Chris@318
|
1742 children = ATTRIBUTE { name = name, value = value } ::
|
Chris@318
|
1743 #children elt
|
Chris@318
|
1744 } xs
|
Chris@318
|
1745 | T.EQUAL :: xs => error xs "Expected attribute value"
|
Chris@318
|
1746 | toks => error toks "Expected attribute assignment"
|
Chris@318
|
1747
|
Chris@318
|
1748 and content elt toks =
|
Chris@318
|
1749 case toks of
|
Chris@318
|
1750 T.ANGLE_SLASH_L :: T.NAME n :: T.ANGLE_R :: xs =>
|
Chris@318
|
1751 if n = #name elt
|
Chris@318
|
1752 then OK (elt, xs)
|
Chris@318
|
1753 else ERROR ("Closing tag </" ^ n ^ "> " ^
|
Chris@318
|
1754 "does not match opening <" ^ #name elt ^ ">")
|
Chris@318
|
1755 | T.TEXT text :: xs =>
|
Chris@318
|
1756 content {
|
Chris@318
|
1757 name = #name elt,
|
Chris@318
|
1758 children = TEXT text :: #children elt
|
Chris@318
|
1759 } xs
|
Chris@318
|
1760 | T.CDATA text :: xs =>
|
Chris@318
|
1761 content {
|
Chris@318
|
1762 name = #name elt,
|
Chris@318
|
1763 children = CDATA text :: #children elt
|
Chris@318
|
1764 } xs
|
Chris@318
|
1765 | T.COMMENT text :: xs =>
|
Chris@318
|
1766 content {
|
Chris@318
|
1767 name = #name elt,
|
Chris@318
|
1768 children = COMMENT text :: #children elt
|
Chris@318
|
1769 } xs
|
Chris@318
|
1770 | T.ANGLE_L :: xs =>
|
Chris@318
|
1771 (case element xs of
|
Chris@318
|
1772 ERROR e => ERROR e
|
Chris@318
|
1773 | OK (child, xs) =>
|
Chris@318
|
1774 content {
|
Chris@318
|
1775 name = #name elt,
|
Chris@318
|
1776 children = ELEMENT child :: #children elt
|
Chris@318
|
1777 } xs)
|
Chris@318
|
1778 | tok :: xs =>
|
Chris@318
|
1779 error xs ("Unexpected token " ^ T.name tok)
|
Chris@318
|
1780 | [] =>
|
Chris@318
|
1781 ERROR ("Document ends within element \"" ^ #name elt ^ "\"")
|
Chris@318
|
1782
|
Chris@318
|
1783 and namedElement elt toks =
|
Chris@318
|
1784 case toks of
|
Chris@318
|
1785 T.SLASH_ANGLE_R :: xs => OK (elt, xs)
|
Chris@318
|
1786 | T.NAME name :: xs => attribute elt name xs
|
Chris@318
|
1787 | T.ANGLE_R :: xs => content elt xs
|
Chris@318
|
1788 | x :: xs => error xs ("Unexpected token " ^ T.name x)
|
Chris@318
|
1789 | [] => ERROR "Document ends within opening tag"
|
Chris@318
|
1790
|
Chris@318
|
1791 and element toks =
|
Chris@318
|
1792 case toks of
|
Chris@318
|
1793 T.NAME name :: xs =>
|
Chris@318
|
1794 (case namedElement { name = name, children = [] } xs of
|
Chris@318
|
1795 ERROR e => ERROR e
|
Chris@318
|
1796 | OK ({ name, children }, xs) =>
|
Chris@318
|
1797 OK ({ name = name, children = rev children }, xs))
|
Chris@318
|
1798 | toks => error toks "Expected element name"
|
Chris@318
|
1799
|
Chris@318
|
1800 and document [] = ERROR "Empty document"
|
Chris@318
|
1801 | document (tok :: xs) =
|
Chris@318
|
1802 case tok of
|
Chris@318
|
1803 T.TEXT _ => document xs
|
Chris@318
|
1804 | T.COMMENT _ => document xs
|
Chris@318
|
1805 | T.ANGLE_L =>
|
Chris@318
|
1806 (case element xs of
|
Chris@318
|
1807 ERROR e => ERROR e
|
Chris@318
|
1808 | OK (elt, []) => OK (DOCUMENT elt)
|
Chris@318
|
1809 | OK (elt, (T.TEXT _ :: xs)) => OK (DOCUMENT elt)
|
Chris@318
|
1810 | OK (elt, xs) => error xs "Extra data after document")
|
Chris@318
|
1811 | _ => error xs ("Unexpected token " ^ T.name tok)
|
Chris@318
|
1812
|
Chris@318
|
1813 fun parse str =
|
Chris@318
|
1814 case Lex.lex str of
|
Chris@318
|
1815 ERROR e => ERROR e
|
Chris@318
|
1816 | OK tokens => document tokens
|
Chris@318
|
1817 end
|
Chris@318
|
1818
|
Chris@318
|
1819 structure Serialise :> sig
|
Chris@318
|
1820 val serialise : document -> string
|
Chris@318
|
1821 end = struct
|
Chris@318
|
1822
|
Chris@318
|
1823 fun attributes nodes =
|
Chris@318
|
1824 String.concatWith
|
Chris@318
|
1825 " "
|
Chris@318
|
1826 (map node (List.filter
|
Chris@318
|
1827 (fn ATTRIBUTE _ => true | _ => false)
|
Chris@318
|
1828 nodes))
|
Chris@318
|
1829
|
Chris@318
|
1830 and nonAttributes nodes =
|
Chris@318
|
1831 String.concat
|
Chris@318
|
1832 (map node (List.filter
|
Chris@318
|
1833 (fn ATTRIBUTE _ => false | _ => true)
|
Chris@318
|
1834 nodes))
|
Chris@318
|
1835
|
Chris@318
|
1836 and node n =
|
Chris@318
|
1837 case n of
|
Chris@318
|
1838 TEXT string =>
|
Chris@318
|
1839 string
|
Chris@318
|
1840 | CDATA string =>
|
Chris@318
|
1841 "<![CDATA[" ^ string ^ "]]>"
|
Chris@318
|
1842 | COMMENT string =>
|
Chris@318
|
1843 "<!-- " ^ string ^ "-->"
|
Chris@318
|
1844 | ATTRIBUTE { name, value } =>
|
Chris@318
|
1845 name ^ "=" ^ "\"" ^ value ^ "\"" (*!!!*)
|
Chris@318
|
1846 | ELEMENT { name, children } =>
|
Chris@318
|
1847 "<" ^ name ^
|
Chris@318
|
1848 (case (attributes children) of
|
Chris@318
|
1849 "" => ""
|
Chris@318
|
1850 | s => " " ^ s) ^
|
Chris@318
|
1851 (case (nonAttributes children) of
|
Chris@318
|
1852 "" => "/>"
|
Chris@318
|
1853 | s => ">" ^ s ^ "</" ^ name ^ ">")
|
Chris@318
|
1854
|
Chris@318
|
1855 fun serialise (DOCUMENT { name, children }) =
|
Chris@318
|
1856 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" ^
|
Chris@318
|
1857 node (ELEMENT { name = name, children = children })
|
Chris@318
|
1858 end
|
Chris@318
|
1859
|
Chris@318
|
1860 val parse = Parse.parse
|
Chris@318
|
1861 val serialise = Serialise.serialise
|
Chris@318
|
1862
|
Chris@318
|
1863 end
|
Chris@318
|
1864
|
Chris@318
|
1865
|
Chris@317
|
1866 structure SvnControl :> VCS_CONTROL = struct
|
Chris@317
|
1867
|
Chris@318
|
1868 val svn_program = "svn"
|
Chris@318
|
1869
|
Chris@317
|
1870 fun svn_command context libname args =
|
Chris@318
|
1871 FileBits.command context libname (svn_program :: args)
|
Chris@317
|
1872
|
Chris@317
|
1873 fun svn_command_output context libname args =
|
Chris@318
|
1874 FileBits.command_output context libname (svn_program :: args)
|
Chris@317
|
1875
|
Chris@317
|
1876 fun svn_command_lines context libname args =
|
Chris@317
|
1877 case svn_command_output context libname args of
|
Chris@317
|
1878 ERROR e => ERROR e
|
Chris@317
|
1879 | OK s => OK (String.tokens (fn c => c = #"\n" orelse c = #"\r") s)
|
Chris@317
|
1880
|
Chris@317
|
1881 fun split_line_pair line =
|
Chris@317
|
1882 let fun strip_leading_ws str = case explode str of
|
Chris@317
|
1883 #" "::rest => implode rest
|
Chris@317
|
1884 | _ => str
|
Chris@317
|
1885 in
|
Chris@317
|
1886 case String.tokens (fn c => c = #":") line of
|
Chris@317
|
1887 [] => ("", "")
|
Chris@317
|
1888 | first::rest =>
|
Chris@317
|
1889 (first, strip_leading_ws (String.concatWith ":" rest))
|
Chris@317
|
1890 end
|
Chris@318
|
1891
|
Chris@318
|
1892 fun is_working context =
|
Chris@318
|
1893 case svn_command_output context "" ["--version"] of
|
Chris@318
|
1894 OK "" => OK false
|
Chris@318
|
1895 | OK _ => OK true
|
Chris@318
|
1896 | ERROR e => ERROR e
|
Chris@318
|
1897
|
Chris@318
|
1898 structure X = SubXml
|
Chris@318
|
1899
|
Chris@318
|
1900 fun svn_info context libname route =
|
Chris@318
|
1901 (* SVN 1.9 has info --show-item which is just what we need,
|
Chris@318
|
1902 but at this point we still have 1.8 on the CI boxes so we
|
Chris@318
|
1903 might as well aim to support it. For that we really have to
|
Chris@318
|
1904 use the XML output format, since the default info output is
|
Chris@318
|
1905 localised. This is the only thing our mini-XML parser is
|
Chris@318
|
1906 used for though, so it would be good to trim it at some
|
Chris@318
|
1907 point *)
|
Chris@318
|
1908 let fun find elt [] = OK elt
|
Chris@318
|
1909 | find { children, ... } (first :: rest) =
|
Chris@318
|
1910 case List.find (fn (X.ELEMENT { name, ... }) => name = first
|
Chris@318
|
1911 | _ => false)
|
Chris@318
|
1912 children of
|
Chris@318
|
1913 NONE => ERROR ("No element \"" ^ first ^ "\" in SVN XML")
|
Chris@318
|
1914 | SOME (X.ELEMENT e) => find e rest
|
Chris@318
|
1915 | SOME _ => ERROR "Internal error"
|
Chris@318
|
1916 in
|
Chris@318
|
1917 case svn_command_output context libname ["info", "--xml"] of
|
Chris@318
|
1918 ERROR e => ERROR e
|
Chris@318
|
1919 | OK xml =>
|
Chris@318
|
1920 case X.parse xml of
|
Chris@318
|
1921 X.ERROR e => ERROR e
|
Chris@318
|
1922 | X.OK (X.DOCUMENT doc) => find doc route
|
Chris@318
|
1923 end
|
Chris@317
|
1924
|
Chris@317
|
1925 fun exists context libname =
|
Chris@317
|
1926 OK (OS.FileSys.isDir (FileBits.subpath context libname ".svn"))
|
Chris@317
|
1927 handle _ => OK false
|
Chris@317
|
1928
|
Chris@317
|
1929 fun remote_for context (libname, source) =
|
Chris@317
|
1930 Provider.remote_url context SVN source libname
|
Chris@317
|
1931
|
Chris@318
|
1932 (* Remote the checkout came from, not necessarily the one we want *)
|
Chris@318
|
1933 fun actual_remote_for context libname =
|
Chris@318
|
1934 case svn_info context libname ["entry", "url"] of
|
Chris@318
|
1935 ERROR e => ERROR e
|
Chris@318
|
1936 | OK { children, ... } =>
|
Chris@318
|
1937 case List.find (fn (X.TEXT _) => true | _ => false) children of
|
Chris@318
|
1938 NONE => ERROR "No content for URL in SVN info XML"
|
Chris@318
|
1939 | SOME (X.TEXT url) => OK url
|
Chris@318
|
1940 | SOME _ => ERROR "Internal error"
|
Chris@318
|
1941
|
Chris@317
|
1942 fun id_of context libname =
|
Chris@318
|
1943 case svn_info context libname ["entry"] of
|
Chris@318
|
1944 ERROR e => ERROR e
|
Chris@318
|
1945 | OK { children, ... } =>
|
Chris@318
|
1946 case List.find
|
Chris@318
|
1947 (fn (X.ATTRIBUTE { name = "revision", ... }) => true
|
Chris@318
|
1948 | _ => false)
|
Chris@318
|
1949 children of
|
Chris@318
|
1950 NONE => ERROR "No revision for entry in SVN info XML"
|
Chris@318
|
1951 | SOME (X.ATTRIBUTE { value, ... }) => OK value
|
Chris@318
|
1952 | SOME _ => ERROR "Internal error"
|
Chris@317
|
1953
|
Chris@317
|
1954 fun is_at context (libname, id_or_tag) =
|
Chris@317
|
1955 case id_of context libname of
|
Chris@317
|
1956 ERROR e => ERROR e
|
Chris@317
|
1957 | OK id => OK (id = id_or_tag)
|
Chris@317
|
1958
|
Chris@317
|
1959 fun is_on_branch context (libname, b) =
|
Chris@317
|
1960 OK (b = DEFAULT_BRANCH)
|
Chris@318
|
1961
|
Chris@318
|
1962 fun check_remote context (libname, source) =
|
Chris@318
|
1963 case (remote_for context (libname, source),
|
Chris@318
|
1964 actual_remote_for context libname) of
|
Chris@318
|
1965 (_, ERROR e) => ERROR e
|
Chris@318
|
1966 | (url, OK actual) =>
|
Chris@318
|
1967 if actual = url
|
Chris@318
|
1968 then OK ()
|
Chris@318
|
1969 else svn_command context libname ["relocate", url]
|
Chris@317
|
1970
|
Chris@317
|
1971 fun is_newest context (libname, source, branch) =
|
Chris@318
|
1972 case check_remote context (libname, source) of
|
Chris@317
|
1973 ERROR e => ERROR e
|
Chris@318
|
1974 | OK () =>
|
Chris@318
|
1975 case svn_command_lines context libname
|
Chris@318
|
1976 ["status", "--show-updates"] of
|
Chris@318
|
1977 ERROR e => ERROR e
|
Chris@318
|
1978 | OK lines =>
|
Chris@318
|
1979 case rev lines of
|
Chris@318
|
1980 [] => ERROR "No result returned for server status"
|
Chris@318
|
1981 | last_line::_ =>
|
Chris@318
|
1982 case rev (String.tokens (fn c => c = #" ") last_line) of
|
Chris@318
|
1983 [] => ERROR "No revision field found in server status"
|
Chris@318
|
1984 | server_id::_ => is_at context (libname, server_id)
|
Chris@317
|
1985
|
Chris@317
|
1986 fun is_newest_locally context (libname, branch) =
|
Chris@317
|
1987 OK true (* no local history *)
|
Chris@317
|
1988
|
Chris@317
|
1989 fun is_modified_locally context libname =
|
Chris@317
|
1990 case svn_command_output context libname ["status"] of
|
Chris@317
|
1991 ERROR e => ERROR e
|
Chris@317
|
1992 | OK "" => OK false
|
Chris@317
|
1993 | OK _ => OK true
|
Chris@317
|
1994
|
Chris@317
|
1995 fun checkout context (libname, source, branch) =
|
Chris@317
|
1996 let val url = remote_for context (libname, source)
|
Chris@317
|
1997 val path = FileBits.libpath context libname
|
Chris@317
|
1998 in
|
Chris@317
|
1999 if FileBits.nonempty_dir_exists path
|
Chris@317
|
2000 then (* Surprisingly, SVN itself has no problem with
|
Chris@317
|
2001 this. But for consistency with other VCSes we
|
Chris@317
|
2002 don't allow it *)
|
Chris@317
|
2003 ERROR ("Refusing checkout to nonempty dir \"" ^ path ^ "\"")
|
Chris@317
|
2004 else
|
Chris@317
|
2005 (* make the lib dir rather than just the ext dir, since
|
Chris@317
|
2006 the lib dir might be nested and svn will happily check
|
Chris@317
|
2007 out into an existing empty dir anyway *)
|
Chris@317
|
2008 case FileBits.mkpath (FileBits.libpath context libname) of
|
Chris@317
|
2009 ERROR e => ERROR e
|
Chris@317
|
2010 | _ => svn_command context "" ["checkout", url, libname]
|
Chris@317
|
2011 end
|
Chris@317
|
2012
|
Chris@317
|
2013 fun update context (libname, source, branch) =
|
Chris@318
|
2014 case check_remote context (libname, source) of
|
Chris@317
|
2015 ERROR e => ERROR e
|
Chris@318
|
2016 | OK () =>
|
Chris@318
|
2017 case svn_command context libname
|
Chris@318
|
2018 ["update", "--accept", "postpone"] of
|
Chris@318
|
2019 ERROR e => ERROR e
|
Chris@318
|
2020 | _ => OK ()
|
Chris@317
|
2021
|
Chris@317
|
2022 fun update_to context (libname, _, "") =
|
Chris@317
|
2023 ERROR "Non-empty id (tag or revision id) required for update_to"
|
Chris@317
|
2024 | update_to context (libname, source, id) =
|
Chris@318
|
2025 case check_remote context (libname, source) of
|
Chris@317
|
2026 ERROR e => ERROR e
|
Chris@318
|
2027 | OK () =>
|
Chris@318
|
2028 case svn_command context libname
|
Chris@318
|
2029 ["update", "-r", id, "--accept", "postpone"] of
|
Chris@318
|
2030 ERROR e => ERROR e
|
Chris@318
|
2031 | OK _ => OK ()
|
Chris@317
|
2032
|
Chris@317
|
2033 fun copy_url_for context libname =
|
Chris@318
|
2034 actual_remote_for context libname
|
Chris@317
|
2035
|
Chris@317
|
2036 end
|
Chris@317
|
2037
|
Chris@303
|
2038 structure AnyLibControl :> LIB_CONTROL = struct
|
Chris@303
|
2039
|
Chris@303
|
2040 structure H = LibControlFn(HgControl)
|
Chris@303
|
2041 structure G = LibControlFn(GitControl)
|
Chris@317
|
2042 structure S = LibControlFn(SvnControl)
|
Chris@303
|
2043
|
Chris@303
|
2044 fun review context (spec as { vcs, ... } : libspec) =
|
Chris@317
|
2045 (fn HG => H.review | GIT => G.review | SVN => S.review) vcs context spec
|
Chris@303
|
2046
|
Chris@303
|
2047 fun status context (spec as { vcs, ... } : libspec) =
|
Chris@317
|
2048 (fn HG => H.status | GIT => G.status | SVN => S.status) vcs context spec
|
Chris@303
|
2049
|
Chris@303
|
2050 fun update context (spec as { vcs, ... } : libspec) =
|
Chris@317
|
2051 (fn HG => H.update | GIT => G.update | SVN => S.update) vcs context spec
|
Chris@314
|
2052
|
Chris@314
|
2053 fun id_of context (spec as { vcs, ... } : libspec) =
|
Chris@317
|
2054 (fn HG => H.id_of | GIT => G.id_of | SVN => S.id_of) vcs context spec
|
Chris@317
|
2055
|
Chris@318
|
2056 fun is_working context vcs =
|
Chris@318
|
2057 (fn HG => H.is_working | GIT => G.is_working | SVN => S.is_working)
|
Chris@318
|
2058 vcs context vcs
|
Chris@318
|
2059
|
Chris@303
|
2060 end
|
Chris@303
|
2061
|
Chris@315
|
2062
|
Chris@315
|
2063 type exclusions = string list
|
Chris@315
|
2064
|
Chris@315
|
2065 structure Archive :> sig
|
Chris@315
|
2066
|
Chris@315
|
2067 val archive : string * exclusions -> project -> OS.Process.status
|
Chris@315
|
2068
|
Chris@315
|
2069 end = struct
|
Chris@315
|
2070
|
Chris@315
|
2071 (* The idea of "archive" is to replace hg/git archive, which won't
|
Chris@318
|
2072 include files, like the Repoint-introduced external libraries,
|
Chris@315
|
2073 that are not under version control with the main repo.
|
Chris@315
|
2074
|
Chris@315
|
2075 The process goes like this:
|
Chris@315
|
2076
|
Chris@315
|
2077 - Make sure we have a target filename from the user, and take
|
Chris@315
|
2078 its basename as our archive directory name
|
Chris@315
|
2079
|
Chris@315
|
2080 - Make an "archive root" subdir of the project repo, named
|
Chris@318
|
2081 typically .repoint-archive
|
Chris@315
|
2082
|
Chris@315
|
2083 - Identify the VCS used for the project repo. Note that any
|
Chris@315
|
2084 explicit references to VCS type in this structure are to
|
Chris@318
|
2085 the VCS used for the project (something Repoint doesn't
|
Chris@315
|
2086 otherwise care about), not for an individual library
|
Chris@315
|
2087
|
Chris@318
|
2088 - Synthesise a Repoint project with the archive root as its
|
Chris@315
|
2089 root path, "." as its extdir, with one library whose
|
Chris@315
|
2090 name is the user-supplied basename and whose explicit
|
Chris@315
|
2091 source URL is the original project root; update that
|
Chris@315
|
2092 project -- thus cloning the original project to a subdir
|
Chris@315
|
2093 of the archive root
|
Chris@315
|
2094
|
Chris@318
|
2095 - Synthesise a Repoint project identical to the original one for
|
Chris@315
|
2096 this project, but with the newly-cloned copy as its root
|
Chris@315
|
2097 path; update that project -- thus checking out clean copies
|
Chris@315
|
2098 of the external library dirs
|
Chris@315
|
2099
|
Chris@315
|
2100 - Call out to an archive program to archive up the new copy,
|
Chris@315
|
2101 running e.g.
|
Chris@315
|
2102 tar cvzf project-release.tar.gz \
|
Chris@315
|
2103 --exclude=.hg --exclude=.git project-release
|
Chris@315
|
2104 in the archive root dir
|
Chris@315
|
2105
|
Chris@318
|
2106 - (We also omit the repoint-project.json file and any trace of
|
Chris@318
|
2107 Repoint. It can't properly be run in a directory where the
|
Chris@315
|
2108 external project folders already exist but their repo history
|
Chris@318
|
2109 does not. End users shouldn't get to see Repoint)
|
Chris@315
|
2110
|
Chris@315
|
2111 - Clean up by deleting the new copy
|
Chris@315
|
2112 *)
|
Chris@315
|
2113
|
Chris@317
|
2114 fun project_vcs_id_and_url dir =
|
Chris@315
|
2115 let val context = {
|
Chris@315
|
2116 rootpath = dir,
|
Chris@315
|
2117 extdir = ".",
|
Chris@315
|
2118 providers = [],
|
Chris@315
|
2119 accounts = []
|
Chris@315
|
2120 }
|
Chris@315
|
2121 val vcs_maybe =
|
Chris@315
|
2122 case [HgControl.exists context ".",
|
Chris@317
|
2123 GitControl.exists context ".",
|
Chris@317
|
2124 SvnControl.exists context "."] of
|
Chris@317
|
2125 [OK true, OK false, OK false] => OK HG
|
Chris@317
|
2126 | [OK false, OK true, OK false] => OK GIT
|
Chris@317
|
2127 | [OK false, OK false, OK true] => OK SVN
|
Chris@315
|
2128 | _ => ERROR ("Unable to identify VCS for directory " ^ dir)
|
Chris@315
|
2129 in
|
Chris@315
|
2130 case vcs_maybe of
|
Chris@315
|
2131 ERROR e => ERROR e
|
Chris@315
|
2132 | OK vcs =>
|
Chris@317
|
2133 case (fn HG => HgControl.id_of
|
Chris@317
|
2134 | GIT => GitControl.id_of
|
Chris@317
|
2135 | SVN => SvnControl.id_of)
|
Chris@315
|
2136 vcs context "." of
|
Chris@317
|
2137 ERROR e => ERROR ("Unable to find id of project repo: " ^ e)
|
Chris@317
|
2138 | OK id =>
|
Chris@317
|
2139 case (fn HG => HgControl.copy_url_for
|
Chris@317
|
2140 | GIT => GitControl.copy_url_for
|
Chris@317
|
2141 | SVN => SvnControl.copy_url_for)
|
Chris@317
|
2142 vcs context "." of
|
Chris@317
|
2143 ERROR e => ERROR ("Unable to find URL of project repo: "
|
Chris@317
|
2144 ^ e)
|
Chris@317
|
2145 | OK url => OK (vcs, id, url)
|
Chris@315
|
2146 end
|
Chris@315
|
2147
|
Chris@315
|
2148 fun make_archive_root (context : context) =
|
Chris@315
|
2149 let val path = OS.Path.joinDirFile {
|
Chris@315
|
2150 dir = #rootpath context,
|
Chris@318
|
2151 file = RepointFilenames.archive_dir
|
Chris@315
|
2152 }
|
Chris@315
|
2153 in
|
Chris@315
|
2154 case FileBits.mkpath path of
|
Chris@315
|
2155 ERROR e => raise Fail ("Failed to create archive directory \""
|
Chris@315
|
2156 ^ path ^ "\": " ^ e)
|
Chris@315
|
2157 | OK () => path
|
Chris@315
|
2158 end
|
Chris@315
|
2159
|
Chris@315
|
2160 fun archive_path archive_dir target_name =
|
Chris@315
|
2161 OS.Path.joinDirFile {
|
Chris@315
|
2162 dir = archive_dir,
|
Chris@315
|
2163 file = target_name
|
Chris@315
|
2164 }
|
Chris@315
|
2165
|
Chris@315
|
2166 fun check_nonexistent path =
|
Chris@315
|
2167 case SOME (OS.FileSys.fileSize path) handle OS.SysErr _ => NONE of
|
Chris@315
|
2168 NONE => ()
|
Chris@315
|
2169 | _ => raise Fail ("Path " ^ path ^ " exists, not overwriting")
|
Chris@315
|
2170
|
Chris@317
|
2171 fun make_archive_copy target_name (vcs, project_id, source_url)
|
Chris@315
|
2172 ({ context, ... } : project) =
|
Chris@315
|
2173 let val archive_root = make_archive_root context
|
Chris@315
|
2174 val synthetic_context = {
|
Chris@315
|
2175 rootpath = archive_root,
|
Chris@315
|
2176 extdir = ".",
|
Chris@315
|
2177 providers = [],
|
Chris@315
|
2178 accounts = []
|
Chris@315
|
2179 }
|
Chris@315
|
2180 val synthetic_library = {
|
Chris@315
|
2181 libname = target_name,
|
Chris@315
|
2182 vcs = vcs,
|
Chris@317
|
2183 source = URL_SOURCE source_url,
|
Chris@315
|
2184 branch = DEFAULT_BRANCH, (* overridden by pinned id below *)
|
Chris@315
|
2185 project_pin = PINNED project_id,
|
Chris@315
|
2186 lock_pin = PINNED project_id
|
Chris@315
|
2187 }
|
Chris@315
|
2188 val path = archive_path archive_root target_name
|
Chris@315
|
2189 val _ = print ("Cloning original project to " ^ path
|
Chris@315
|
2190 ^ " at revision " ^ project_id ^ "...\n");
|
Chris@315
|
2191 val _ = check_nonexistent path
|
Chris@315
|
2192 in
|
Chris@315
|
2193 case AnyLibControl.update synthetic_context synthetic_library of
|
Chris@315
|
2194 ERROR e => ERROR ("Failed to clone original project to "
|
Chris@315
|
2195 ^ path ^ ": " ^ e)
|
Chris@315
|
2196 | OK _ => OK archive_root
|
Chris@315
|
2197 end
|
Chris@315
|
2198
|
Chris@315
|
2199 fun update_archive archive_root target_name
|
Chris@315
|
2200 (project as { context, ... } : project) =
|
Chris@315
|
2201 let val synthetic_context = {
|
Chris@315
|
2202 rootpath = archive_path archive_root target_name,
|
Chris@315
|
2203 extdir = #extdir context,
|
Chris@315
|
2204 providers = #providers context,
|
Chris@315
|
2205 accounts = #accounts context
|
Chris@315
|
2206 }
|
Chris@315
|
2207 in
|
Chris@315
|
2208 foldl (fn (lib, acc) =>
|
Chris@315
|
2209 case acc of
|
Chris@315
|
2210 ERROR e => ERROR e
|
Chris@317
|
2211 | OK () => AnyLibControl.update synthetic_context lib)
|
Chris@317
|
2212 (OK ())
|
Chris@315
|
2213 (#libs project)
|
Chris@315
|
2214 end
|
Chris@315
|
2215
|
Chris@315
|
2216 datatype packer = TAR
|
Chris@315
|
2217 | TAR_GZ
|
Chris@315
|
2218 | TAR_BZ2
|
Chris@315
|
2219 | TAR_XZ
|
Chris@315
|
2220 (* could add other packers, e.g. zip, if we knew how to
|
Chris@315
|
2221 handle the file omissions etc properly in pack_archive *)
|
Chris@315
|
2222
|
Chris@315
|
2223 fun packer_and_basename path =
|
Chris@315
|
2224 let val extensions = [ (".tar", TAR),
|
Chris@315
|
2225 (".tar.gz", TAR_GZ),
|
Chris@315
|
2226 (".tar.bz2", TAR_BZ2),
|
Chris@315
|
2227 (".tar.xz", TAR_XZ)]
|
Chris@315
|
2228 val filename = OS.Path.file path
|
Chris@315
|
2229 in
|
Chris@315
|
2230 foldl (fn ((ext, packer), acc) =>
|
Chris@315
|
2231 if String.isSuffix ext filename
|
Chris@315
|
2232 then SOME (packer,
|
Chris@315
|
2233 String.substring (filename, 0,
|
Chris@315
|
2234 String.size filename -
|
Chris@315
|
2235 String.size ext))
|
Chris@315
|
2236 else acc)
|
Chris@315
|
2237 NONE
|
Chris@315
|
2238 extensions
|
Chris@315
|
2239 end
|
Chris@315
|
2240
|
Chris@315
|
2241 fun pack_archive archive_root target_name target_path packer exclusions =
|
Chris@315
|
2242 case FileBits.command {
|
Chris@315
|
2243 rootpath = archive_root,
|
Chris@315
|
2244 extdir = ".",
|
Chris@315
|
2245 providers = [],
|
Chris@315
|
2246 accounts = []
|
Chris@315
|
2247 } "" ([
|
Chris@315
|
2248 "tar",
|
Chris@315
|
2249 case packer of
|
Chris@315
|
2250 TAR => "cf"
|
Chris@315
|
2251 | TAR_GZ => "czf"
|
Chris@315
|
2252 | TAR_BZ2 => "cjf"
|
Chris@315
|
2253 | TAR_XZ => "cJf",
|
Chris@315
|
2254 target_path,
|
Chris@315
|
2255 "--exclude=.hg",
|
Chris@315
|
2256 "--exclude=.git",
|
Chris@317
|
2257 "--exclude=.svn",
|
Chris@318
|
2258 "--exclude=repoint",
|
Chris@318
|
2259 "--exclude=repoint.sml",
|
Chris@318
|
2260 "--exclude=repoint.ps1",
|
Chris@318
|
2261 "--exclude=repoint.bat",
|
Chris@318
|
2262 "--exclude=repoint-project.json",
|
Chris@318
|
2263 "--exclude=repoint-lock.json"
|
Chris@315
|
2264 ] @ (map (fn e => "--exclude=" ^ e) exclusions) @
|
Chris@315
|
2265 [ target_name ])
|
Chris@315
|
2266 of
|
Chris@315
|
2267 ERROR e => ERROR e
|
Chris@315
|
2268 | OK _ => FileBits.rmpath (archive_path archive_root target_name)
|
Chris@315
|
2269
|
Chris@315
|
2270 fun archive (target_path, exclusions) (project : project) =
|
Chris@315
|
2271 let val _ = check_nonexistent target_path
|
Chris@315
|
2272 val (packer, name) =
|
Chris@315
|
2273 case packer_and_basename target_path of
|
Chris@315
|
2274 NONE => raise Fail ("Unsupported archive file extension in "
|
Chris@315
|
2275 ^ target_path)
|
Chris@315
|
2276 | SOME pn => pn
|
Chris@315
|
2277 val details =
|
Chris@317
|
2278 case project_vcs_id_and_url (#rootpath (#context project)) of
|
Chris@315
|
2279 ERROR e => raise Fail e
|
Chris@315
|
2280 | OK details => details
|
Chris@315
|
2281 val archive_root =
|
Chris@315
|
2282 case make_archive_copy name details project of
|
Chris@315
|
2283 ERROR e => raise Fail e
|
Chris@315
|
2284 | OK archive_root => archive_root
|
Chris@315
|
2285 val outcome =
|
Chris@315
|
2286 case update_archive archive_root name project of
|
Chris@315
|
2287 ERROR e => ERROR e
|
Chris@315
|
2288 | OK _ =>
|
Chris@315
|
2289 case pack_archive archive_root name
|
Chris@315
|
2290 target_path packer exclusions of
|
Chris@315
|
2291 ERROR e => ERROR e
|
Chris@315
|
2292 | OK _ => OK ()
|
Chris@315
|
2293 in
|
Chris@315
|
2294 case outcome of
|
Chris@315
|
2295 ERROR e => raise Fail e
|
Chris@315
|
2296 | OK () => OS.Process.success
|
Chris@315
|
2297 end
|
Chris@315
|
2298
|
Chris@315
|
2299 end
|
Chris@315
|
2300
|
Chris@303
|
2301 val libobjname = "libraries"
|
Chris@303
|
2302
|
Chris@303
|
2303 fun load_libspec spec_json lock_json libname : libspec =
|
Chris@303
|
2304 let open JsonBits
|
Chris@303
|
2305 val libobj = lookup_mandatory spec_json [libobjname, libname]
|
Chris@303
|
2306 val vcs = lookup_mandatory_string libobj ["vcs"]
|
Chris@303
|
2307 val retrieve = lookup_optional_string libobj
|
Chris@303
|
2308 val service = retrieve ["service"]
|
Chris@303
|
2309 val owner = retrieve ["owner"]
|
Chris@303
|
2310 val repo = retrieve ["repository"]
|
Chris@303
|
2311 val url = retrieve ["url"]
|
Chris@303
|
2312 val branch = retrieve ["branch"]
|
Chris@314
|
2313 val project_pin = case retrieve ["pin"] of
|
Chris@314
|
2314 NONE => UNPINNED
|
Chris@314
|
2315 | SOME p => PINNED p
|
Chris@303
|
2316 val lock_pin = case lookup_optional lock_json [libobjname, libname] of
|
Chris@314
|
2317 NONE => UNPINNED
|
Chris@314
|
2318 | SOME ll => case lookup_optional_string ll ["pin"] of
|
Chris@314
|
2319 SOME p => PINNED p
|
Chris@314
|
2320 | NONE => UNPINNED
|
Chris@303
|
2321 in
|
Chris@303
|
2322 {
|
Chris@303
|
2323 libname = libname,
|
Chris@303
|
2324 vcs = case vcs of
|
Chris@303
|
2325 "hg" => HG
|
Chris@303
|
2326 | "git" => GIT
|
Chris@317
|
2327 | "svn" => SVN
|
Chris@303
|
2328 | other => raise Fail ("Unknown version-control system \"" ^
|
Chris@303
|
2329 other ^ "\""),
|
Chris@303
|
2330 source = case (url, service, owner, repo) of
|
Chris@303
|
2331 (SOME u, NONE, _, _) => URL_SOURCE u
|
Chris@303
|
2332 | (NONE, SOME ss, owner, repo) =>
|
Chris@303
|
2333 SERVICE_SOURCE { service = ss, owner = owner, repo = repo }
|
Chris@303
|
2334 | _ => raise Fail ("Must have exactly one of service " ^
|
Chris@303
|
2335 "or url string"),
|
Chris@314
|
2336 project_pin = project_pin,
|
Chris@314
|
2337 lock_pin = lock_pin,
|
Chris@303
|
2338 branch = case branch of
|
Chris@317
|
2339 NONE => DEFAULT_BRANCH
|
Chris@317
|
2340 | SOME b =>
|
Chris@317
|
2341 case vcs of
|
Chris@317
|
2342 "svn" => raise Fail ("Branches not supported for " ^
|
Chris@317
|
2343 "svn repositories; change " ^
|
Chris@317
|
2344 "URL instead")
|
Chris@317
|
2345 | _ => BRANCH b
|
Chris@303
|
2346 }
|
Chris@303
|
2347 end
|
Chris@303
|
2348
|
Chris@303
|
2349 fun load_userconfig () : userconfig =
|
Chris@303
|
2350 let val home = FileBits.homedir ()
|
Chris@303
|
2351 val conf_json =
|
Chris@303
|
2352 JsonBits.load_json_from
|
Chris@303
|
2353 (OS.Path.joinDirFile {
|
Chris@303
|
2354 dir = home,
|
Chris@318
|
2355 file = RepointFilenames.user_config_file })
|
Chris@303
|
2356 handle IO.Io _ => Json.OBJECT []
|
Chris@303
|
2357 in
|
Chris@303
|
2358 {
|
Chris@303
|
2359 accounts = case JsonBits.lookup_optional conf_json ["accounts"] of
|
Chris@303
|
2360 NONE => []
|
Chris@303
|
2361 | SOME (Json.OBJECT aa) =>
|
Chris@303
|
2362 map (fn (k, (Json.STRING v)) =>
|
Chris@303
|
2363 { service = k, login = v }
|
Chris@303
|
2364 | _ => raise Fail
|
Chris@303
|
2365 "String expected for account name")
|
Chris@303
|
2366 aa
|
Chris@303
|
2367 | _ => raise Fail "Array expected for accounts",
|
Chris@303
|
2368 providers = Provider.load_providers conf_json
|
Chris@303
|
2369 }
|
Chris@303
|
2370 end
|
Chris@303
|
2371
|
Chris@303
|
2372 datatype pintype =
|
Chris@303
|
2373 NO_LOCKFILE |
|
Chris@303
|
2374 USE_LOCKFILE
|
Chris@303
|
2375
|
Chris@303
|
2376 fun load_project (userconfig : userconfig) rootpath pintype : project =
|
Chris@303
|
2377 let val spec_file = FileBits.project_spec_path rootpath
|
Chris@303
|
2378 val lock_file = FileBits.project_lock_path rootpath
|
Chris@303
|
2379 val _ = if OS.FileSys.access (spec_file, [OS.FileSys.A_READ])
|
Chris@303
|
2380 handle OS.SysErr _ => false
|
Chris@303
|
2381 then ()
|
Chris@303
|
2382 else raise Fail ("Failed to open project spec file " ^
|
Chris@318
|
2383 (RepointFilenames.project_file) ^ " in " ^
|
Chris@303
|
2384 rootpath ^
|
Chris@303
|
2385 ".\nPlease ensure the spec file is in the " ^
|
Chris@303
|
2386 "project root and run this from there.")
|
Chris@303
|
2387 val spec_json = JsonBits.load_json_from spec_file
|
Chris@303
|
2388 val lock_json = if pintype = USE_LOCKFILE
|
Chris@303
|
2389 then JsonBits.load_json_from lock_file
|
Chris@303
|
2390 handle IO.Io _ => Json.OBJECT []
|
Chris@303
|
2391 else Json.OBJECT []
|
Chris@303
|
2392 val extdir = JsonBits.lookup_mandatory_string spec_json
|
Chris@303
|
2393 ["config", "extdir"]
|
Chris@303
|
2394 val spec_libs = JsonBits.lookup_optional spec_json [libobjname]
|
Chris@303
|
2395 val lock_libs = JsonBits.lookup_optional lock_json [libobjname]
|
Chris@303
|
2396 val providers = Provider.load_more_providers
|
Chris@303
|
2397 (#providers userconfig) spec_json
|
Chris@303
|
2398 val libnames = case spec_libs of
|
Chris@303
|
2399 NONE => []
|
Chris@303
|
2400 | SOME (Json.OBJECT ll) => map (fn (k, v) => k) ll
|
Chris@303
|
2401 | _ => raise Fail "Object expected for libs"
|
Chris@303
|
2402 in
|
Chris@303
|
2403 {
|
Chris@303
|
2404 context = {
|
Chris@303
|
2405 rootpath = rootpath,
|
Chris@303
|
2406 extdir = extdir,
|
Chris@303
|
2407 providers = providers,
|
Chris@303
|
2408 accounts = #accounts userconfig
|
Chris@303
|
2409 },
|
Chris@303
|
2410 libs = map (load_libspec spec_json lock_json) libnames
|
Chris@303
|
2411 }
|
Chris@303
|
2412 end
|
Chris@303
|
2413
|
Chris@303
|
2414 fun save_lock_file rootpath locks =
|
Chris@303
|
2415 let val lock_file = FileBits.project_lock_path rootpath
|
Chris@303
|
2416 open Json
|
Chris@303
|
2417 val lock_json =
|
Chris@303
|
2418 OBJECT [
|
Chris@303
|
2419 (libobjname,
|
Chris@303
|
2420 OBJECT (map (fn { libname, id_or_tag } =>
|
Chris@303
|
2421 (libname,
|
Chris@303
|
2422 OBJECT [ ("pin", STRING id_or_tag) ]))
|
Chris@303
|
2423 locks))
|
Chris@303
|
2424 ]
|
Chris@303
|
2425 in
|
Chris@303
|
2426 JsonBits.save_json_to lock_file lock_json
|
Chris@303
|
2427 end
|
Chris@334
|
2428
|
Chris@334
|
2429 fun checkpoint_completion_file rootpath =
|
Chris@334
|
2430 let val completion_file = FileBits.project_completion_path rootpath
|
Chris@334
|
2431 val stream = TextIO.openOut completion_file
|
Chris@334
|
2432 in
|
Chris@334
|
2433 TextIO.closeOut stream
|
Chris@334
|
2434 end
|
Chris@334
|
2435
|
Chris@303
|
2436 fun pad_to n str =
|
Chris@303
|
2437 if n <= String.size str then str
|
Chris@303
|
2438 else pad_to n (str ^ " ")
|
Chris@303
|
2439
|
Chris@303
|
2440 fun hline_to 0 = ""
|
Chris@303
|
2441 | hline_to n = "-" ^ hline_to (n-1)
|
Chris@303
|
2442
|
Chris@318
|
2443 val libname_width = 28
|
Chris@303
|
2444 val libstate_width = 11
|
Chris@314
|
2445 val localstate_width = 17
|
Chris@303
|
2446 val notes_width = 5
|
Chris@303
|
2447 val divider = " | "
|
Chris@314
|
2448 val clear_line = "\r" ^ pad_to 80 "";
|
Chris@303
|
2449
|
Chris@303
|
2450 fun print_status_header () =
|
Chris@314
|
2451 print (clear_line ^ "\n " ^
|
Chris@303
|
2452 pad_to libname_width "Library" ^ divider ^
|
Chris@303
|
2453 pad_to libstate_width "State" ^ divider ^
|
Chris@303
|
2454 pad_to localstate_width "Local" ^ divider ^
|
Chris@303
|
2455 "Notes" ^ "\n " ^
|
Chris@303
|
2456 hline_to libname_width ^ "-+-" ^
|
Chris@303
|
2457 hline_to libstate_width ^ "-+-" ^
|
Chris@303
|
2458 hline_to localstate_width ^ "-+-" ^
|
Chris@303
|
2459 hline_to notes_width ^ "\n")
|
Chris@303
|
2460
|
Chris@303
|
2461 fun print_outcome_header () =
|
Chris@314
|
2462 print (clear_line ^ "\n " ^
|
Chris@303
|
2463 pad_to libname_width "Library" ^ divider ^
|
Chris@303
|
2464 pad_to libstate_width "Outcome" ^ divider ^
|
Chris@303
|
2465 "Notes" ^ "\n " ^
|
Chris@303
|
2466 hline_to libname_width ^ "-+-" ^
|
Chris@303
|
2467 hline_to libstate_width ^ "-+-" ^
|
Chris@303
|
2468 hline_to notes_width ^ "\n")
|
Chris@303
|
2469
|
Chris@318
|
2470 fun print_status with_network (lib : libspec, status) =
|
Chris@303
|
2471 let val libstate_str =
|
Chris@303
|
2472 case status of
|
Chris@303
|
2473 OK (ABSENT, _) => "Absent"
|
Chris@303
|
2474 | OK (CORRECT, _) => if with_network then "Correct" else "Present"
|
Chris@303
|
2475 | OK (SUPERSEDED, _) => "Superseded"
|
Chris@303
|
2476 | OK (WRONG, _) => "Wrong"
|
Chris@303
|
2477 | ERROR _ => "Error"
|
Chris@303
|
2478 val localstate_str =
|
Chris@303
|
2479 case status of
|
Chris@303
|
2480 OK (_, MODIFIED) => "Modified"
|
Chris@314
|
2481 | OK (_, LOCK_MISMATCHED) => "Differs from Lock"
|
Chris@314
|
2482 | OK (_, CLEAN) => "Clean"
|
Chris@314
|
2483 | ERROR _ => ""
|
Chris@303
|
2484 val error_str =
|
Chris@303
|
2485 case status of
|
Chris@303
|
2486 ERROR e => e
|
Chris@303
|
2487 | _ => ""
|
Chris@303
|
2488 in
|
Chris@303
|
2489 print (" " ^
|
Chris@318
|
2490 pad_to libname_width (#libname lib) ^ divider ^
|
Chris@303
|
2491 pad_to libstate_width libstate_str ^ divider ^
|
Chris@303
|
2492 pad_to localstate_width localstate_str ^ divider ^
|
Chris@303
|
2493 error_str ^ "\n")
|
Chris@303
|
2494 end
|
Chris@303
|
2495
|
Chris@318
|
2496 fun print_update_outcome (lib : libspec, outcome) =
|
Chris@303
|
2497 let val outcome_str =
|
Chris@303
|
2498 case outcome of
|
Chris@303
|
2499 OK id => "Ok"
|
Chris@303
|
2500 | ERROR e => "Failed"
|
Chris@303
|
2501 val error_str =
|
Chris@303
|
2502 case outcome of
|
Chris@303
|
2503 ERROR e => e
|
Chris@303
|
2504 | _ => ""
|
Chris@303
|
2505 in
|
Chris@303
|
2506 print (" " ^
|
Chris@318
|
2507 pad_to libname_width (#libname lib) ^ divider ^
|
Chris@303
|
2508 pad_to libstate_width outcome_str ^ divider ^
|
Chris@303
|
2509 error_str ^ "\n")
|
Chris@303
|
2510 end
|
Chris@303
|
2511
|
Chris@318
|
2512 fun vcs_name HG = ("Mercurial", "hg")
|
Chris@318
|
2513 | vcs_name GIT = ("Git", "git")
|
Chris@318
|
2514 | vcs_name SVN = ("Subversion", "svn")
|
Chris@318
|
2515
|
Chris@318
|
2516 fun print_problem_summary context lines =
|
Chris@318
|
2517 let val failed_vcs =
|
Chris@318
|
2518 foldl (fn (({ vcs, ... } : libspec, ERROR _), acc) => vcs::acc
|
Chris@318
|
2519 | (_, acc) => acc) [] lines
|
Chris@318
|
2520 fun report_nonworking vcs error =
|
Chris@318
|
2521 print ((if error = "" then "" else error ^ "\n\n") ^
|
Chris@318
|
2522 "Error: The project uses the " ^ (#1 (vcs_name vcs)) ^
|
Chris@318
|
2523 " version control system, but its\n" ^
|
Chris@318
|
2524 "executable program (" ^ (#2 (vcs_name vcs)) ^
|
Chris@318
|
2525 ") does not appear to be installed in the program path\n\n")
|
Chris@318
|
2526 fun check_working [] checked = ()
|
Chris@318
|
2527 | check_working (vcs::rest) checked =
|
Chris@318
|
2528 if List.exists (fn v => vcs = v) checked
|
Chris@318
|
2529 then check_working rest checked
|
Chris@318
|
2530 else
|
Chris@318
|
2531 case AnyLibControl.is_working context vcs of
|
Chris@318
|
2532 OK true => check_working rest checked
|
Chris@318
|
2533 | OK false => (report_nonworking vcs "";
|
Chris@318
|
2534 check_working rest (vcs::checked))
|
Chris@318
|
2535 | ERROR e => (report_nonworking vcs e;
|
Chris@318
|
2536 check_working rest (vcs::checked))
|
Chris@318
|
2537 in
|
Chris@318
|
2538 print "\nError: Some operations failed\n\n";
|
Chris@318
|
2539 check_working failed_vcs []
|
Chris@318
|
2540 end
|
Chris@318
|
2541
|
Chris@318
|
2542 fun act_and_print action print_header print_line context (libs : libspec list) =
|
Chris@318
|
2543 let val lines = map (fn lib => (lib, action lib)) libs
|
Chris@318
|
2544 val imperfect = List.exists (fn (_, ERROR _) => true | _ => false) lines
|
Chris@303
|
2545 val _ = print_header ()
|
Chris@303
|
2546 in
|
Chris@303
|
2547 app print_line lines;
|
Chris@318
|
2548 if imperfect then print_problem_summary context lines else ();
|
Chris@303
|
2549 lines
|
Chris@303
|
2550 end
|
Chris@303
|
2551
|
Chris@303
|
2552 fun return_code_for outcomes =
|
Chris@303
|
2553 foldl (fn ((_, result), acc) =>
|
Chris@303
|
2554 case result of
|
Chris@303
|
2555 ERROR _ => OS.Process.failure
|
Chris@303
|
2556 | _ => acc)
|
Chris@303
|
2557 OS.Process.success
|
Chris@303
|
2558 outcomes
|
Chris@303
|
2559
|
Chris@303
|
2560 fun status_of_project ({ context, libs } : project) =
|
Chris@303
|
2561 return_code_for (act_and_print (AnyLibControl.status context)
|
Chris@303
|
2562 print_status_header (print_status false)
|
Chris@318
|
2563 context libs)
|
Chris@303
|
2564
|
Chris@303
|
2565 fun review_project ({ context, libs } : project) =
|
Chris@303
|
2566 return_code_for (act_and_print (AnyLibControl.review context)
|
Chris@303
|
2567 print_status_header (print_status true)
|
Chris@318
|
2568 context libs)
|
Chris@303
|
2569
|
Chris@314
|
2570 fun lock_project ({ context, libs } : project) =
|
Chris@317
|
2571 let val _ = if FileBits.verbose ()
|
Chris@317
|
2572 then print ("Scanning IDs for lock file...\n")
|
Chris@317
|
2573 else ()
|
Chris@318
|
2574 val outcomes = map (fn lib => (lib, AnyLibControl.id_of context lib))
|
Chris@314
|
2575 libs
|
Chris@314
|
2576 val locks =
|
Chris@314
|
2577 List.concat
|
Chris@318
|
2578 (map (fn (lib : libspec, result) =>
|
Chris@314
|
2579 case result of
|
Chris@314
|
2580 ERROR _ => []
|
Chris@318
|
2581 | OK id => [{ libname = #libname lib,
|
Chris@318
|
2582 id_or_tag = id }])
|
Chris@314
|
2583 outcomes)
|
Chris@314
|
2584 val return_code = return_code_for outcomes
|
Chris@314
|
2585 val _ = print clear_line
|
Chris@314
|
2586 in
|
Chris@314
|
2587 if OS.Process.isSuccess return_code
|
Chris@314
|
2588 then save_lock_file (#rootpath context) locks
|
Chris@314
|
2589 else ();
|
Chris@314
|
2590 return_code
|
Chris@314
|
2591 end
|
Chris@317
|
2592
|
Chris@317
|
2593 fun update_project (project as { context, libs }) =
|
Chris@317
|
2594 let val outcomes = act_and_print
|
Chris@317
|
2595 (AnyLibControl.update context)
|
Chris@318
|
2596 print_outcome_header print_update_outcome
|
Chris@318
|
2597 context libs
|
Chris@317
|
2598 val _ = if List.exists (fn (_, OK _) => true | _ => false) outcomes
|
Chris@317
|
2599 then lock_project project
|
Chris@317
|
2600 else OS.Process.success
|
Chris@334
|
2601 val return_code = return_code_for outcomes
|
Chris@317
|
2602 in
|
Chris@334
|
2603 if OS.Process.isSuccess return_code
|
Chris@334
|
2604 then checkpoint_completion_file (#rootpath context)
|
Chris@334
|
2605 else ();
|
Chris@334
|
2606 return_code
|
Chris@317
|
2607 end
|
Chris@315
|
2608
|
Chris@303
|
2609 fun load_local_project pintype =
|
Chris@303
|
2610 let val userconfig = load_userconfig ()
|
Chris@303
|
2611 val rootpath = OS.FileSys.getDir ()
|
Chris@303
|
2612 in
|
Chris@303
|
2613 load_project userconfig rootpath pintype
|
Chris@303
|
2614 end
|
Chris@303
|
2615
|
Chris@303
|
2616 fun with_local_project pintype f =
|
Chris@318
|
2617 let open OS.Process
|
Chris@318
|
2618 val return_code =
|
Chris@318
|
2619 f (load_local_project pintype)
|
Chris@318
|
2620 handle Fail msg =>
|
Chris@318
|
2621 failure before print ("Error: " ^ msg)
|
Chris@318
|
2622 | JsonBits.Config msg =>
|
Chris@318
|
2623 failure before print ("Error in configuration: " ^ msg)
|
Chris@318
|
2624 | e =>
|
Chris@318
|
2625 failure before print ("Error: " ^ exnMessage e)
|
Chris@303
|
2626 val _ = print "\n";
|
Chris@303
|
2627 in
|
Chris@303
|
2628 return_code
|
Chris@303
|
2629 end
|
Chris@303
|
2630
|
Chris@314
|
2631 fun review () = with_local_project USE_LOCKFILE review_project
|
Chris@314
|
2632 fun status () = with_local_project USE_LOCKFILE status_of_project
|
Chris@303
|
2633 fun update () = with_local_project NO_LOCKFILE update_project
|
Chris@314
|
2634 fun lock () = with_local_project NO_LOCKFILE lock_project
|
Chris@303
|
2635 fun install () = with_local_project USE_LOCKFILE update_project
|
Chris@303
|
2636
|
Chris@303
|
2637 fun version () =
|
Chris@318
|
2638 (print ("v" ^ repoint_version ^ "\n");
|
Chris@303
|
2639 OS.Process.success)
|
Chris@303
|
2640
|
Chris@303
|
2641 fun usage () =
|
Chris@318
|
2642 (print "\nRepoint ";
|
Chris@303
|
2643 version ();
|
Chris@334
|
2644 print ("\n A simple manager for third-party source code dependencies.\n"
|
Chris@334
|
2645 ^ " http://all-day-breakfast.com/repoint/\n\n"
|
Chris@303
|
2646 ^ "Usage:\n\n"
|
Chris@334
|
2647 ^ " repoint <command> [<options>]\n\n"
|
Chris@303
|
2648 ^ "where <command> is one of:\n\n"
|
Chris@303
|
2649 ^ " status print quick report on local status only, without using network\n"
|
Chris@303
|
2650 ^ " review check configured libraries against their providers, and report\n"
|
Chris@303
|
2651 ^ " install update configured libraries according to project specs and lock file\n"
|
Chris@303
|
2652 ^ " update update configured libraries and lock file according to project specs\n"
|
Chris@334
|
2653 ^ " lock rewrite lock file to match local library status\n"
|
Chris@334
|
2654 ^ " archive pack up project and all libraries into an archive file:\n"
|
Chris@334
|
2655 ^ " invoke as 'repoint archive targetfile.tar.gz --exclude unwanted.txt'\n"
|
Chris@334
|
2656 ^ " version print the Repoint version number and exit\n\n"
|
Chris@334
|
2657 ^ "and <options> may include:\n\n"
|
Chris@334
|
2658 ^ " --directory <dir>\n"
|
Chris@334
|
2659 ^ " change to directory <dir> before doing anything; in particular,\n"
|
Chris@334
|
2660 ^ " expect to find project spec file in that directory\n\n");
|
Chris@303
|
2661 OS.Process.failure)
|
Chris@303
|
2662
|
Chris@315
|
2663 fun archive target args =
|
Chris@315
|
2664 case args of
|
Chris@315
|
2665 [] =>
|
Chris@315
|
2666 with_local_project USE_LOCKFILE (Archive.archive (target, []))
|
Chris@315
|
2667 | "--exclude"::xs =>
|
Chris@315
|
2668 with_local_project USE_LOCKFILE (Archive.archive (target, xs))
|
Chris@315
|
2669 | _ => usage ()
|
Chris@315
|
2670
|
Chris@334
|
2671 fun handleSystemArgs args =
|
Chris@334
|
2672 let fun handleSystemArgs' leftover args =
|
Chris@334
|
2673 case args of
|
Chris@334
|
2674 "--directory"::dir::rest =>
|
Chris@334
|
2675 (OS.FileSys.chDir dir;
|
Chris@334
|
2676 handleSystemArgs' leftover rest)
|
Chris@334
|
2677 | arg::rest =>
|
Chris@334
|
2678 handleSystemArgs' (leftover @ [arg]) rest
|
Chris@334
|
2679 | [] => leftover
|
Chris@334
|
2680 in
|
Chris@334
|
2681 OK (handleSystemArgs' [] args)
|
Chris@334
|
2682 handle e => ERROR (exnMessage e)
|
Chris@334
|
2683 end
|
Chris@334
|
2684
|
Chris@318
|
2685 fun repoint args =
|
Chris@334
|
2686 case handleSystemArgs args of
|
Chris@334
|
2687 ERROR e => (print ("Error: " ^ e ^ "\n");
|
Chris@334
|
2688 OS.Process.exit OS.Process.failure)
|
Chris@334
|
2689 | OK args =>
|
Chris@334
|
2690 let val return_code =
|
Chris@303
|
2691 case args of
|
Chris@303
|
2692 ["review"] => review ()
|
Chris@303
|
2693 | ["status"] => status ()
|
Chris@303
|
2694 | ["install"] => install ()
|
Chris@303
|
2695 | ["update"] => update ()
|
Chris@314
|
2696 | ["lock"] => lock ()
|
Chris@303
|
2697 | ["version"] => version ()
|
Chris@315
|
2698 | "archive"::target::args => archive target args
|
Chris@318
|
2699 | arg::_ => (print ("Error: unknown argument \"" ^ arg ^ "\"\n");
|
Chris@318
|
2700 usage ())
|
Chris@303
|
2701 | _ => usage ()
|
Chris@334
|
2702 in
|
Chris@334
|
2703 OS.Process.exit return_code
|
Chris@334
|
2704 end
|
Chris@303
|
2705
|
Chris@303
|
2706 fun main () =
|
Chris@318
|
2707 repoint (CommandLine.arguments ())
|