avm-tools 0.47.0 → 0.52.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (379) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +8 -0
  3. data/lib/avm/data/package/dump.rb +1 -1
  4. data/lib/avm/git/auto_commit_path.rb +49 -0
  5. data/lib/avm/git/issue/complete.rb +1 -1
  6. data/lib/avm/git/issue/complete/_test.rb +17 -3
  7. data/lib/avm/git/issue/complete/_validations.rb +9 -14
  8. data/lib/avm/git/issue/complete/validation.rb +31 -0
  9. data/lib/avm/git/revision_test.rb +2 -2
  10. data/lib/avm/instances/configuration/_rubocop.rb +1 -1
  11. data/lib/avm/instances/configuration/_tests.rb +14 -0
  12. data/lib/avm/rails.rb +9 -0
  13. data/lib/avm/rails/runners.rb +11 -0
  14. data/lib/avm/rails/runners/bundle.rb +35 -0
  15. data/lib/avm/rails/runners/runner.rb +48 -0
  16. data/lib/avm/ruby.rb +0 -20
  17. data/lib/avm/ruby/gems.rb +11 -0
  18. data/lib/avm/ruby/gems/generator.rb +168 -0
  19. data/lib/avm/ruby/rubocop/_gemfile.rb +1 -1
  20. data/lib/avm/stereotypes/eac_redmine_base0/deploy.rb +2 -2
  21. data/lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb +1 -1
  22. data/lib/avm/tools/runner/eac_rails_base0/bundle.rb +14 -0
  23. data/lib/avm/tools/runner/eac_rails_base0/runner.rb +14 -0
  24. data/lib/avm/tools/runner/eac_redmine_base0/bundle.rb +2 -24
  25. data/lib/avm/tools/runner/eac_redmine_base0/runner.rb +2 -31
  26. data/lib/avm/tools/runner/files/format.rb +1 -1
  27. data/lib/avm/tools/runner/git.rb +1 -1
  28. data/lib/avm/tools/runner/git/auto_commit.rb +56 -0
  29. data/lib/avm/tools/runner/git/deploy.rb +2 -2
  30. data/lib/avm/tools/runner/ruby/gems.rb +22 -0
  31. data/lib/avm/tools/runner/ruby/gems/generate.rb +50 -0
  32. data/lib/avm/tools/version.rb +1 -1
  33. data/lib/eac_launcher/git/base.rb +11 -5
  34. data/lib/eac_launcher/git/base/class_methods.rb +26 -0
  35. data/lib/eac_launcher/git/base/dirty_files.rb +30 -0
  36. data/lib/eac_launcher/git/base/remotes.rb +38 -0
  37. data/lib/eac_launcher/git/base/underlying.rb +10 -0
  38. data/template/avm/ruby/gems/generator/gemspec.template +18 -0
  39. data/template/avm/ruby/gems/generator/root_lib.template +7 -0
  40. data/template/avm/ruby/gems/generator/static/Gemfile +5 -0
  41. data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb +7 -0
  42. data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb +100 -0
  43. data/template/avm/ruby/gems/generator/version.template +5 -0
  44. data/vendor/gems/eac_ruby_utils/Gemfile +16 -0
  45. data/vendor/gems/eac_ruby_utils/MIT-LICENCE +16 -0
  46. data/vendor/gems/eac_ruby_utils/README.rdoc +3 -0
  47. data/vendor/gems/eac_ruby_utils/eac_ruby_utils.gemspec +24 -0
  48. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils.rb +6 -0
  49. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/arguments_consumer.rb +81 -0
  50. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/by_reference.rb +23 -0
  51. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb +68 -0
  52. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb +133 -0
  53. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/configs.rb +74 -0
  54. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb +66 -0
  55. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console.rb +5 -0
  56. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb +135 -0
  57. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb +39 -0
  58. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb +18 -0
  59. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_doc.rb +25 -0
  60. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_settings.rb +19 -0
  61. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb +139 -0
  62. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker.rb +133 -0
  63. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_class_methods.rb +39 -0
  64. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_constants.rb +14 -0
  65. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/list.rb +63 -0
  66. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/node.rb +26 -0
  67. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/contextualizable.rb +16 -0
  68. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/core_ext.rb +5 -0
  69. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/custom_format.rb +53 -0
  70. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs.rb +23 -0
  71. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/base_env.rb +28 -0
  72. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb +168 -0
  73. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb +46 -0
  74. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb +51 -0
  75. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/file.rb +22 -0
  76. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/local_env.rb +17 -0
  77. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/process.rb +19 -0
  78. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/spawn.rb +32 -0
  79. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env.rb +72 -0
  80. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb +53 -0
  81. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs.rb +9 -0
  82. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/extname.rb +30 -0
  83. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb +52 -0
  84. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/directory.rb +16 -0
  85. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/file.rb +34 -0
  86. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/traversable.rb +47 -0
  87. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb +74 -0
  88. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs_cache.rb +11 -0
  89. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable.rb +17 -0
  90. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/class_methods.rb +14 -0
  91. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/instance_methods.rb +30 -0
  92. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/integer_list.rb +23 -0
  93. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb +93 -0
  94. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/lists.rb +59 -0
  95. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/string_list.rb +19 -0
  96. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/symbol_list.rb +19 -0
  97. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb +38 -0
  98. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/on_clean_ruby_environment.rb +12 -0
  99. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/options_consumer.rb +62 -0
  100. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patch.rb +11 -0
  101. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches.rb +4 -0
  102. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/class.rb +4 -0
  103. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/class/common_constructor.rb +9 -0
  104. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable.rb +4 -0
  105. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable/boolean_combinations.rb +45 -0
  106. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash.rb +5 -0
  107. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/options_consumer.rb +10 -0
  108. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/sym_keys_hash.rb +10 -0
  109. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module.rb +4 -0
  110. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/common_concern.rb +10 -0
  111. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/console_speaker.rb +10 -0
  112. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/listable.rb +10 -0
  113. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb +9 -0
  114. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb +9 -0
  115. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb +10 -0
  116. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb +5 -0
  117. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb +14 -0
  118. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb +19 -0
  119. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb +16 -0
  120. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb +15 -0
  121. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb +4 -0
  122. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb +9 -0
  123. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb +4 -0
  124. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb +16 -0
  125. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb +4 -0
  126. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb +5 -0
  127. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time/local_time_zone.rb +25 -0
  128. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb +93 -0
  129. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb +54 -0
  130. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb +9 -0
  131. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb +38 -0
  132. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec/stubbed_ssh.rb +44 -0
  133. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb +9 -0
  134. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb +31 -0
  135. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb +26 -0
  136. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb +65 -0
  137. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +42 -0
  138. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates.rb +9 -0
  139. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/directory.rb +110 -0
  140. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/file.rb +50 -0
  141. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/searcher.rb +55 -0
  142. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_not_found_error.rb +7 -0
  143. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers.rb +25 -0
  144. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/base.rb +23 -0
  145. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/entries_reader.rb +25 -0
  146. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/generic.rb +25 -0
  147. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/hash.rb +29 -0
  148. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/version.rb +5 -0
  149. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb +96 -0
  150. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/arguments_consumer_spec.rb +17 -0
  151. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb +42 -0
  152. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb +37 -0
  153. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/configs_spec.rb +31 -0
  154. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/configs_spec.rb +14 -0
  155. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/docopt_runner_spec.rb +136 -0
  156. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/speaker_spec.rb +36 -0
  157. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/custom_format_spec.rb +60 -0
  158. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/executable_spec.rb +37 -0
  159. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/ssh_env_spec.rb +25 -0
  160. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb +32 -0
  161. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb +18 -0
  162. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp/temp_spec.rb +12 -0
  163. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp_spec.rb +52 -0
  164. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb +212 -0
  165. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb +45 -0
  166. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerable/boolean_combinations_spec.rb +39 -0
  167. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/options_consumer_spec.rb +17 -0
  168. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/sym_keys_hash_spec.rb +13 -0
  169. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/console_speaker_spec.rb +13 -0
  170. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/listable_spec.rb +13 -0
  171. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/simple_cache_spec.rb +13 -0
  172. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/if_present_spec.rb +13 -0
  173. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec.rb +23 -0
  174. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec_files/path/my_stub_with_template +1 -0
  175. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/basename_sub_spec.rb +17 -0
  176. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/paths_hash_spec.rb +49 -0
  177. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec.rb +19 -0
  178. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_module_a.rb +6 -0
  179. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_not_module.rb +6 -0
  180. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb +22 -0
  181. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb +46 -0
  182. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +102 -0
  183. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec.rb +35 -0
  184. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/expected_content +2 -0
  185. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/source.template +2 -0
  186. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec.rb +30 -0
  187. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file1.template +1 -0
  188. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file2 +1 -0
  189. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path2/subdir1/file3.template +1 -0
  190. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/yaml_spec.rb +75 -0
  191. data/vendor/gems/eac_ruby_utils/spec/locales/pt-BR.yml +55 -0
  192. data/vendor/gems/eac_ruby_utils/spec/rubocop_check_spec.rb +7 -0
  193. data/vendor/gems/eac_ruby_utils/spec/spec_helper.rb +12 -0
  194. data/vendor/git-subrepo/Changes +51 -0
  195. data/vendor/git-subrepo/Intro.pod +508 -0
  196. data/vendor/git-subrepo/License +21 -0
  197. data/vendor/git-subrepo/Makefile +80 -0
  198. data/vendor/git-subrepo/Meta +28 -0
  199. data/vendor/git-subrepo/ReadMe.pod +695 -0
  200. data/vendor/git-subrepo/doc/comparison.swim +35 -0
  201. data/vendor/git-subrepo/doc/git-subrepo.swim +611 -0
  202. data/vendor/git-subrepo/doc/intro-to-subrepo.swim +387 -0
  203. data/vendor/git-subrepo/ext/bashplus/Changes +15 -0
  204. data/vendor/git-subrepo/ext/bashplus/License +21 -0
  205. data/vendor/git-subrepo/ext/bashplus/Makefile +45 -0
  206. data/vendor/git-subrepo/ext/bashplus/Meta +28 -0
  207. data/vendor/git-subrepo/ext/bashplus/ReadMe.pod +77 -0
  208. data/vendor/git-subrepo/ext/bashplus/bin/bash+ +43 -0
  209. data/vendor/git-subrepo/ext/bashplus/doc/bash+.swim +61 -0
  210. data/vendor/git-subrepo/ext/bashplus/lib/bash+.bash +92 -0
  211. data/vendor/git-subrepo/ext/bashplus/man/man1/bash+.1 +134 -0
  212. data/vendor/git-subrepo/ext/bashplus/man/man3/bash+.3 +134 -0
  213. data/vendor/git-subrepo/ext/bashplus/test/base.t +12 -0
  214. data/vendor/git-subrepo/ext/bashplus/test/fcopy.t +22 -0
  215. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/bar.bash +3 -0
  216. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/foo.bash +3 -0
  217. data/vendor/git-subrepo/ext/bashplus/test/source-bash+-std.t +18 -0
  218. data/vendor/git-subrepo/ext/bashplus/test/source-bash+.t +23 -0
  219. data/vendor/git-subrepo/ext/bashplus/test/test.bash +70 -0
  220. data/vendor/git-subrepo/ext/bashplus/test/use.t +19 -0
  221. data/vendor/git-subrepo/ext/test-more-bash/Changes +15 -0
  222. data/vendor/git-subrepo/ext/test-more-bash/License +21 -0
  223. data/vendor/git-subrepo/ext/test-more-bash/Makefile +20 -0
  224. data/vendor/git-subrepo/ext/test-more-bash/Meta +30 -0
  225. data/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod +115 -0
  226. data/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim +89 -0
  227. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes +15 -0
  228. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License +21 -0
  229. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile +45 -0
  230. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta +28 -0
  231. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod +77 -0
  232. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+ +43 -0
  233. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim +61 -0
  234. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash +92 -0
  235. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +134 -0
  236. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +134 -0
  237. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/base.t +12 -0
  238. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/fcopy.t +22 -0
  239. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/bar.bash +3 -0
  240. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/foo.bash +3 -0
  241. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +18 -0
  242. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+.t +23 -0
  243. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/test.bash +70 -0
  244. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/use.t +19 -0
  245. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Changes +15 -0
  246. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/License +21 -0
  247. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Makefile +37 -0
  248. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Meta +28 -0
  249. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +66 -0
  250. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +48 -0
  251. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +153 -0
  252. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +119 -0
  253. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +13 -0
  254. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/done.t +10 -0
  255. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail.t +20 -0
  256. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +15 -0
  257. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +9 -0
  258. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/pass.t +9 -0
  259. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/plan.t +10 -0
  260. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/skip_all.t +20 -0
  261. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/tap.t +13 -0
  262. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/bail.t +14 -0
  263. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail.t +7 -0
  264. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail_fast.t +12 -0
  265. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-init.t +8 -0
  266. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-plan.t +9 -0
  267. data/vendor/git-subrepo/ext/test-more-bash/lib/test/more.bash +95 -0
  268. data/vendor/git-subrepo/ext/test-more-bash/man/man3/test-more.3 +173 -0
  269. data/vendor/git-subrepo/ext/test-more-bash/test/fail.t +20 -0
  270. data/vendor/git-subrepo/ext/test-more-bash/test/more.t +20 -0
  271. data/vendor/git-subrepo/ext/test-more-bash/test/pass.t +9 -0
  272. data/vendor/git-subrepo/ext/test-more-bash/test/setup +8 -0
  273. data/vendor/git-subrepo/ext/test-more-bash/test/skip_all.t +11 -0
  274. data/vendor/git-subrepo/ext/test-more-bash/test/test/fail1.t +12 -0
  275. data/vendor/git-subrepo/ext/test-more-bash/test/test/skip_all.t +10 -0
  276. data/vendor/git-subrepo/lib/git-subrepo +1891 -0
  277. data/vendor/git-subrepo/lib/git-subrepo.d/help-functions.bash +343 -0
  278. data/vendor/git-subrepo/man/man1/git-subrepo.1 +746 -0
  279. data/vendor/git-subrepo/note/0.4.0 +12 -0
  280. data/vendor/git-subrepo/note/AllGitCmds +148 -0
  281. data/vendor/git-subrepo/note/Cases +32 -0
  282. data/vendor/git-subrepo/note/Commands +33 -0
  283. data/vendor/git-subrepo/note/Dags +199 -0
  284. data/vendor/git-subrepo/note/Gists +7 -0
  285. data/vendor/git-subrepo/note/Links +25 -0
  286. data/vendor/git-subrepo/note/Plugins +10 -0
  287. data/vendor/git-subrepo/note/Spec +39 -0
  288. data/vendor/git-subrepo/note/Story1 +57 -0
  289. data/vendor/git-subrepo/note/ToDo +55 -0
  290. data/vendor/git-subrepo/note/design.swim +137 -0
  291. data/vendor/git-subrepo/note/design2.swim +85 -0
  292. data/vendor/git-subrepo/note/init-test +38 -0
  293. data/vendor/git-subrepo/note/pull-dance.txt +18 -0
  294. data/vendor/git-subrepo/note/recreate-rebase-conflict.sh +56 -0
  295. data/vendor/git-subrepo/note/subtree-rebase-fail-example/test.bash +29 -0
  296. data/vendor/git-subrepo/note/test-subrepo-push.sh +69 -0
  297. data/vendor/git-subrepo/note/test.sh +58 -0
  298. data/vendor/git-subrepo/pkg/bin/generate-completion.pl +210 -0
  299. data/vendor/git-subrepo/pkg/bin/generate-help-functions.pl +89 -0
  300. data/vendor/git-subrepo/share/completion.bash +42 -0
  301. data/vendor/git-subrepo/share/enable-completion.sh +50 -0
  302. data/vendor/git-subrepo/share/git-completion.bash +2738 -0
  303. data/vendor/git-subrepo/share/zsh-completion/_git-subrepo +82 -0
  304. data/vendor/git-subrepo/test/branch-all.t +41 -0
  305. data/vendor/git-subrepo/test/branch-rev-list-one-path.t +43 -0
  306. data/vendor/git-subrepo/test/branch-rev-list.t +47 -0
  307. data/vendor/git-subrepo/test/branch.t +52 -0
  308. data/vendor/git-subrepo/test/clean.t +43 -0
  309. data/vendor/git-subrepo/test/clone-annotated-tag.t +45 -0
  310. data/vendor/git-subrepo/test/clone.t +107 -0
  311. data/vendor/git-subrepo/test/compile.t +19 -0
  312. data/vendor/git-subrepo/test/config.t +58 -0
  313. data/vendor/git-subrepo/test/encode.t +91 -0
  314. data/vendor/git-subrepo/test/error.t +171 -0
  315. data/vendor/git-subrepo/test/fetch.t +43 -0
  316. data/vendor/git-subrepo/test/gitignore.t +61 -0
  317. data/vendor/git-subrepo/test/init.t +64 -0
  318. data/vendor/git-subrepo/test/issue29.t +98 -0
  319. data/vendor/git-subrepo/test/issue95.t +98 -0
  320. data/vendor/git-subrepo/test/issue96.t +96 -0
  321. data/vendor/git-subrepo/test/pull-all.t +38 -0
  322. data/vendor/git-subrepo/test/pull-merge.t +113 -0
  323. data/vendor/git-subrepo/test/pull-message.t +88 -0
  324. data/vendor/git-subrepo/test/pull-new-branch.t +58 -0
  325. data/vendor/git-subrepo/test/pull-ours.t +90 -0
  326. data/vendor/git-subrepo/test/pull-theirs.t +82 -0
  327. data/vendor/git-subrepo/test/pull-twice.t +44 -0
  328. data/vendor/git-subrepo/test/pull.t +99 -0
  329. data/vendor/git-subrepo/test/push-after-init.t +51 -0
  330. data/vendor/git-subrepo/test/push-force.t +56 -0
  331. data/vendor/git-subrepo/test/push-new-branch.t +61 -0
  332. data/vendor/git-subrepo/test/push-no-changes.t +29 -0
  333. data/vendor/git-subrepo/test/push-squash.t +56 -0
  334. data/vendor/git-subrepo/test/push.t +176 -0
  335. data/vendor/git-subrepo/test/reclone.t +45 -0
  336. data/vendor/git-subrepo/test/repo/bar/HEAD +1 -0
  337. data/vendor/git-subrepo/test/repo/bar/config +4 -0
  338. data/vendor/git-subrepo/test/repo/bar/objects/1f/0c4b264caed0126814a0ede851a1e0b4e16ae6 +0 -0
  339. data/vendor/git-subrepo/test/repo/bar/objects/87/46903fdb1b9c2101377880125917c2e05b4d69 +0 -0
  340. data/vendor/git-subrepo/test/repo/bar/objects/94/c86ffc745232d89f78c6f895e11e71272518db +0 -0
  341. data/vendor/git-subrepo/test/repo/bar/objects/c6/76c57b6576743fa56278527aa60ebd2e202a7c +0 -0
  342. data/vendor/git-subrepo/test/repo/bar/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  343. data/vendor/git-subrepo/test/repo/bar/objects/f6/2a8ff3feadf39b0a98f1a86ec6d1eb33858ee9 +0 -0
  344. data/vendor/git-subrepo/test/repo/bar/refs/heads/master +1 -0
  345. data/vendor/git-subrepo/test/repo/bar/refs/tags/A +1 -0
  346. data/vendor/git-subrepo/test/repo/foo/HEAD +1 -0
  347. data/vendor/git-subrepo/test/repo/foo/config +4 -0
  348. data/vendor/git-subrepo/test/repo/foo/objects/a0/f4cdaaf533a936296cdebbed8206c3b9ededa8 +0 -0
  349. data/vendor/git-subrepo/test/repo/foo/objects/e2/1291a1ad392a9d4c51dd9586804f1467b28afd +0 -0
  350. data/vendor/git-subrepo/test/repo/foo/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  351. data/vendor/git-subrepo/test/repo/foo/refs/heads/master +1 -0
  352. data/vendor/git-subrepo/test/repo/init/HEAD +1 -0
  353. data/vendor/git-subrepo/test/repo/init/config +5 -0
  354. data/vendor/git-subrepo/test/repo/init/objects/11/523f5dcf03b4c89b592dc8a3d0308f68da2386 +0 -0
  355. data/vendor/git-subrepo/test/repo/init/objects/14/2addf8ec5f37334e837440122c62f2c68a29ad +0 -0
  356. data/vendor/git-subrepo/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09 +2 -0
  357. data/vendor/git-subrepo/test/repo/init/objects/3d/918c6901c02f43af5d31779dd5e1f9166aeb36 +0 -0
  358. data/vendor/git-subrepo/test/repo/init/objects/3e/4cb596066dce63ba4d047abddb677389b65e19 +0 -0
  359. data/vendor/git-subrepo/test/repo/init/objects/4b/6e53022e7a04f07887697e4f3d7c377fd9822b +0 -0
  360. data/vendor/git-subrepo/test/repo/init/objects/58/931fc1bd559b59c41ea738fc7ad04f9ad01bd3 +0 -0
  361. data/vendor/git-subrepo/test/repo/init/objects/5e/c0c28e1b806f25efdca18fcf7a74b49c3755bd +0 -0
  362. data/vendor/git-subrepo/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2 +1 -0
  363. data/vendor/git-subrepo/test/repo/init/objects/80/2d5edbd5e1cb7fca82b5bd38e7c8a0a496fb20 +0 -0
  364. data/vendor/git-subrepo/test/repo/init/objects/94/7b3d714c38791e95ad6f928b48c98bb8708acd +0 -0
  365. data/vendor/git-subrepo/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a +1 -0
  366. data/vendor/git-subrepo/test/repo/init/objects/b1/5f4a7666baf40d949548ead946a3370e273479 +0 -0
  367. data/vendor/git-subrepo/test/repo/init/objects/c3/ee8978c4c5d84c3b7d00ba8e5906933d027882 +0 -0
  368. data/vendor/git-subrepo/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa +3 -0
  369. data/vendor/git-subrepo/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626 +2 -0
  370. data/vendor/git-subrepo/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135 +2 -0
  371. data/vendor/git-subrepo/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1 +1 -0
  372. data/vendor/git-subrepo/test/repo/init/objects/f1/cc1a657b2e805c400f5dcaaa76bd29c6178b1b +0 -0
  373. data/vendor/git-subrepo/test/repo/init/refs/heads/master +1 -0
  374. data/vendor/git-subrepo/test/setup +205 -0
  375. data/vendor/git-subrepo/test/status.t +68 -0
  376. data/vendor/git-subrepo/test/submodule.t +45 -0
  377. metadata +361 -14
  378. data/lib/avm/patches/eac_launcher_git_base.rb +0 -77
  379. data/lib/eac_launcher/git/base/_remotes.rb +0 -36
