eac_tools 0.86.1 → 0.86.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +44 -39
- data/lib/eac_tools/version.rb +1 -1
- data/sub/avm/avm.gemspec +2 -2
- data/sub/avm/lib/avm/rspec/setup/launcher.rb +1 -0
- data/sub/avm/lib/avm/scms/base/branches.rb +22 -0
- data/sub/avm/lib/avm/scms/base/remotes.rb +22 -0
- data/sub/avm/lib/avm/scms/branch.rb +26 -0
- data/sub/avm/lib/avm/scms/remote.rb +11 -0
- data/sub/avm/lib/avm/sources/issues/deliver.rb +52 -0
- data/sub/avm/lib/avm/sources/issues.rb +11 -0
- data/sub/avm/lib/avm/version.rb +1 -1
- data/sub/avm-eac_postgresql_base0/Gemfile +2 -2
- data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec +4 -3
- data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/assert.rb +2 -2
- data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/commands.rb +4 -4
- data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb +4 -4
- data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb +1 -1
- data/sub/avm-eac_postgresql_base0/spec/rubocop_spec.rb +1 -1
- data/sub/avm-eac_postgresql_base0/spec/spec_helper.rb +1 -1
- data/sub/avm-git/avm-git.gemspec +23 -0
- data/sub/avm-git/lib/avm/git/application_scms/base/assert_main_at.rb +49 -0
- data/sub/avm-git/lib/avm/git/application_scms/base.rb +21 -0
- data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0/sources.rb → avm-git/lib/avm/git/application_scms.rb} +2 -2
- data/sub/avm-git/lib/avm/git/commit/class_methods.rb +31 -0
- data/sub/avm-git/lib/avm/git/commit/diff_tree_line.rb +32 -0
- data/sub/avm-git/lib/avm/git/commit/file.rb +46 -0
- data/sub/avm-git/lib/avm/git/commit.rb +59 -0
- data/sub/avm-git/lib/avm/git/issue/complete/commits.rb +42 -0
- data/sub/avm-git/lib/avm/git/issue/complete/git_subrepos.rb +23 -0
- data/sub/avm-git/lib/avm/git/issue/complete/local_branch.rb +61 -0
- data/sub/avm-git/lib/avm/git/issue/complete/local_tag.rb +39 -0
- data/sub/avm-git/lib/avm/git/issue/complete/push.rb +60 -0
- data/sub/avm-git/lib/avm/git/issue/complete/remote.rb +33 -0
- data/sub/avm-git/lib/avm/git/issue/complete/test.rb +40 -0
- data/sub/avm-git/lib/avm/git/issue/complete/tracker.rb +28 -0
- data/sub/avm-git/lib/avm/git/issue/complete/validation.rb +39 -0
- data/sub/avm-git/lib/avm/git/issue/complete/validations.rb +53 -0
- data/sub/avm-git/lib/avm/git/issue/complete/working_tree.rb +19 -0
- data/sub/avm-git/lib/avm/git/issue/complete.rb +66 -0
- data/sub/avm-git/lib/avm/git/issue.rb +11 -0
- data/sub/avm-git/lib/avm/git/launcher/base/class_methods.rb +28 -0
- data/sub/avm-git/lib/avm/git/launcher/base/dirty_files.rb +23 -0
- data/sub/avm-git/lib/avm/git/launcher/base/remotes.rb +40 -0
- data/sub/avm-git/lib/avm/git/launcher/base/subrepo.rb +44 -0
- data/sub/avm-git/lib/avm/git/launcher/base/underlying.rb +59 -0
- data/sub/avm-git/lib/avm/git/launcher/base.rb +87 -0
- data/sub/avm-git/lib/avm/git/launcher/error.rb +15 -0
- data/sub/avm-git/lib/avm/git/launcher/mirror_update.rb +38 -0
- data/sub/avm-git/lib/avm/git/launcher/publish_base.rb +131 -0
- data/sub/avm-git/lib/avm/git/launcher/remote.rb +55 -0
- data/sub/avm-git/lib/avm/git/launcher/sub_warp_base.rb +33 -0
- data/sub/avm-git/lib/avm/git/launcher/warp_base.rb +68 -0
- data/sub/avm-git/lib/avm/git/launcher.rb +7 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git/local_project_mixin.rb +19 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git/publish.rb +15 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git/warp.rb +27 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git.rb +25 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo/publish.rb +31 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo/warp.rb +88 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo.rb +36 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subtree/publish.rb +14 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subtree/warp.rb +32 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subtree.rb +51 -0
- data/sub/avm-git/lib/avm/git/launcher_stereotypes/provider.rb +22 -0
- data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0/file_formats.rb → avm-git/lib/avm/git/launcher_stereotypes.rb} +2 -2
- data/sub/avm-git/lib/avm/git/organize/reference_update.rb +34 -0
- data/sub/avm-git/lib/avm/git/organize/repository.rb +77 -0
- data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0/instances.rb → avm-git/lib/avm/git/organize.rb} +2 -2
- data/sub/avm-git/lib/avm/git/revision_test.rb +105 -0
- data/sub/avm-git/lib/avm/git/scms/git/branch.rb +31 -0
- data/sub/avm-git/lib/avm/git/scms/git/branches.rb +20 -0
- data/sub/avm-git/lib/avm/git/scms/git/change_tracker.rb +36 -0
- data/sub/avm-git/lib/avm/git/scms/git/changed_file.rb +16 -0
- data/sub/avm-git/lib/avm/git/scms/git/changed_files.rb +24 -0
- data/sub/avm-git/lib/avm/git/scms/git/commit/deploy.rb +43 -0
- data/sub/avm-git/lib/avm/git/scms/git/commit/deploy_methods.rb +30 -0
- data/sub/avm-git/lib/avm/git/scms/git/commit.rb +67 -0
- data/sub/avm-git/lib/avm/git/scms/git/commit_dirty.rb +36 -0
- data/sub/avm-git/lib/avm/git/scms/git/commits.rb +47 -0
- data/sub/avm-git/lib/avm/git/scms/git/interval.rb +31 -0
- data/sub/avm-git/lib/avm/git/scms/git/milestones.rb +21 -0
- data/sub/avm-git/lib/avm/git/scms/git/remote.rb +21 -0
- data/sub/avm-git/lib/avm/git/scms/git/remotes.rb +32 -0
- data/sub/avm-git/lib/avm/git/scms/git/run_commit.rb +57 -0
- data/sub/avm-git/lib/avm/git/scms/git.rb +44 -0
- data/sub/avm-git/lib/avm/git/scms/git_sub_base/changed_file.rb +21 -0
- data/sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb +27 -0
- data/sub/avm-git/lib/avm/git/scms/git_sub_base/interval.rb +28 -0
- data/sub/avm-git/lib/avm/git/scms/git_sub_base.rb +33 -0
- data/sub/avm-git/lib/avm/git/scms/git_subrepo.rb +37 -0
- data/sub/avm-git/lib/avm/git/scms/git_subtree.rb +26 -0
- data/sub/avm-git/lib/avm/git/scms/provider.rb +21 -0
- data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0/source_generators.rb → avm-git/lib/avm/git/scms.rb} +2 -2
- data/sub/avm-git/lib/avm/git/subrepo_check/parent.rb +51 -0
- data/sub/avm-git/lib/avm/git/subrepo_check/remote.rb +89 -0
- data/sub/avm-git/lib/avm/git/subrepo_check/show_result.rb +32 -0
- data/sub/avm-git/lib/avm/git/subrepo_check.rb +38 -0
- data/sub/avm-git/lib/avm/git/subrepo_checks.rb +60 -0
- data/sub/avm-git/lib/avm/git/vendor/github.rb +20 -0
- data/sub/avm-git/lib/avm/git/vendor.rb +11 -0
- data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0 → avm-git/lib/avm/git}/version.rb +2 -2
- data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0.rb → avm-git/lib/avm/git.rb} +1 -1
- data/sub/avm-git/locale/en.yml +6 -0
- data/sub/avm-git/locale/pt-BR.yml +6 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec.rb +13 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.source.out +1 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.target.yaml +7 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.source.out +1 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.target.yaml +7 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.source.out +1 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.target.yaml +7 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.source.out +2 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.target.yaml +13 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.source.out +2 -0
- data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.target.yaml +13 -0
- data/sub/avm-git/spec/lib/avm/git/commit_spec.rb +56 -0
- data/sub/avm-git/spec/lib/avm/git/launcher/base_spec.rb +45 -0
- data/sub/avm-git/spec/lib/avm/git/scms/git/commit/deploy_spec.rb +92 -0
- data/sub/avm-git/spec/lib/avm/git/scms/git_spec.rb +8 -0
- data/sub/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb +8 -0
- data/sub/avm-git/spec/lib/avm/git/vendor/github_spec.rb +23 -0
- data/sub/avm-tools/avm-tools.gemspec +3 -3
- data/sub/avm-tools/lib/avm/tools/runner/source/issue/deliver.rb +3 -3
- data/sub/avm-tools/lib/avm/tools/version.rb +1 -1
- data/sub/eac_git/Gemfile +8 -0
- data/sub/eac_git/eac_git.gemspec +20 -0
- data/sub/eac_git/lib/eac_git/executables.rb +48 -0
- data/sub/eac_git/lib/eac_git/local/branch.rb +47 -0
- data/sub/eac_git/lib/eac_git/local/commit/archive.rb +19 -0
- data/sub/eac_git/lib/eac_git/local/commit/changed_file.rb +46 -0
- data/sub/eac_git/lib/eac_git/local/commit/diff_tree_line.rb +32 -0
- data/sub/eac_git/lib/eac_git/local/commit.rb +73 -0
- data/sub/eac_git/lib/eac_git/local/dirty_files.rb +48 -0
- data/sub/eac_git/lib/eac_git/local/log.rb +17 -0
- data/sub/eac_git/lib/eac_git/local/remote/push.rb +35 -0
- data/sub/eac_git/lib/eac_git/local/remote.rb +50 -0
- data/sub/eac_git/lib/eac_git/local/remotes.rb +20 -0
- data/sub/eac_git/lib/eac_git/local/subrepo/config.rb +43 -0
- data/sub/eac_git/lib/eac_git/local/subrepo.rb +49 -0
- data/sub/eac_git/lib/eac_git/local.rb +127 -0
- data/sub/eac_git/lib/eac_git/remote.rb +24 -0
- data/sub/eac_git/lib/eac_git/remote_like/ls_result.rb +20 -0
- data/sub/eac_git/lib/eac_git/remote_like.rb +32 -0
- data/sub/eac_git/lib/eac_git/rspec/setup.rb +23 -0
- data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/directory.rb +36 -0
- data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/file.rb +22 -0
- data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/fs_object.rb +27 -0
- data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/repository.rb +34 -0
- data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb +29 -0
- data/sub/eac_git/lib/eac_git/rspec.rb +9 -0
- data/sub/eac_git/lib/eac_git/version.rb +5 -0
- data/sub/eac_git/lib/eac_git.rb +7 -0
- data/sub/eac_git/spec/lib/eac_git/executables_spec.rb +13 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec.rb +13 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.source.out +1 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.target.yaml +7 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.source.out +1 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.target.yaml +7 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.source.out +1 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.target.yaml +7 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.source.out +2 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.target.yaml +13 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.source.out +2 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.target.yaml +13 -0
- data/sub/eac_git/spec/lib/eac_git/local/commit_spec.rb +58 -0
- data/sub/eac_git/spec/lib/eac_git/local/dirty_files_spec.rb +20 -0
- data/sub/eac_git/spec/rubocop_spec.rb +3 -0
- data/sub/eac_git/spec/spec_helper.rb +4 -0
- data/sub/eac_git/vendor/git-subrepo/Changes +110 -0
- data/sub/eac_git/vendor/git-subrepo/Intro.pod +509 -0
- data/sub/eac_git/vendor/git-subrepo/License +21 -0
- data/sub/eac_git/vendor/git-subrepo/Makefile +82 -0
- data/sub/eac_git/vendor/git-subrepo/Meta +28 -0
- data/sub/eac_git/vendor/git-subrepo/ReadMe.pod +698 -0
- data/sub/eac_git/vendor/git-subrepo/doc/comparison.swim +35 -0
- data/sub/eac_git/vendor/git-subrepo/doc/git-subrepo.swim +608 -0
- data/sub/eac_git/vendor/git-subrepo/doc/intro-to-subrepo.swim +387 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/Changes +15 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/License +21 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/Makefile +45 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/Meta +28 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/ReadMe.pod +77 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/bin/bash+ +43 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/doc/bash+.swim +61 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/lib/bash+.bash +92 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/man/man1/bash+.1 +134 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/man/man3/bash+.3 +134 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/base.t +12 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/fcopy.t +22 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/lib/foo/bar.bash +3 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/lib/foo/foo.bash +3 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/source-bash+-std.t +18 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/source-bash+.t +23 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/test.bash +70 -0
- data/sub/eac_git/vendor/git-subrepo/ext/bashplus/test/use.t +19 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/Changes +15 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/License +21 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/Makefile +20 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/Meta +30 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod +115 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim +89 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes +15 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License +21 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile +45 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta +28 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod +77 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+ +43 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim +61 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash +92 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +134 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +134 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/base.t +12 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/fcopy.t +22 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/bar.bash +3 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/foo.bash +3 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +18 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+.t +23 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/test.bash +70 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/use.t +19 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Changes +15 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/License +21 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Makefile +37 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Meta +28 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +66 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +48 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +153 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +119 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +13 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/done.t +10 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail.t +20 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +15 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +9 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/pass.t +9 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/plan.t +10 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/skip_all.t +20 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/tap.t +13 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/bail.t +14 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail.t +7 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail_fast.t +12 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-init.t +8 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-plan.t +9 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/lib/test/more.bash +95 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/man/man3/test-more.3 +173 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/fail.t +20 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/more.t +20 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/pass.t +9 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/setup +8 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/skip_all.t +11 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/test/fail1.t +12 -0
- data/sub/eac_git/vendor/git-subrepo/ext/test-more-bash/test/test/skip_all.t +10 -0
- data/sub/eac_git/vendor/git-subrepo/lib/git-subrepo +1903 -0
- data/sub/eac_git/vendor/git-subrepo/lib/git-subrepo.d/bash+.bash +1 -0
- data/sub/eac_git/vendor/git-subrepo/lib/git-subrepo.d/help-functions.bash +339 -0
- data/sub/eac_git/vendor/git-subrepo/man/man1/git-subrepo.1 +743 -0
- data/sub/eac_git/vendor/git-subrepo/note/0.4.0 +12 -0
- data/sub/eac_git/vendor/git-subrepo/note/AllGitCmds +148 -0
- data/sub/eac_git/vendor/git-subrepo/note/Cases +32 -0
- data/sub/eac_git/vendor/git-subrepo/note/Commands +33 -0
- data/sub/eac_git/vendor/git-subrepo/note/Dags +199 -0
- data/sub/eac_git/vendor/git-subrepo/note/Gists +7 -0
- data/sub/eac_git/vendor/git-subrepo/note/Links +25 -0
- data/sub/eac_git/vendor/git-subrepo/note/Plugins +10 -0
- data/sub/eac_git/vendor/git-subrepo/note/Spec +39 -0
- data/sub/eac_git/vendor/git-subrepo/note/Story1 +57 -0
- data/sub/eac_git/vendor/git-subrepo/note/ToDo +55 -0
- data/sub/eac_git/vendor/git-subrepo/note/design.swim +137 -0
- data/sub/eac_git/vendor/git-subrepo/note/design2.swim +85 -0
- data/sub/eac_git/vendor/git-subrepo/note/init-test +38 -0
- data/sub/eac_git/vendor/git-subrepo/note/pull-dance.txt +18 -0
- data/sub/eac_git/vendor/git-subrepo/note/recreate-rebase-conflict.sh +56 -0
- data/sub/eac_git/vendor/git-subrepo/note/subtree-rebase-fail-example/test.bash +29 -0
- data/sub/eac_git/vendor/git-subrepo/note/test-subrepo-push.sh +69 -0
- data/sub/eac_git/vendor/git-subrepo/note/test.sh +58 -0
- data/sub/eac_git/vendor/git-subrepo/pkg/bin/generate-completion.pl +210 -0
- data/sub/eac_git/vendor/git-subrepo/pkg/bin/generate-help-functions.pl +89 -0
- data/sub/eac_git/vendor/git-subrepo/share/completion.bash +42 -0
- data/sub/eac_git/vendor/git-subrepo/share/enable-completion.sh +50 -0
- data/sub/eac_git/vendor/git-subrepo/share/git-completion.bash +2738 -0
- data/sub/eac_git/vendor/git-subrepo/share/zsh-completion/_git-subrepo +81 -0
- data/sub/eac_git/vendor/git-subrepo/test/branch-all.t +41 -0
- data/sub/eac_git/vendor/git-subrepo/test/branch-rev-list-one-path.t +43 -0
- data/sub/eac_git/vendor/git-subrepo/test/branch-rev-list.t +47 -0
- data/sub/eac_git/vendor/git-subrepo/test/branch.t +52 -0
- data/sub/eac_git/vendor/git-subrepo/test/clean.t +43 -0
- data/sub/eac_git/vendor/git-subrepo/test/clone-annotated-tag.t +45 -0
- data/sub/eac_git/vendor/git-subrepo/test/clone.t +107 -0
- data/sub/eac_git/vendor/git-subrepo/test/compile.t +19 -0
- data/sub/eac_git/vendor/git-subrepo/test/config.t +58 -0
- data/sub/eac_git/vendor/git-subrepo/test/encode.t +91 -0
- data/sub/eac_git/vendor/git-subrepo/test/error.t +171 -0
- data/sub/eac_git/vendor/git-subrepo/test/fetch.t +43 -0
- data/sub/eac_git/vendor/git-subrepo/test/gitignore.t +61 -0
- data/sub/eac_git/vendor/git-subrepo/test/init.t +64 -0
- data/sub/eac_git/vendor/git-subrepo/test/issue29.t +98 -0
- data/sub/eac_git/vendor/git-subrepo/test/issue95.t +98 -0
- data/sub/eac_git/vendor/git-subrepo/test/issue96.t +96 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-all.t +38 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-merge.t +113 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-message.t +88 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-new-branch.t +58 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-ours.t +90 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-theirs.t +82 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-twice.t +44 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull-worktree.t +40 -0
- data/sub/eac_git/vendor/git-subrepo/test/pull.t +99 -0
- data/sub/eac_git/vendor/git-subrepo/test/push-after-init.t +51 -0
- data/sub/eac_git/vendor/git-subrepo/test/push-force.t +56 -0
- data/sub/eac_git/vendor/git-subrepo/test/push-new-branch.t +61 -0
- data/sub/eac_git/vendor/git-subrepo/test/push-no-changes.t +29 -0
- data/sub/eac_git/vendor/git-subrepo/test/push-squash.t +56 -0
- data/sub/eac_git/vendor/git-subrepo/test/push.t +176 -0
- data/sub/eac_git/vendor/git-subrepo/test/reclone.t +45 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/HEAD +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/config +4 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/objects/1f/0c4b264caed0126814a0ede851a1e0b4e16ae6 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/objects/87/46903fdb1b9c2101377880125917c2e05b4d69 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/objects/94/c86ffc745232d89f78c6f895e11e71272518db +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/objects/c6/76c57b6576743fa56278527aa60ebd2e202a7c +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/objects/f6/2a8ff3feadf39b0a98f1a86ec6d1eb33858ee9 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/refs/heads/master +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/bar/refs/tags/A +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/foo/HEAD +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/foo/config +4 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/foo/objects/a0/f4cdaaf533a936296cdebbed8206c3b9ededa8 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/foo/objects/e2/1291a1ad392a9d4c51dd9586804f1467b28afd +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/foo/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/foo/refs/heads/master +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/HEAD +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/config +5 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/11/523f5dcf03b4c89b592dc8a3d0308f68da2386 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/14/2addf8ec5f37334e837440122c62f2c68a29ad +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09 +2 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/3d/918c6901c02f43af5d31779dd5e1f9166aeb36 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/3e/4cb596066dce63ba4d047abddb677389b65e19 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/4b/6e53022e7a04f07887697e4f3d7c377fd9822b +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/58/931fc1bd559b59c41ea738fc7ad04f9ad01bd3 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/5e/c0c28e1b806f25efdca18fcf7a74b49c3755bd +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2 +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/80/2d5edbd5e1cb7fca82b5bd38e7c8a0a496fb20 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/94/7b3d714c38791e95ad6f928b48c98bb8708acd +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/b1/5f4a7666baf40d949548ead946a3370e273479 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/c3/ee8978c4c5d84c3b7d00ba8e5906933d027882 +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa +3 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626 +2 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135 +2 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1 +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/f1/cc1a657b2e805c400f5dcaaa76bd29c6178b1b +0 -0
- data/sub/eac_git/vendor/git-subrepo/test/repo/init/refs/heads/master +1 -0
- data/sub/eac_git/vendor/git-subrepo/test/setup +205 -0
- data/sub/eac_git/vendor/git-subrepo/test/status.t +68 -0
- data/sub/eac_git/vendor/git-subrepo/test/submodule.t +45 -0
- metadata +354 -42
- data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec +0 -21
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/executables.rb +0 -22
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats/base.rb +0 -20
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances/base.rb +0 -13
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators/base.rb +0 -28
- data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources/base.rb +0 -17
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec.rb +0 -7
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_code.php.source +0 -10
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_code.php.target +0 -10
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_code2.php.source +0 -4
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_code2.php.target +0 -3
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_html_code.php.source +0 -64
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_html_code.php.target +0 -64
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_iso88591_code.php.source +0 -4
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_iso88591_code.php.target +0 -3
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/source_generators/base_spec.rb +0 -8
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/source_generators/base_spec_files/no_options/index.php +0 -0
- data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/sources/base_spec.rb +0 -7
- data/sub/avm-eac_php_base0/template/avm/eac_php_base0/source_generators/base/index.php +0 -0
- /data/sub/{avm-eac_php_base0 → avm-git}/Gemfile +0 -0
- /data/sub/{avm-eac_php_base0 → avm-git}/spec/rubocop_spec.rb +0 -0
- /data/sub/{avm-eac_php_base0 → avm-git}/spec/spec_helper.rb +0 -0
@@ -0,0 +1,35 @@
|
|
1
|
+
= Comparing `submodule` and `subrepo`
|
2
|
+
|
3
|
+
This document compares Git's `submodule` command to the new `subrepo` command,
|
4
|
+
with examples and discussion of all the common operations. I'll use the term
|
5
|
+
"External" to mean the general concept of an external repo that might be used
|
6
|
+
as a submodule or a subrepo.
|
7
|
+
|
8
|
+
= Overview
|
9
|
+
|
10
|
+
|
11
|
+
|
12
|
+
= Adding a new External
|
13
|
+
|
14
|
+
As an owner or collaborator, you have decided to add a new External to your
|
15
|
+
repo:
|
16
|
+
|
17
|
+
- Submodule :: `git submodule add git@github.com/user/external`
|
18
|
+
- Subtree :: `git subtree --squash --prefix=external git@github.com/user/external`
|
19
|
+
- Subrepo :: `git subrepo clone git@github.com/user/external`
|
20
|
+
|
21
|
+
/…to be completed…/
|
22
|
+
|
23
|
+
= Updating from a changed External
|
24
|
+
|
25
|
+
= Pushing External changes upstream
|
26
|
+
|
27
|
+
= Moving/Renaming an External
|
28
|
+
|
29
|
+
= Making an External on a branch
|
30
|
+
|
31
|
+
= Changing the tracking branch of an External
|
32
|
+
|
33
|
+
= Removing an External
|
34
|
+
|
35
|
+
= Migration from One to the Other
|
@@ -0,0 +1,608 @@
|
|
1
|
+
git-subrepo
|
2
|
+
===========
|
3
|
+
|
4
|
+
Git Submodule Alternative
|
5
|
+
|
6
|
+
<badge travis ingydotnet/git-subrepo>
|
7
|
+
|
8
|
+
= Synopsis
|
9
|
+
|
10
|
+
git subrepo -h # Help Overview
|
11
|
+
|
12
|
+
git subrepo clone <remote-url> [<subdir>]
|
13
|
+
git subrepo init <subdir>
|
14
|
+
git subrepo pull <subdir>
|
15
|
+
git subrepo push <subdir>
|
16
|
+
|
17
|
+
git subrepo fetch <subdir>
|
18
|
+
git subrepo branch <subdir>
|
19
|
+
git subrepo commit <subdir>
|
20
|
+
git subrepo config <subdir>
|
21
|
+
|
22
|
+
git subrepo status [<subdir>]
|
23
|
+
git subrepo clean <subdir>
|
24
|
+
|
25
|
+
git subrepo help [<command> | --all]
|
26
|
+
git subrepo version
|
27
|
+
git subrepo upgrade
|
28
|
+
|
29
|
+
= Description
|
30
|
+
|
31
|
+
This git command "clones" an external git repo into a subdirectory of your
|
32
|
+
repo. Later on, upstream changes can be pulled in, and local changes can be
|
33
|
+
pushed back. Simple.
|
34
|
+
|
35
|
+
= Benefits
|
36
|
+
|
37
|
+
This command is an improvement from `git-submodule` and `git-subtree`; two
|
38
|
+
other git commands with similar goals, but various problems.
|
39
|
+
|
40
|
+
It assumes there are 3 main roles of people interacting with a repo, and
|
41
|
+
attempts to serve them all well:
|
42
|
+
|
43
|
+
* *owner* - The person who authors\/owns\/maintains a repo.
|
44
|
+
* *users* - People who are just using/installing the repo.
|
45
|
+
* *collaborators* - People who commit code to the repo and subrepos.
|
46
|
+
|
47
|
+
The `git-subrepo` command benefits these roles in the following ways:
|
48
|
+
|
49
|
+
* Simple and intuitive commandline usage (with tab completion).
|
50
|
+
* Users get your repo and all your subrepos just by cloning your repo.
|
51
|
+
* Users do not need to install `git-subrepo`, ever.
|
52
|
+
* Collaborators do not need to install unless they want to push/pull.
|
53
|
+
* Collaborators know when a subdir is a subrepo (it has a `.gitrepo` file).
|
54
|
+
* The `.gitrepo` file never gets pushed back to the subrepo upstream.
|
55
|
+
* Well named branches and remotes are generated for manual operations.
|
56
|
+
* Owners do not deal with the complications of keeping submodules in sync.
|
57
|
+
* Subrepo repositories can contain subrepos themselves.
|
58
|
+
* Branching with subrepos JustWorks™.
|
59
|
+
* Different branches can have different subrepos in different states, etc.
|
60
|
+
* Moving\/renaming\/deleting a subrepo subdir JustWorks™.
|
61
|
+
* You can `init` an existing subdirectory into a subrepo.
|
62
|
+
* Your git history is kept squeaky clean.
|
63
|
+
* Upstream history (clone/pull) is condensed into a single commit.
|
64
|
+
* Pulls can use a `merge`, `rebase` or `force` strategies.
|
65
|
+
* You can see the subrepo history with `git log subrepo/<subdir>/fetch`.
|
66
|
+
* Commits pushed back upstream are *not* condensed (by default).
|
67
|
+
* Trivial to try any subrepo operations and then reset back.
|
68
|
+
* No configuration required.
|
69
|
+
* Does not introduce history that messes up other git commands.
|
70
|
+
* Fixes known rebase failures with `git-subtree`.
|
71
|
+
|
72
|
+
= Installation
|
73
|
+
|
74
|
+
The best short answer is:
|
75
|
+
|
76
|
+
git clone https://github.com/ingydotnet/git-subrepo /path/to/git-subrepo
|
77
|
+
echo 'source /path/to/git-subrepo/.rc' >> ~/.bashrc
|
78
|
+
|
79
|
+
The complete "Installation Instructions" can be found below.
|
80
|
+
|
81
|
+
Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
|
82
|
+
|
83
|
+
= Commands
|
84
|
+
|
85
|
+
All the *subrepo* commands use names of actual Git commands and try to do
|
86
|
+
operations that are similar to their Git counterparts. They also attempt to
|
87
|
+
give similar output in an attempt to make the subrepo usage intuitive to
|
88
|
+
experienced Git users.
|
89
|
+
|
90
|
+
Please note that the commands are /not/ exact equivalents, and do not take all
|
91
|
+
the same arguments. Keep reading…
|
92
|
+
|
93
|
+
- `git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]`
|
94
|
+
|
95
|
+
Add a repository as a subrepo in a subdir of your repository.
|
96
|
+
|
97
|
+
This is similar in feel to `git clone`. You just specify the remote repo
|
98
|
+
url, and optionally a sub-directory and/or branch name. The repo will be
|
99
|
+
fetched and merged into the subdir.
|
100
|
+
|
101
|
+
The subrepo history is /squashed/ into a single commit that contains the
|
102
|
+
reference information. This information is also stored in a special file
|
103
|
+
called `<subdir>/.gitrepo`. The presence of this file indicates that the
|
104
|
+
directory is a subrepo.
|
105
|
+
|
106
|
+
All subsequent commands refer to the subrepo by the name of the /subdir/.
|
107
|
+
From the subdir, all the current information about the subrepo can be
|
108
|
+
obtained.
|
109
|
+
|
110
|
+
The `--force` option will "reclone" (completely replace) an existing subdir.
|
111
|
+
|
112
|
+
The `--method` option will decide how the join process between branches are
|
113
|
+
performed. The default option is merge.
|
114
|
+
|
115
|
+
The `clone` command accepts the `--branch=` `--edit`, `--force` and
|
116
|
+
`--message=` options.
|
117
|
+
|
118
|
+
- `git subrepo init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>]`
|
119
|
+
|
120
|
+
Turn an existing subdirectory into a subrepo.
|
121
|
+
|
122
|
+
If you want to expose a subdirectory of your project as a published subrepo,
|
123
|
+
this command will do that. It will split out the content of a normal
|
124
|
+
subdirectory into a branch and start tracking it as a subrepo. Afterwards
|
125
|
+
your original repo will look exactly the same except that there will be a
|
126
|
+
`<subdir>/.gitrepo` file.
|
127
|
+
|
128
|
+
If you specify the `--remote` (and optionally the `--branch`) option, the
|
129
|
+
values will be added to the `<subdir>/.gitrepo` file. The `--remote` option
|
130
|
+
is the upstream URL, and the `--branch` option is the upstream branch to push
|
131
|
+
to. These values will be needed to do a `git subrepo push` command, but they
|
132
|
+
can be provided later on the `push` command (and saved to `<subdir>/.gitrepo`
|
133
|
+
if you also specify the `--update` option).
|
134
|
+
|
135
|
+
Note: You will need to create the empty upstream repo and push to it on your
|
136
|
+
own, using `git subrepo push <subdir>`.
|
137
|
+
|
138
|
+
The `--method` option will decide how the join process between branches
|
139
|
+
are performed. The default option is merge.
|
140
|
+
|
141
|
+
The `init` command accepts the `--branch=` and `--remote=` options.
|
142
|
+
|
143
|
+
- `git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]`
|
144
|
+
|
145
|
+
Update the subrepo subdir with the latest upstream changes.
|
146
|
+
|
147
|
+
The `pull` command fetches the latest content from the remote branch pointed
|
148
|
+
to by the subrepo's `.gitrepo` file, and then tries to merge the changes into
|
149
|
+
the corresponding subdir. It does this by making a branch of the local
|
150
|
+
commits to the subdir and then merging or rebasing (see below) it with the
|
151
|
+
fetched upstream content. After the merge, the content of the new branch
|
152
|
+
replaces your subdir, the `.gitrepo` file is updated and a single 'pull'
|
153
|
+
commit is added to your mainline history.
|
154
|
+
|
155
|
+
The `pull` command will attempt to do the following commands in one go:
|
156
|
+
|
157
|
+
git subrepo fetch <subdir>
|
158
|
+
git subrepo branch <subdir>
|
159
|
+
git merge/rebase subrepo/<subdir>/fetch subrepo/<subdir>
|
160
|
+
git subrepo commit <subdir>
|
161
|
+
# Only needed for a consequential push:
|
162
|
+
git update-ref refs/subrepo/<subdir>/pull subrepo/<subdir>
|
163
|
+
|
164
|
+
In other words, you could do all the above commands yourself, for the same
|
165
|
+
effect. If any of the commands fail, subrepo will stop and tell you to finish
|
166
|
+
this by hand. Generally a failure would be in the merge or rebase part, where
|
167
|
+
conflicts can happen. Since Git has lots of ways to resolve conflicts to your
|
168
|
+
personal tastes, the subrepo command defers to letting you do this by hand.
|
169
|
+
|
170
|
+
When pulling new data, the method selected in clone/init is used. This has
|
171
|
+
no effect on the final result of the pull, since it becomes a single commit.
|
172
|
+
But it does affect the resulting `subrepo/<subdir>` branch, which is often
|
173
|
+
used for a subrepo `push` command. See 'push' below for more information.
|
174
|
+
If you want to change the method you can use the `config` command for this.
|
175
|
+
|
176
|
+
When you pull you can assume a fast-forward strategy (default) or you can
|
177
|
+
specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
|
178
|
+
as a `clone --force` operation, using the current remote and branch.
|
179
|
+
|
180
|
+
Like the `clone` command, `pull` will squash all the changes (since the last
|
181
|
+
pull or clone) into one commit. This keeps your mainline history nice and
|
182
|
+
clean. You can easily see the subrepo's history with the `git log` command:
|
183
|
+
|
184
|
+
git log refs/subrepo/<subdir>/fetch
|
185
|
+
|
186
|
+
The set of commands used above are described in detail below.
|
187
|
+
|
188
|
+
The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--force`,
|
189
|
+
`--message=`, `--remote=` and `--update` options.
|
190
|
+
|
191
|
+
- `git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]`
|
192
|
+
|
193
|
+
Push a properly merged subrepo branch back upstream.
|
194
|
+
|
195
|
+
This command takes the subrepo branch from a successful pull command and
|
196
|
+
pushes the history back to its designated remote and branch. You can also use
|
197
|
+
the `branch` command and merge things yourself before pushing if you want to
|
198
|
+
(although that is probably a rare use case).
|
199
|
+
|
200
|
+
The `push` command requires a branch that has been properly merged/rebased
|
201
|
+
with the upstream HEAD (unless the upstream HEAD is empty, which is common
|
202
|
+
when doing a first `push` after an `init`). That means the upstream HEAD is
|
203
|
+
one of the commits in the branch.
|
204
|
+
|
205
|
+
By default the branch ref `refs/subrepo/<subdir>/pull` will be pushed, but
|
206
|
+
you can specify a (properly merged) branch to push.
|
207
|
+
|
208
|
+
After that, the `push` command just checks that the branch contains the
|
209
|
+
upstream HEAD and then pushes it upstream.
|
210
|
+
|
211
|
+
The `--force` option will do a force push. Force pushes are typically
|
212
|
+
discouraged. Only use this option if you fully understand it. (The `--force`
|
213
|
+
option will NOT check for a proper merge. ANY branch will be force pushed!)
|
214
|
+
|
215
|
+
The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--force`,
|
216
|
+
`--merge`, `--rebase`, `--remote=`, `--squash` and `--update` options.
|
217
|
+
|
218
|
+
- `git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]`
|
219
|
+
|
220
|
+
Fetch the remote/upstream content for a subrepo.
|
221
|
+
|
222
|
+
It will create a Git reference called `subrepo/<subdir>/fetch` that points at
|
223
|
+
the same commit as `FETCH_HEAD`. It will also create a remote called
|
224
|
+
`subrepo/<subdir>`. These are temporary and you can easily remove them with
|
225
|
+
the subrepo `clean` command.
|
226
|
+
|
227
|
+
The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
|
228
|
+
|
229
|
+
- `git subrepo branch <subdir>|--all [-f] [-F]`
|
230
|
+
|
231
|
+
Create a branch with local subrepo commits.
|
232
|
+
|
233
|
+
Scan the history of the mainline for all the commits that affect the `subdir`
|
234
|
+
and create a new branch from them called `subrepo/<subdir>`.
|
235
|
+
|
236
|
+
This is useful for doing `pull` and `push` commands by hand.
|
237
|
+
|
238
|
+
Use the `--force` option to write over an existing `subrepo/<subdir>` branch.
|
239
|
+
|
240
|
+
The `branch` command accepts the `--all`, `--fetch` and `--force` options.
|
241
|
+
|
242
|
+
- `git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]`
|
243
|
+
|
244
|
+
Add subrepo branch to current history as a single commit.
|
245
|
+
|
246
|
+
This command is generally used after a hand-merge. You have done a `subrepo
|
247
|
+
branch` and merged (rebased) it with the upstream. This command takes the
|
248
|
+
HEAD of that branch, puts its content into the subrepo subdir and adds a new
|
249
|
+
commit for it to the top of your mainline history.
|
250
|
+
|
251
|
+
This command requires that the upstream HEAD be in the `subrepo/<subdir>`
|
252
|
+
branch history. That way the same branch can push upstream. Use the
|
253
|
+
`--force` option to commit anyway.
|
254
|
+
|
255
|
+
The `commit` command accepts the `--edit`, `--fetch`, `--force` and
|
256
|
+
`--message=` options.
|
257
|
+
|
258
|
+
- `git subrepo status [<subdir>|--all|--ALL] [-F] [-q|-v]`
|
259
|
+
|
260
|
+
Get the status of a subrepo. Uses the `--all` option by default. If the
|
261
|
+
`--quiet` flag is used, just print the subrepo names, one per line.
|
262
|
+
|
263
|
+
The `--verbose` option will show all the recent local and upstream commits.
|
264
|
+
|
265
|
+
Use `--ALL` to show the subrepos of the subrepos (ie the "subsubrepos"), if
|
266
|
+
any.
|
267
|
+
|
268
|
+
The `status` command accepts the `--all`, `--ALL`, `--fetch`, `--quiet` and
|
269
|
+
`--verbose` options.
|
270
|
+
|
271
|
+
- `git subrepo clean <subdir>|--all|--ALL [-f]`
|
272
|
+
|
273
|
+
Remove artifacts created by `fetch` and `branch` commands.
|
274
|
+
|
275
|
+
The `fetch` and `branch` operations (and other commands that call them)
|
276
|
+
create temporary things like refs, branches and remotes. This command
|
277
|
+
removes all those things.
|
278
|
+
|
279
|
+
Use `--force` to remove refs. Refs are not removed by default because they
|
280
|
+
are sometimes needed between commands.
|
281
|
+
|
282
|
+
Use `--all` to clean up after all the current subrepos. Sometimes you might
|
283
|
+
change to a branch where a subrepo doesn't exist, and then `--all` won't find
|
284
|
+
it. Use `--ALL` to remove any artifacts that were ever created by subrepo.
|
285
|
+
|
286
|
+
To remove ALL subrepo artifacts:
|
287
|
+
|
288
|
+
git subrepo clean --ALL --force
|
289
|
+
|
290
|
+
The `clean` command accepts the `--all`, `--ALL`, and `--force` options.
|
291
|
+
|
292
|
+
- `git subrepo config <subdir> <option> [<value>] [-f]`
|
293
|
+
|
294
|
+
Read or update configuration values in the subdir/.gitrepo file.
|
295
|
+
|
296
|
+
Because most of the values stored in the .gitrepo file are generated you
|
297
|
+
will need to use `--force` if you want to change anything else then the
|
298
|
+
`method` option.
|
299
|
+
|
300
|
+
Example to update the `method` option for a subrepo:
|
301
|
+
|
302
|
+
git subrepo config foo method rebase
|
303
|
+
|
304
|
+
- `git subrepo help [<command>|--all]`
|
305
|
+
|
306
|
+
Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
|
307
|
+
use `git subrepo -h`.
|
308
|
+
|
309
|
+
Use `git subrepo help <command>` to get help for a specific command. Use
|
310
|
+
`--all` to get a summary of all commands.
|
311
|
+
|
312
|
+
The `help` command accepts the `--all` option.
|
313
|
+
|
314
|
+
- `git subrepo version [-q|-v]`
|
315
|
+
|
316
|
+
This command will display version information about git-subrepo and its
|
317
|
+
environment. For just the version number, use `git subrepo --version`. Use
|
318
|
+
`--verbose` for more version info, and `--quiet` for less.
|
319
|
+
|
320
|
+
The `version` command accepts the `--quiet` and `--verbose` options.
|
321
|
+
|
322
|
+
- `git subrepo upgrade`
|
323
|
+
|
324
|
+
Upgrade the `git-subrepo` software itself. This simply does a `git pull` on
|
325
|
+
the git repository that the code is running from. It only works if you are on
|
326
|
+
the `master` branch. It won't work if you installed `git-subrepo` using `make
|
327
|
+
install`; in that case you'll need to `make install` from the latest code.
|
328
|
+
|
329
|
+
= Command Options
|
330
|
+
|
331
|
+
- `-h`
|
332
|
+
|
333
|
+
Show a brief view of the commands and options.
|
334
|
+
|
335
|
+
- `--help`
|
336
|
+
|
337
|
+
Gives an overview of the help options available for the subrepo command.
|
338
|
+
|
339
|
+
- `--version`
|
340
|
+
|
341
|
+
Print the git-subrepo version. Just the version number. Try the `version`
|
342
|
+
command for more version info.
|
343
|
+
|
344
|
+
- `--all` (`-a`)
|
345
|
+
|
346
|
+
If you have multiple subrepos, issue the command to all of them (if
|
347
|
+
applicable).
|
348
|
+
|
349
|
+
- `--ALL` (`-A`)
|
350
|
+
|
351
|
+
If you have subrepos that also have subrepos themselves, issue the command to
|
352
|
+
ALL of them. Note that the `--ALL` option only works for a subset of the
|
353
|
+
commands that `--all` works for.
|
354
|
+
|
355
|
+
- `--branch=<branch-name>` (`-b <branch-name>`)
|
356
|
+
|
357
|
+
Use a different upstream branch-name than the remote HEAD or the one saved in
|
358
|
+
`.gitrepo` locally.
|
359
|
+
|
360
|
+
- `--dry-run` (`-N`)
|
361
|
+
|
362
|
+
For the push command, do everything up until the push and then print out the
|
363
|
+
actual `git push` command needed to finish the operation.
|
364
|
+
|
365
|
+
- `--edit` (`-e`)
|
366
|
+
|
367
|
+
Edit the commit message before committing.
|
368
|
+
|
369
|
+
- `--fetch` (`-F`)
|
370
|
+
|
371
|
+
Use this option to fetch the upstream commits, before running the command.
|
372
|
+
|
373
|
+
- `--force` (`-f`)
|
374
|
+
|
375
|
+
Use this option to force certain commands that fail in the general case.
|
376
|
+
|
377
|
+
NOTE: The `--force` option means different things for different commands.
|
378
|
+
Read the command specific doc for the exact meaning.
|
379
|
+
|
380
|
+
- `--merge` (`-M`)
|
381
|
+
|
382
|
+
Use a `merge` strategy to include upstream subrepo commits on a pull (or
|
383
|
+
setup for push).
|
384
|
+
|
385
|
+
- `--message=<message>` (`-m <message>`)
|
386
|
+
|
387
|
+
Specify your own commit message on the command line.
|
388
|
+
|
389
|
+
- `--rebase` (`-R`)
|
390
|
+
|
391
|
+
Use a `rebase` strategy to include upstream subrepo commits on a pull (or
|
392
|
+
setup for push).
|
393
|
+
|
394
|
+
- `--remote=<remote-url>` (`-r <remote-url>`)
|
395
|
+
|
396
|
+
Use a different remote-url than the one saved in `.gitrepo` locally.
|
397
|
+
|
398
|
+
- `--squash` (`-s`)
|
399
|
+
|
400
|
+
Squash all commits on a push into one new commit.
|
401
|
+
|
402
|
+
- `--update` (`-u`)
|
403
|
+
|
404
|
+
If `--branch` or `--remote` are used, and the command updates the `.gitrepo`
|
405
|
+
file, include these values to the update.
|
406
|
+
|
407
|
+
= Output Options
|
408
|
+
|
409
|
+
- `--quiet` (`-q`)
|
410
|
+
|
411
|
+
Print as little info as possible. Applicable to most commands.
|
412
|
+
|
413
|
+
- `--verbose` (`-v`)
|
414
|
+
|
415
|
+
Print more information about the command execution and results. Applicable
|
416
|
+
to most commands.
|
417
|
+
|
418
|
+
- `--debug` (`-d`)
|
419
|
+
|
420
|
+
Show the actual git (and other) commands being executed under the hood.
|
421
|
+
Applicable to most commands.
|
422
|
+
|
423
|
+
- `--DEBUG` (`-x`)
|
424
|
+
|
425
|
+
Use the Bash `set -x` option which prints every command before it is run.
|
426
|
+
VERY noisy, but extremely useful in deep debugging. Applicable to all
|
427
|
+
commands.
|
428
|
+
|
429
|
+
= Environment Variables
|
430
|
+
|
431
|
+
The `git-subrepo` command exports and honors some environment variables:
|
432
|
+
|
433
|
+
- `GIT_SUBREPO_ROOT`
|
434
|
+
|
435
|
+
This is set by the `.rc` file, if you use that method to install / enable
|
436
|
+
`git-subrepo`. It contains the path of the `git-subrepo` repository.
|
437
|
+
|
438
|
+
- `GIT_SUBREPO_RUNNING`
|
439
|
+
|
440
|
+
This variable is exported when `git-subrepo` is running. It is set to the pid
|
441
|
+
of the `git-subrepo` process that is running. Other processes, like git hooks
|
442
|
+
for instance, can use this information to adjust accordingly.
|
443
|
+
|
444
|
+
- `GIT_SUBREPO_COMMAND`
|
445
|
+
|
446
|
+
This variable is exported when `git-subrepo` is running. It is set to the
|
447
|
+
name of the `git-subrepo` subcommand that is running.
|
448
|
+
|
449
|
+
- `GIT_SUBREPO_PAGER`
|
450
|
+
|
451
|
+
Use this to specify the pager to use for long output commands. Defaults to
|
452
|
+
`$PAGER` or `less`.
|
453
|
+
|
454
|
+
- `GIT_SUBREPO_QUIET`
|
455
|
+
|
456
|
+
Set this for quiet (`-q`) output.
|
457
|
+
|
458
|
+
- `GIT_SUBREPO_VERBOSE`
|
459
|
+
|
460
|
+
Set this for verbose (`-v`) output.
|
461
|
+
|
462
|
+
- `GIT_SUBREPO_DEBUG`
|
463
|
+
|
464
|
+
Set this for debugging (`-d`) output.
|
465
|
+
|
466
|
+
= Installation Instructions
|
467
|
+
|
468
|
+
There are currently 3 ways to install `git-subrepo`. For all of them you need
|
469
|
+
to get the source code from GitHub:
|
470
|
+
|
471
|
+
git clone https://github.com/ingydotnet/git-subrepo /path/to/git-subrepo
|
472
|
+
|
473
|
+
The first installation method is preferred: `source` the `.rc` file. Just add a
|
474
|
+
line like this one to your shell startup script:
|
475
|
+
|
476
|
+
source /path/to/git-subrepo/.rc
|
477
|
+
|
478
|
+
That will modify your `PATH` and `MANPATH`, and also enable command completion.
|
479
|
+
|
480
|
+
The second method is to do these things by hand. This might afford you more
|
481
|
+
control of your shell environment. Simply add the `lib` and `man` directories
|
482
|
+
to your `PATH` and `MANPATH`:
|
483
|
+
|
484
|
+
export GIT_SUBREPO_ROOT="/path/to/git-subrepo"
|
485
|
+
export PATH="/path/to/git-subrepo/lib:$PATH"
|
486
|
+
export MANPATH="/path/to/git-subrepo/man:$MANPATH"
|
487
|
+
|
488
|
+
See below for info on how to turn on Command Completion.
|
489
|
+
|
490
|
+
The third method is a standard system install, which puts `git-subrepo` next to
|
491
|
+
your other git commands:
|
492
|
+
|
493
|
+
make install # Possibly with 'sudo'
|
494
|
+
|
495
|
+
This method does not account for upgrading and command completion yet.
|
496
|
+
|
497
|
+
== Windows
|
498
|
+
|
499
|
+
This command is known to work in these Windows environments:
|
500
|
+
|
501
|
+
* Git for Windows -- https://git-for-windows.github.io/
|
502
|
+
* Babun -- http://babun.github.io/
|
503
|
+
* Cygwin -- https://www.cygwin.com/
|
504
|
+
|
505
|
+
Let us know if there are others that it works (or doesn't work) in.
|
506
|
+
|
507
|
+
= Testing
|
508
|
+
|
509
|
+
The `git-subrepo` repository comes with a extensive test suite. You can run it
|
510
|
+
with:
|
511
|
+
|
512
|
+
make test
|
513
|
+
|
514
|
+
or if you don't have `make` on your system:
|
515
|
+
|
516
|
+
prove -v test
|
517
|
+
|
518
|
+
= Upgrading
|
519
|
+
|
520
|
+
If you used the `.rc` or `PATH` method of installation, just run this to
|
521
|
+
upgrade `git-subrepo`:
|
522
|
+
|
523
|
+
git subrepo upgrade
|
524
|
+
|
525
|
+
Or (same thing):
|
526
|
+
|
527
|
+
cd /path/to/git-subrepo
|
528
|
+
git pull
|
529
|
+
|
530
|
+
If you used `make install` method, then run this again (after `git pull`):
|
531
|
+
|
532
|
+
make install # Possibly with 'sudo'
|
533
|
+
|
534
|
+
= Command Completion
|
535
|
+
|
536
|
+
The `git subrepo` command supports `<TAB>`-based command completion. If you
|
537
|
+
don't use the `.rc` script (see Installation, above), you'll need to enable
|
538
|
+
this manually to use it.
|
539
|
+
|
540
|
+
== In Bash
|
541
|
+
|
542
|
+
If your Bash setup does not already provide command completion for Git, you'll
|
543
|
+
need to enable that first:
|
544
|
+
|
545
|
+
source <Git completion script>
|
546
|
+
|
547
|
+
On your system, the Git completion script might be found at any of the
|
548
|
+
following locations (or somewhere else that we don't know about):
|
549
|
+
|
550
|
+
* `/etc/bash_completion.d/git`
|
551
|
+
* `/usr/share/bash-completion/git`
|
552
|
+
* `/usr/share/bash-completion/completions/git`
|
553
|
+
* `/opt/local/share/bash-completion/completions/git`
|
554
|
+
* `/usr/local/etc/bash_completion.d/git`
|
555
|
+
* `~/.homebrew/etc/bash_completion.d/git`
|
556
|
+
|
557
|
+
In case you can't find any of these, this repository contains a copy of the
|
558
|
+
Git completion script:
|
559
|
+
|
560
|
+
source /path/to/git-subrepo/share/git-completion.bash
|
561
|
+
|
562
|
+
Once Git completion is enabled (whether you needed to do that manually or
|
563
|
+
not), you can turn on `git-subrepo` completion with a command like this:
|
564
|
+
|
565
|
+
source /path/to/git-subrepo/share/completion.bash
|
566
|
+
|
567
|
+
== In zsh
|
568
|
+
|
569
|
+
In the Z shell (zsh), you can manually enable `git-subrepo` completion by
|
570
|
+
adding the following line to your `~/.zshrc`, *before* the `compinit` function
|
571
|
+
is called:
|
572
|
+
|
573
|
+
fpath=('/path/to/git-subrepo/share/zsh-completion' $fpath)
|
574
|
+
|
575
|
+
= Status
|
576
|
+
|
577
|
+
The git-subrepo command has been in use for well over a year and seems to get
|
578
|
+
the job done. Development is still ongoing but mostly just for fixing bugs.
|
579
|
+
|
580
|
+
Trying subrepo out is simple and painless (this is not `git submodule`).
|
581
|
+
Nothing is permanent (if you do not push to shared remotes). ie You can always
|
582
|
+
play around and reset back to the beginning without pain.
|
583
|
+
|
584
|
+
This command has a test suite (run `make test`), but surely has many bugs. If
|
585
|
+
you have expertise with Git and subcommands, please review the code, and file
|
586
|
+
issues on anything that seems wrong.
|
587
|
+
|
588
|
+
If you want to chat about the `git-subrepo` command, join `#gitcommands` on
|
589
|
+
`irc.freenode.net`.
|
590
|
+
|
591
|
+
= Notes
|
592
|
+
|
593
|
+
* Works on POSIX systems: Linux, BSD, OSX, etc.
|
594
|
+
* Works on various Windows environments. See "Windows" section above.
|
595
|
+
* The `git-subrepo` repo itself has 2 subrepos under the `ext/` subdirectory.
|
596
|
+
* Written in (very modern) Bash, with full test suite. Take a look.
|
597
|
+
* A `.gitrepo` file never is in the top level dir (next to a `.git/` dir).
|
598
|
+
|
599
|
+
= Authors
|
600
|
+
|
601
|
+
* Ingy döt Net <ingy@ingy.net>
|
602
|
+
* Magnus Carlsson <grimmymail@gmail.com>
|
603
|
+
|
604
|
+
= License and Copyright
|
605
|
+
|
606
|
+
The MIT License (MIT)
|
607
|
+
|
608
|
+
Copyright (c) 2013-2020 Ingy döt Net
|