avm-tools 0.53.0 → 0.56.0

data/vendor/{git-subrepo → eac_git/vendor/git-subrepo}/lib/git-subrepo

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 #
-# Copyright 2013-2017 - Ingy döt Net <ingy@ingy.net>
+# Copyright 2013-2020 - Ingy döt Net <ingy@ingy.net>
 #
 
 
@@ -26,9 +26,9 @@ else
 fi
 bash+:import :std can
 
-VERSION=0.4.0
+VERSION=0.4.1
 REQUIRED_GIT_VERSION=2.7.0
-GIT_TMP=.git/tmp
+GIT_TMP="$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp"
 
 # `git rev-parse` turns this into a getopt parser and a command usage message:
 GETOPT_SPEC="\
@@ -405,8 +405,8 @@ command:help() {
 command:version() {
   cat <<...
 git-subrepo Version: $VERSION
-Copyright 2013-2017 Ingy döt Net
-https://github.com/git-commands/git-subrepo
+Copyright 2013-2020 Ingy döt Net
+https://github.com/ingydotnet/git-subrepo
 $BASH_SOURCE
 Git Version: $git_version
 
@@ -581,8 +581,9 @@ subrepo:push() {
     if ! OK; then
       # Check if we are pushing to a new upstream repo (or branch) and just
       # push the commit directly. This is common after a `git subrepo init`:
-      local re="(^|"$'\n'")fatal: Couldn't find remote ref "
-      if [[ $output =~ $re ]]; then
+      # Force to case in
+      local re="(^|"$'\n'")fatal: couldn't find remote ref "
+      if [[ ${output,,} =~ $re ]]; then
         o "Pushing to new upstream: $subrepo_remote ($subrepo_branch)."
         new_upstream=true
       else
@@ -704,7 +705,7 @@ subrepo:branch() {
     local prev_commit=
     local ancestor=
     o "Create new commits with parents into the subrepo fetch"
-    OUT=true RUN git rev-list --reverse --ancestry-path "$subrepo_parent..HEAD"
+    OUT=true RUN git rev-list --reverse --ancestry-path --topo-order "$subrepo_parent..HEAD"
     local commit_list="$output"
     for commit in $commit_list; do
       o "Working on $commit"
@@ -737,7 +738,7 @@ subrepo:branch() {
       o "Check for rebase"
       if git:rev-exists "$refs_subrepo_fetch"; then
         if ! git:commit-in-rev-list  "$gitrepo_commit" "$refs_subrepo_fetch"; then
-          error "Local repository does not contain $gitrepo_commit. Try to 'git subrepo fetch $subref' of add the '-F' flag to always fetch the latest content."
+          error "Local repository does not contain $gitrepo_commit. Try to 'git subrepo fetch $subref' or add the '-F' flag to always fetch the latest content."
         fi
       fi
 
@@ -966,11 +967,15 @@ subrepo:clean() {
 
   if "$force_wanted"; then
     o "Remove all subrepo refs."
-    if "$all_wanted"; then
-      RUN rm -fr .git/refs/subrepo/
-    else
-      RUN rm -fr .git/refs/subrepo/$subref/
+    local suffix=""
+    if ! $all_wanted; then
+      suffix="$subref/"
     fi
+    git show-ref | while read hash ref; do
+      if [[ "$ref" == refs/subrepo/$suffix* ]]; then
+        git update-ref -d "$ref"
+      fi
+    done
   fi
 }
 
@@ -1416,6 +1421,17 @@ assert-environment-ok() {
     error "Requires git version $REQUIRED_GIT_VERSION or higher; "`
          `"you have '$git_version'."
   fi
+
+  if [[ ${BASH_VERSINFO[0]} -lt 4 ]] ; then
+    echo "The git-subrepo command requires that 'Bash 4+' is installed."
+    echo "It doesn't need to be your shell, but it must be in your PATH."
+    if [[ $OSTYPE == darwin* ]]; then
+      echo "You appear to be on macOS."
+      echo "Try: 'brew install bash'."
+      echo "This will not change your user shell, it just installs 'Bash 5.x'."
+    fi
+    exit 1
+  fi
 }
 
 # Make sure git repo is ready:
@@ -1508,13 +1524,7 @@ assert-subdir-empty() {
 # Find all the current subrepos by looking for all the subdirectories that
 # contain a `.gitrepo` file.
 get-all-subrepos() {
-  local paths=($(
-    find . -name '.gitrepo' |
-      grep -v '/.git/' |
-      grep '/.gitrepo$' |
-      sed 's/.gitrepo$//' |
-      sort
-  ))
+  local paths=($(git ls-files | sed -n 's!/\.gitrepo$!!p' | sort))
   subrepos=()
   local path
   for path in "${paths[@]}"; do

data/vendor/eac_git/vendor/git-subrepo/lib/git-subrepo.d/bash+.bash

@@ -0,0 +1 @@
+vendor/eac_git/vendor/git-subrepo/lib/git-subrepo.d/../../ext/bashplus/lib/bash+.bash

data/vendor/{git-subrepo → eac_git/vendor/git-subrepo}/lib/git-subrepo.d/help-functions.bash

@@ -165,7 +165,7 @@ help:help() {
   Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
   use `git subrepo -h`.
 
-  Use `git subrepo help <command> to get help for a specific command. Use
+  Use `git subrepo help <command>` to get help for a specific command. Use
   `--all` to get a summary of all commands.
 
   The `help` command accepts the `--all` option.
@@ -244,10 +244,6 @@ help:pull() {
   specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
   as a `clone --force` operation, using the current remote and branch.
 
-  When you pull you can assume a fast-forward strategy (default) or you can
-  specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
-  as a `clone --force` operation, using the current remote and branch.
-
   Like the `clone` command, `pull` will squash all the changes (since the last
   pull or clone) into one commit. This keeps your mainline history nice and
   clean. You can easily see the subrepo's history with the `git log` command:

data/vendor/{git-subrepo → eac_git/vendor/git-subrepo}/man/man1/git-subrepo.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "git-subrepo 1"
-.TH git-subrepo 1 "August 2017" "Generated by Swim v0.1.41" "Git Submodule Alternative"
+.IX Title "STDIN 1"
+.TH STDIN 1 "January 2020" "Generated by Swim v0.1.48" "Git Submodule Alternative"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -79,8 +79,6 @@
 .SH "Name"
 .IX Header "Name"
 git-subrepo \- Git Submodule Alternative
-.PP
-<badge travis ingydotnet/git\-subrepo>
 .SH "Synopsis"
 .IX Header "Synopsis"
 .Vb 1
@@ -178,7 +176,7 @@ The best short answer is:
 .PP
 The complete \*(L"Installation Instructions\*(R" can be found below.
 .PP
-Note: git-subrepo needs a git version (> 2.5) that supports worktree:s.
+Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
 .SH "Commands"
 .IX Header "Commands"
 All the \fBsubrepo\fR commands use names of actual Git commands and try to do
@@ -276,10 +274,6 @@ When you pull you can assume a fast-forward strategy (default) or you can
 specify a \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR or \f(CW\*(C`\-\-force\*(C'\fR strategy. The latter is the
 same as a \f(CW\*(C`clone \-\-force\*(C'\fR operation, using the current remote and branch.
 .Sp
-When you pull you can assume a fast-forward strategy (default) or you can
-specify a \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR or \f(CW\*(C`\-\-force\*(C'\fR strategy. The latter is the
-same as a \f(CW\*(C`clone \-\-force\*(C'\fR operation, using the current remote and branch.
-.Sp
 Like the \f(CW\*(C`clone\*(C'\fR command, \f(CW\*(C`pull\*(C'\fR will squash all the changes (since the last
 pull or clone) into one commit. This keeps your mainline history nice and
 clean. You can easily see the subrepo's history with the \f(CW\*(C`git log\*(C'\fR command:
@@ -303,7 +297,7 @@ the \f(CW\*(C`branch\*(C'\fR command and merge things yourself before pushing if
 (although that is probably a rare use case).
 .Sp
 The \f(CW\*(C`push\*(C'\fR command requires a branch that has been properly merged/rebased
-with the upstream \s-1HEAD \s0(unless the upstream \s-1HEAD\s0 is empty, which is common
+with the upstream \s-1HEAD\s0 (unless the upstream \s-1HEAD\s0 is empty, which is common
 when doing a first \f(CW\*(C`push\*(C'\fR after an \f(CW\*(C`init\*(C'\fR). That means the upstream \s-1HEAD\s0 is
 one of the commits in the branch.
 .Sp
@@ -417,8 +411,8 @@ Example to update the \f(CW\*(C`method\*(C'\fR option for a subrepo:
 Same as \f(CW\*(C`git help subrepo\*(C'\fR. Will launch the manpage. For the shorter usage,
 use \f(CW\*(C`git subrepo \-h\*(C'\fR.
 .Sp
-Use \f(CW\*(C`git subrepo help <command> to get help for a specific command. Use\*(C'\fR\-\-
-all` to get a summary of all commands.
+Use \f(CW\*(C`git subrepo help <command>\*(C'\fR to get help for a specific command. Use
+\&\f(CW\*(C`\-\-all\*(C'\fR to get a summary of all commands.
 .Sp
 The \f(CW\*(C`help\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR option.
 .ie n .IP """git subrepo version [\-q|\-v]""" 4
@@ -736,11 +730,14 @@ The \f(CW\*(C`git\-subrepo\*(C'\fR repo itself has 2 subrepos under the \f(CW\*(
 Written in (very modern) Bash, with full test suite. Take a look.
 .IP "\(bu" 4
 A \f(CW\*(C`.gitrepo\*(C'\fR file never is in the top level dir (next to a \f(CW\*(C`.git/\*(C'\fR dir).
-.SH "Author"
-.IX Header "Author"
-Written by Ingy döt Net <ingy@ingy.net>
+.SH "Authors"
+.IX Header "Authors"
+.IP "\(bu" 4
+Ingy döt Net <ingy@ingy.net>
+.IP "\(bu" 4
+Magnus Carlsson <grimmymail@gmail.com>
 .SH "License and Copyright"
 .IX Header "License and Copyright"
 The \s-1MIT\s0 License (\s-1MIT\s0)
 .PP
-Copyright (c) 2013\-2017 Ingy döt Net
+Copyright (c) 2013\-2020 Ingy döt Net

data/vendor/{git-subrepo → eac_git/vendor/git-subrepo}/pkg/bin/generate-completion.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 use strict;
-use XXX;
+# use XXX;
 
 sub main {
     my ($cmd) = @_;

data/vendor/{git-subrepo → eac_git/vendor/git-subrepo}/share/completion.bash

@@ -3,9 +3,9 @@
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
 _git_subrepo() {
-    local _opts=" -h --help --version -a --all -A --ALL -b= --branch= -e --edit -f --force -F --fetch -M= --method= --Default -m= --message= -N --dry-run -r= --remote= -s --squash -u --update -q --quiet -v --verbose -d --debug -x --DEBUG"
-    local subcommands="branch clean clone clone clone commit commit commit config fetch fetch fetch help help help init pull pull pull push push push status status status upgrade version"
-    local subdircommands="branch clean commit commit commit config fetch fetch fetch pull pull pull push push push status status status"
+    local _opts=" -h --help --version -a --all -A --ALL -b= --branch= -e --edit -f --force -F --fetch -M= --method= --Default -m= --message= -r= --remote= -s --squash -u --update -q --quiet -v --verbose -d --debug -x --DEBUG"
+    local subcommands="branch clean clone commit config fetch help init pull push status upgrade version"
+    local subdircommands="branch clean commit config fetch pull push status"
     local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
     if [ -z "$subcommand" ]; then

data/vendor/{git-subrepo → eac_git/vendor/git-subrepo}/share/zsh-completion/_git-subrepo

@@ -27,7 +27,6 @@ _git-subrepo() {
         '(-M --method)'{-M,--method}'[Method when you join, valid options are '"'"'merge'"'"' or '"'"'rebase'"'"']:M' \
         '--Default[is '"'"'merge'"'"']' \
         '(-m --message)'{-m,--message}'[Specify a commit message]:m' \
-        '(-N --dry-run)'{-N,--dry-run}'[Don'"'"'t push or commit (prints next commands to run)]' \
         '(-r --remote)'{-r,--remote}'[Specify the upstream remote to push/pull/fetch]:r' \
         '(-s --squash)'{-s,--squash}'[Squash commits on push]' \
         '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo]' \
@@ -39,7 +38,7 @@ _git-subrepo() {
 
     case $state in
     subcmd)
-        compadd branch clean clone clone clone commit commit commit config fetch fetch fetch help help help init pull pull pull push push push status status status upgrade version
+        compadd branch clean clone commit config fetch help init pull push status upgrade version
     ;;
 
     args)
@@ -58,7 +57,7 @@ _git-subrepo() {
                 esac
         ;;
 
-        branch|clean|commit|commit|commit|config|fetch|fetch|fetch|pull|pull|pull|push|push|push|status|status|status)
+        branch|clean|commit|config|fetch|pull|push|status)
             _compadd_subdirs
         ;;
 
@@ -67,7 +66,7 @@ _git-subrepo() {
         ;;
 
         help)
-            compadd branch clean clone clone clone commit commit commit config fetch fetch fetch help help help init pull pull pull push push push status status status upgrade version
+            compadd branch clean clone commit config fetch help init pull push status upgrade version
         ;;
         esac
     ;;