annotate repoint.sml @ 320:5d383c8f39b9

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