annotate vext.sml @ 1758:42d57c382e56

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