@@ -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,611 @@
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.5) 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
+ When you pull you can assume a fast-forward strategy (default) or you can
181
+ specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
182
+ as a `clone --force` operation, using the current remote and branch.
183
+
184
+ Like the `clone` command, `pull` will squash all the changes (since the last
185
+ pull or clone) into one commit. This keeps your mainline history nice and
186
+ clean. You can easily see the subrepo's history with the `git log` command:
187
+
188
+ git log refs/subrepo/<subdir>/fetch
189
+
190
+ The set of commands used above are described in detail below.
191
+
192
+ The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--force`,
193
+ `--message=`, `--remote=` and `--update` options.
194
+
195
+ - `git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]`
196
+
197
+ Push a properly merged subrepo branch back upstream.
198
+
199
+ This command takes the subrepo branch from a successful pull command and
200
+ pushes the history back to its designated remote and branch. You can also use
201
+ the `branch` command and merge things yourself before pushing if you want to
202
+ (although that is probably a rare use case).
203
+
204
+ The `push` command requires a branch that has been properly merged/rebased
205
+ with the upstream HEAD (unless the upstream HEAD is empty, which is common
206
+ when doing a first `push` after an `init`). That means the upstream HEAD is
207
+ one of the commits in the branch.
208
+
209
+ By default the branch ref `refs/subrepo/<subdir>/pull` will be pushed, but
210
+ you can specify a (properly merged) branch to push.
211
+
212
+ After that, the `push` command just checks that the branch contains the
213
+ upstream HEAD and then pushes it upstream.
214
+
215
+ The `--force` option will do a force push. Force pushes are typically
216
+ discouraged. Only use this option if you fully understand it. (The `--force`
217
+ option will NOT check for a proper merge. ANY branch will be force pushed!)
218
+
219
+ The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--force`,
220
+ `--merge`, `--rebase`, `--remote=`, `--squash` and `--update` options.
221
+
222
+ - `git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]`
223
+
224
+ Fetch the remote/upstream content for a subrepo.
225
+
226
+ It will create a Git reference called `subrepo/<subdir>/fetch` that points at
227
+ the same commit as `FETCH_HEAD`. It will also create a remote called
228
+ `subrepo/<subdir>`. These are temporary and you can easily remove them with
229
+ the subrepo `clean` command.
230
+
231
+ The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
232
+
233
+ - `git subrepo branch <subdir>|--all [-f] [-F]`
234
+
235
+ Create a branch with local subrepo commits.
236
+
237
+ Scan the history of the mainline for all the commits that affect the `subdir`
238
+ and create a new branch from them called `subrepo/<subdir>`.
239
+
240
+ This is useful for doing `pull` and `push` commands by hand.
241
+
242
+ Use the `--force` option to write over an existing `subrepo/<subdir>` branch.
243
+
244
+ The `branch` command accepts the `--all`, `--fetch` and `--force` options.
245
+
246
+ - `git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]`
247
+
248
+ Add subrepo branch to current history as a single commit.
249
+
250
+ This command is generally used after a hand-merge. You have done a `subrepo
251
+ branch` and merged (rebased) it with the upstream. This command takes the
252
+ HEAD of that branch, puts its content into the subrepo subdir and adds a new
253
+ commit for it to the top of your mainline history.
254
+
255
+ This command requires that the upstream HEAD be in the `subrepo/<subdir>`
256
+ branch history. That way the same branch can push upstream. Use the
257
+ `--force` option to commit anyway.
258
+
259
+ The `commit` command accepts the `--edit`, `--fetch`, `--force` and
260
+ `--message=` options.
261
+
262
+ - `git subrepo status [<subdir>|--all|--ALL] [-F] [-q|-v]`
263
+
264
+ Get the status of a subrepo. Uses the `--all` option by default. If the
265
+ `--quiet` flag is used, just print the subrepo names, one per line.
266
+
267
+ The `--verbose` option will show all the recent local and upstream commits.
268
+
269
+ Use `--ALL` to show the subrepos of the subrepos (ie the "subsubrepos"), if
270
+ any.
271
+
272
+ The `status` command accepts the `--all`, `--ALL`, `--fetch`, `--quiet` and
273
+ `--verbose` options.
274
+
275
+ - `git subrepo clean <subdir>|--all|--ALL [-f]`
276
+
277
+ Remove artifacts created by `fetch` and `branch` commands.
278
+
279
+ The `fetch` and `branch` operations (and other commands that call them)
280
+ create temporary things like refs, branches and remotes. This command
281
+ removes all those things.
282
+
283
+ Use `--force` to remove refs. Refs are not removed by default because they
284
+ are sometimes needed between commands.
285
+
286
+ Use `--all` to clean up after all the current subrepos. Sometimes you might
287
+ change to a branch where a subrepo doesn't exist, and then `--all` won't find
288
+ it. Use `--ALL` to remove any artifacts that were ever created by subrepo.
289
+
290
+ To remove ALL subrepo artifacts:
291
+
292
+ git subrepo clean --ALL --force
293
+
294
+ The `clean` command accepts the `--all`, `--ALL`, and `--force` options.
295
+
296
+ - `git subrepo config <subdir> <option> [<value>] [-f]`
297
+
298
+ Read or update configuration values in the subdir/.gitrepo file.
299
+
300
+ Because most of the values stored in the .gitrepo file are generated you
301
+ will need to use `--force` if you want to change anything else then the
302
+ `method` option.
303
+
304
+ Example to update the `method` option for a subrepo:
305
+
306
+ git subrepo config foo method rebase
307
+
308
+ - `git subrepo help [<command>|--all]`
309
+
310
+ Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
311
+ use `git subrepo -h`.
312
+
313
+ Use `git subrepo help <command> to get help for a specific command. Use
314
+ `--all` to get a summary of all commands.
315
+
316
+ The `help` command accepts the `--all` option.
317
+
318
+ - `git subrepo version [-q|-v]`
319
+
320
+ This command will display version information about git-subrepo and its
321
+ environment. For just the version number, use `git subrepo --version`. Use
322
+ `--verbose` for more version info, and `--quiet` for less.
323
+
324
+ The `version` command accepts the `--quiet` and `--verbose` options.
325
+
326
+ - `git subrepo upgrade`
327
+
328
+ Upgrade the `git-subrepo` software itself. This simply does a `git pull` on
329
+ the git repository that the code is running from. It only works if you are on
330
+ the `master` branch. It won't work if you installed `git-subrepo` using `make
331
+ install`; in that case you'll need to `make install` from the latest code.
332
+
333
+ = Command Options
334
+
335
+ - `-h`
336
+
337
+ Show a brief view of the commands and options.
338
+
339
+ - `--help`
340
+
341
+ Gives an overview of the help options available for the subrepo command.
342
+
343
+ - `--version`
344
+
345
+ Print the git-subrepo version. Just the version number. Try the `version`
346
+ command for more version info.
347
+
348
+ - `--all` (`-a`)
349
+
350
+ If you have multiple subrepos, issue the command to all of them (if
351
+ applicable).
352
+
353
+ - `--ALL` (`-A`)
354
+
355
+ If you have subrepos that also have subrepos themselves, issue the command to
356
+ ALL of them. Note that the `--ALL` option only works for a subset of the
357
+ commands that `--all` works for.
358
+
359
+ - `--branch=<branch-name>` (`-b <branch-name>`)
360
+
361
+ Use a different upstream branch-name than the remote HEAD or the one saved in
362
+ `.gitrepo` locally.
363
+
364
+ - `--dry-run` (`-N`)
365
+
366
+ For the push command, do everything up until the push and then print out the
367
+ actual `git push` command needed to finish the operation.
368
+
369
+ - `--edit` (`-e`)
370
+
371
+ Edit the commit message before committing.
372
+
373
+ - `--fetch` (`-F`)
374
+
375
+ Use this option to fetch the upstream commits, before running the command.
376
+
377
+ - `--force` (`-f`)
378
+
379
+ Use this option to force certain commands that fail in the general case.
380
+
381
+ NOTE: The `--force` option means different things for different commands.
382
+ Read the command specific doc for the exact meaning.
383
+
384
+ - `--merge` (`-M`)
385
+
386
+ Use a `merge` strategy to include upstream subrepo commits on a pull (or
387
+ setup for push).
388
+
389
+ - `--message=<message>` (`-m <message>`)
390
+
391
+ Specify your own commit message on the command line.
392
+
393
+ - `--rebase` (`-R`)
394
+
395
+ Use a `rebase` strategy to include upstream subrepo commits on a pull (or
396
+ setup for push).
397
+
398
+ - `--remote=<remote-url>` (`-r <remote-url>`)
399
+
400
+ Use a different remote-url than the one saved in `.gitrepo` locally.
401
+
402
+ - `--squash` (`-s`)
403
+
404
+ Squash all commits on a push into one new commit.
405
+
406
+ - `--update` (`-u`)
407
+
408
+ If `--branch` or `--remote` are used, and the command updates the `.gitrepo`
409
+ file, include these values to the update.
410
+
411
+ = Output Options
412
+
413
+ - `--quiet` (`-q`)
414
+
415
+ Print as little info as possible. Applicable to most commands.
416
+
417
+ - `--verbose` (`-v`)
418
+
419
+ Print more information about the command execution and results. Applicable
420
+ to most commands.
421
+
422
+ - `--debug` (`-d`)
423
+
424
+ Show the actual git (and other) commands being executed under the hood.
425
+ Applicable to most commands.
426
+
427
+ - `--DEBUG` (`-x`)
428
+
429
+ Use the Bash `set -x` option which prints every command before it is run.
430
+ VERY noisy, but extremely useful in deep debugging. Applicable to all
431
+ commands.
432
+
433
+ = Environment Variables
434
+
435
+ The `git-subrepo` command exports and honors some environment variables:
436
+
437
+ - `GIT_SUBREPO_ROOT`
438
+
439
+ This is set by the `.rc` file, if you use that method to install / enable
440
+ `git-subrepo`. It contains the path of the `git-subrepo` repository.
441
+
442
+ - `GIT_SUBREPO_RUNNING`
443
+
444
+ This variable is exported when `git-subrepo` is running. It is set to the pid
445
+ of the `git-subrepo` process that is running. Other processes, like git hooks
446
+ for instance, can use this information to adjust accordingly.
447
+
448
+ - `GIT_SUBREPO_COMMAND`
449
+
450
+ This variable is exported when `git-subrepo` is running. It is set to the
451
+ name of the `git-subrepo` subcommand that is running.
452
+
453
+ - `GIT_SUBREPO_PAGER`
454
+
455
+ Use this to specify the pager to use for long output commands. Defaults to
456
+ `$PAGER` or `less`.
457
+
458
+ - `GIT_SUBREPO_QUIET`
459
+
460
+ Set this for quiet (`-q`) output.
461
+
462
+ - `GIT_SUBREPO_VERBOSE`
463
+
464
+ Set this for verbose (`-v`) output.
465
+
466
+ - `GIT_SUBREPO_DEBUG`
467
+
468
+ Set this for debugging (`-d`) output.
469
+
470
+ = Installation Instructions
471
+
472
+ There are currently 3 ways to install `git-subrepo`. For all of them you need
473
+ to get the source code from GitHub:
474
+
475
+ git clone https://github.com/ingydotnet/git-subrepo /path/to/git-subrepo
476
+
477
+ The first installation method is preferred: `source` the `.rc` file. Just add a
478
+ line like this one to your shell startup script:
479
+
480
+ source /path/to/git-subrepo/.rc
481
+
482
+ That will modify your `PATH` and `MANPATH`, and also enable command completion.
483
+
484
+ The second method is to do these things by hand. This might afford you more
485
+ control of your shell environment. Simply add the `lib` and `man` directories
486
+ to your `PATH` and `MANPATH`:
487
+
488
+ export GIT_SUBREPO_ROOT="/path/to/git-subrepo"
489
+ export PATH="/path/to/git-subrepo/lib:$PATH"
490
+ export MANPATH="/path/to/git-subrepo/man:$MANPATH"
491
+
492
+ See below for info on how to turn on Command Completion.
493
+
494
+ The third method is a standard system install, which puts `git-subrepo` next to
495
+ your other git commands:
496
+
497
+ make install # Possibly with 'sudo'
498
+
499
+ This method does not account for upgrading and command completion yet.
500
+
501
+ == Windows
502
+
503
+ This command is known to work in these Windows environments:
504
+
505
+ * Git for Windows -- https://git-for-windows.github.io/
506
+ * Babun -- http://babun.github.io/
507
+ * Cygwin -- https://www.cygwin.com/
508
+
509
+ Let us know if there are others that it works (or doesn't work) in.
510
+
511
+ = Testing
512
+
513
+ The `git-subrepo` repository comes with a extensive test suite. You can run it
514
+ with:
515
+
516
+ make test
517
+
518
+ or if you don't have `make` on your system:
519
+
520
+ prove -v test
521
+
522
+ = Upgrading
523
+
524
+ If you used the `.rc` or `PATH` method of installation, just run this to
525
+ upgrade `git-subrepo`:
526
+
527
+ git subrepo upgrade
528
+
529
+ Or (same thing):
530
+
531
+ cd /path/to/git-subrepo
532
+ git pull
533
+
534
+ If you used `make install` method, then run this again (after `git pull`):
535
+
536
+ make install # Possibly with 'sudo'
537
+
538
+ = Command Completion
539
+
540
+ The `git subrepo` command supports `<TAB>`-based command completion. If you
541
+ don't use the `.rc` script (see Installation, above), you'll need to enable
542
+ this manually to use it.
543
+
544
+ == In Bash
545
+
546
+ If your Bash setup does not already provide command completion for Git, you'll
547
+ need to enable that first:
548
+
549
+ source <Git completion script>
550
+
551
+ On your system, the Git completion script might be found at any of the
552
+ following locations (or somewhere else that we don't know about):
553
+
554
+ * `/etc/bash_completion.d/git`
555
+ * `/usr/share/bash-completion/git`
556
+ * `/usr/share/bash-completion/completions/git`
557
+ * `/opt/local/share/bash-completion/completions/git`
558
+ * `/usr/local/etc/bash_completion.d/git`
559
+ * `~/.homebrew/etc/bash_completion.d/git`
560
+
561
+ In case you can't find any of these, this repository contains a copy of the
562
+ Git completion script:
563
+
564
+ source /path/to/git-subrepo/share/git-completion.bash
565
+
566
+ Once Git completion is enabled (whether you needed to do that manually or
567
+ not), you can turn on `git-subrepo` completion with a command like this:
568
+
569
+ source /path/to/git-subrepo/share/completion.bash
570
+
571
+ == In zsh
572
+
573
+ In the Z shell (zsh), you can manually enable `git-subrepo` completion by
574
+ adding the following line to your `~/.zshrc`, *before* the `compinit` function
575
+ is called:
576
+
577
+ fpath=('/path/to/git-subrepo/share/zsh-completion' $fpath)
578
+
579
+ = Status
580
+
581
+ The git-subrepo command has been in use for well over a year and seems to get
582
+ the job done. Development is still ongoing but mostly just for fixing bugs.
583
+
584
+ Trying subrepo out is simple and painless (this is not `git submodule`).
585
+ Nothing is permanent (if you do not push to shared remotes). ie You can always
586
+ play around and reset back to the beginning without pain.
587
+
588
+ This command has a test suite (run `make test`), but surely has many bugs. If
589
+ you have expertise with Git and subcommands, please review the code, and file
590
+ issues on anything that seems wrong.
591
+
592
+ If you want to chat about the `git-subrepo` command, join `#gitcommands` on
593
+ `irc.freenode.net`.
594
+
595
+ = Notes
596
+
597
+ * Works on POSIX systems: Linux, BSD, OSX, etc.
598
+ * Works on various Windows environments. See "Windows" section above.
599
+ * The `git-subrepo` repo itself has 2 subrepos under the `ext/` subdirectory.
600
+ * Written in (very modern) Bash, with full test suite. Take a look.
601
+ * A `.gitrepo` file never is in the top level dir (next to a `.git/` dir).
602
+
603
+ = Author
604
+
605
+ Written by Ingy döt Net <ingy@ingy.net>
606
+
607
+ = License and Copyright
608
+
609
+ The MIT License (MIT)
610
+
611
+ Copyright (c) 2013-2017 Ingy döt Net