git-multirepo 1.0.0.beta63 → 1.0.0.beta64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/.gitattributes +4 -4
  3. data/.gitbugtraq +3 -3
  4. data/.gitignore +38 -38
  5. data/.rspec +2 -2
  6. data/.rubocop.yml +79 -79
  7. data/CHANGELOG.md +87 -83
  8. data/Gemfile +4 -4
  9. data/Gemfile.lock +49 -49
  10. data/LICENSE +22 -22
  11. data/README.md +179 -179
  12. data/Rakefile +1 -1
  13. data/bin/multi +11 -11
  14. data/docs/bug-repros/91565510-repro.sh +20 -20
  15. data/git-multirepo.gemspec +32 -32
  16. data/lib/git-multirepo.rb +3 -3
  17. data/lib/multirepo/commands/add-command.rb +51 -51
  18. data/lib/multirepo/commands/branch-command.rb +88 -88
  19. data/lib/multirepo/commands/checkout-command.rb +127 -127
  20. data/lib/multirepo/commands/clone-command.rb +68 -68
  21. data/lib/multirepo/commands/command.rb +87 -87
  22. data/lib/multirepo/commands/commands.rb +15 -15
  23. data/lib/multirepo/commands/do-command.rb +101 -101
  24. data/lib/multirepo/commands/graph-command.rb +43 -43
  25. data/lib/multirepo/commands/init-command.rb +121 -121
  26. data/lib/multirepo/commands/inspect-command.rb +48 -48
  27. data/lib/multirepo/commands/install-command.rb +170 -170
  28. data/lib/multirepo/commands/merge-command.rb +249 -249
  29. data/lib/multirepo/commands/open-command.rb +55 -55
  30. data/lib/multirepo/commands/remove-command.rb +48 -48
  31. data/lib/multirepo/commands/uninit-command.rb +18 -18
  32. data/lib/multirepo/commands/update-command.rb +112 -112
  33. data/lib/multirepo/config.rb +19 -19
  34. data/lib/multirepo/files/config-entry.rb +39 -39
  35. data/lib/multirepo/files/config-file.rb +52 -52
  36. data/lib/multirepo/files/lock-entry.rb +29 -29
  37. data/lib/multirepo/files/lock-file.rb +62 -62
  38. data/lib/multirepo/files/meta-file.rb +51 -51
  39. data/lib/multirepo/files/tracking-file.rb +9 -9
  40. data/lib/multirepo/files/tracking-files.rb +64 -64
  41. data/lib/multirepo/git/branch.rb +32 -32
  42. data/lib/multirepo/git/change.rb +11 -11
  43. data/lib/multirepo/git/commit.rb +7 -7
  44. data/lib/multirepo/git/git-runner.rb +56 -56
  45. data/lib/multirepo/git/git.rb +10 -10
  46. data/lib/multirepo/git/ref.rb +38 -38
  47. data/lib/multirepo/git/remote.rb +17 -17
  48. data/lib/multirepo/git/repo.rb +129 -129
  49. data/lib/multirepo/hooks/post-commit-hook.rb +23 -23
  50. data/lib/multirepo/hooks/pre-commit-hook.rb +35 -35
  51. data/lib/multirepo/info.rb +5 -5
  52. data/lib/multirepo/logic/dependency.rb +6 -6
  53. data/lib/multirepo/logic/merge-descriptor.rb +95 -95
  54. data/lib/multirepo/logic/node.rb +72 -72
  55. data/lib/multirepo/logic/performer.rb +55 -55
  56. data/lib/multirepo/logic/repo-selection.rb +25 -25
  57. data/lib/multirepo/logic/revision-selection.rb +15 -15
  58. data/lib/multirepo/logic/revision-selector.rb +23 -23
  59. data/lib/multirepo/logic/version-comparer.rb +10 -10
  60. data/lib/multirepo/multirepo-exception.rb +6 -6
  61. data/lib/multirepo/output/extra-output.rb +12 -12
  62. data/lib/multirepo/output/teamcity-extra-output.rb +11 -11
  63. data/lib/multirepo/utility/console.rb +52 -52
  64. data/lib/multirepo/utility/popen-runner.rb +27 -27
  65. data/lib/multirepo/utility/system-runner.rb +14 -14
  66. data/lib/multirepo/utility/utils.rb +99 -99
  67. data/lib/multirepo/utility/verbosity.rb +6 -6
  68. data/resources/.gitconfig +2 -2
  69. data/resources/post-commit +0 -0
  70. data/resources/pre-commit +0 -0
  71. data/spec/integration/init_spec.rb +19 -19
  72. data/spec/spec_helper.rb +89 -89
  73. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dfacf080e3063bf9d96af14a065672e734f11386
4
- data.tar.gz: 177b11a472417aaf543b34aa595ea6a7dfb01b00
3
+ metadata.gz: 2acc04ac4dccb24bb4d9c4c17598005eba22f5c8
4
+ data.tar.gz: dc2bd558a4824c0c98df5979895dac672cdf27d4
5
5
  SHA512:
6
- metadata.gz: d6cce19271c35d222d10eb4b0fd6d79cb89e36b06a86b8b73253d6b3e8e41f0e1f0b26730cc8da00024886a50202483d4b4fd1badffe1823373129022eb42bf6
7
- data.tar.gz: efc71b7490badfdd26af4fefa8b541d6ec4d0e6a9a4c2ee8d5c60f9d9a6536e81530c0ba40979facc47f5c58f1b415eb3452a135d1f31ac5dfad5e70f4875e8d
6
+ metadata.gz: eeb89ea19cbf320e959b516cad97b97c7d79ad16810175d352cedea7b210dd0f0a66b0aef9dbca450017fbb8e9689a9ff32202e49b8baf9ea4333d5bac577187
7
+ data.tar.gz: 2e73463a7c53bddebf27f45e0c334f8f787dcb1d7f3273c2a50bdefcb6fc13cef7334ebf524ffedfc119fd2e9d7145dbfc92582c037e0e255238ba122e660ff3
data/.gitattributes CHANGED
@@ -1,4 +1,4 @@
1
- resources/post-commit eol=lf
2
- resources/pre-commit eol=lf
3
- .multirepo.lock merge=ours
4
- .multirepo.meta merge=ours
1
+ resources/post-commit eol=lf
2
+ resources/pre-commit eol=lf
3
+ .multirepo.lock merge=ours
4
+ .multirepo.meta merge=ours
data/.gitbugtraq CHANGED
@@ -1,3 +1,3 @@
1
- [bugtraq "pivotal"]
2
- url = https://www.pivotaltracker.com/story/show/%BUGID%
3
- logRegex = (\\b\\d{8}\\b)
1
+ [bugtraq "pivotal"]
2
+ url = https://www.pivotaltracker.com/story/show/%BUGID%
3
+ logRegex = (\\b\\d{8}\\b)
data/.gitignore CHANGED
@@ -1,38 +1,38 @@
1
- *.gem
2
- *.rbc
3
- /.config
4
- /coverage/
5
- /InstalledFiles
6
- /pkg/
7
- /spec/reports/
8
- /test/tmp/
9
- /test/version_tmp/
10
- /tmp/
11
-
12
- ## Specific to RubyMotion:
13
- .dat*
14
- .repl_history
15
- build/
16
-
17
- ## Documentation cache and generated files:
18
- /.yardoc/
19
- /_yardoc/
20
- /doc/
21
- /rdoc/
22
-
23
- ## Environment normalisation:
24
- /.bundle/
25
- /lib/bundler/man/
26
-
27
- # for a library or gem, you might want to ignore these files since the code is
28
- # intended to run in multiple environments; otherwise, check them in:
29
- # Gemfile.lock
30
- # .ruby-version
31
- # .ruby-gemset
32
-
33
- # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
34
- .rvmrc
35
-
36
- # Project-specific
37
- /.multirepo
38
- /.multirepo.lock
1
+ *.gem
2
+ *.rbc
3
+ /.config
4
+ /coverage/
5
+ /InstalledFiles
6
+ /pkg/
7
+ /spec/reports/
8
+ /test/tmp/
9
+ /test/version_tmp/
10
+ /tmp/
11
+
12
+ ## Specific to RubyMotion:
13
+ .dat*
14
+ .repl_history
15
+ build/
16
+
17
+ ## Documentation cache and generated files:
18
+ /.yardoc/
19
+ /_yardoc/
20
+ /doc/
21
+ /rdoc/
22
+
23
+ ## Environment normalisation:
24
+ /.bundle/
25
+ /lib/bundler/man/
26
+
27
+ # for a library or gem, you might want to ignore these files since the code is
28
+ # intended to run in multiple environments; otherwise, check them in:
29
+ # Gemfile.lock
30
+ # .ruby-version
31
+ # .ruby-gemset
32
+
33
+ # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
34
+ .rvmrc
35
+
36
+ # Project-specific
37
+ /.multirepo
38
+ /.multirepo.lock
data/.rspec CHANGED
@@ -1,2 +1,2 @@
1
- --color
2
- --require spec_helper
1
+ --color
2
+ --require spec_helper
data/.rubocop.yml CHANGED
@@ -1,79 +1,79 @@
1
- # This is the configuration used to check the rubocop source code.
2
-
3
- AllCops:
4
- DisplayCopNames: true
5
- Exclude:
6
- - 'resources/*'
7
- - 'pkg/*'
8
- - 'docs/*'
9
- - 'spec/spec_helper.rb'
10
- - 'spec/fixtures/**/*'
11
-
12
- Style/RescueModifier:
13
- Enabled: false
14
-
15
- Lint/EndAlignment:
16
- Enabled: false
17
-
18
- Metrics/MethodLength:
19
- Enabled: false
20
-
21
- Metrics/LineLength:
22
- Enabled: false
23
-
24
- Style/EachWithObject:
25
- Enabled: false
26
-
27
- Style/Documentation:
28
- Enabled: false
29
-
30
- Style/GuardClause:
31
- Enabled: false
32
-
33
- Style/RedundantReturn:
34
- Enabled: false
35
-
36
- Style/SpaceBeforeBlockBraces:
37
- Enabled: false
38
-
39
- Style/StringLiterals:
40
- Enabled: false
41
-
42
- Style/TrailingWhitespace:
43
- Enabled: false
44
-
45
- Metrics/AbcSize:
46
- Enabled: false
47
-
48
- Metrics/ClassLength:
49
- Enabled: false
50
-
51
- Style/ElseAlignment:
52
- Enabled: false
53
-
54
- Style/HashSyntax:
55
- Enabled: false
56
-
57
- Style/MultilineOperationIndentation:
58
- Enabled: false
59
-
60
- Style/Semicolon:
61
- AllowAsExpressionSeparator: true
62
-
63
- Style/IndentationWidth:
64
- Enabled: false
65
-
66
- Style/SingleLineBlockParams:
67
- Enabled: false
68
-
69
- Metrics/CyclomaticComplexity:
70
- Max: 10
71
-
72
- Metrics/PerceivedComplexity:
73
- Max: 8
74
-
75
- Style/FileName:
76
- Enabled: false
77
-
78
- Style/SpecialGlobalVars:
79
- Enabled: false
1
+ # This is the configuration used to check the rubocop source code.
2
+
3
+ AllCops:
4
+ DisplayCopNames: true
5
+ Exclude:
6
+ - 'resources/*'
7
+ - 'pkg/*'
8
+ - 'docs/*'
9
+ - 'spec/spec_helper.rb'
10
+ - 'spec/fixtures/**/*'
11
+
12
+ Style/RescueModifier:
13
+ Enabled: false
14
+
15
+ Lint/EndAlignment:
16
+ Enabled: false
17
+
18
+ Metrics/MethodLength:
19
+ Enabled: false
20
+
21
+ Metrics/LineLength:
22
+ Enabled: false
23
+
24
+ Style/EachWithObject:
25
+ Enabled: false
26
+
27
+ Style/Documentation:
28
+ Enabled: false
29
+
30
+ Style/GuardClause:
31
+ Enabled: false
32
+
33
+ Style/RedundantReturn:
34
+ Enabled: false
35
+
36
+ Style/SpaceBeforeBlockBraces:
37
+ Enabled: false
38
+
39
+ Style/StringLiterals:
40
+ Enabled: false
41
+
42
+ Style/TrailingWhitespace:
43
+ Enabled: false
44
+
45
+ Metrics/AbcSize:
46
+ Enabled: false
47
+
48
+ Metrics/ClassLength:
49
+ Enabled: false
50
+
51
+ Style/ElseAlignment:
52
+ Enabled: false
53
+
54
+ Style/HashSyntax:
55
+ Enabled: false
56
+
57
+ Style/MultilineOperationIndentation:
58
+ Enabled: false
59
+
60
+ Style/Semicolon:
61
+ AllowAsExpressionSeparator: true
62
+
63
+ Style/IndentationWidth:
64
+ Enabled: false
65
+
66
+ Style/SingleLineBlockParams:
67
+ Enabled: false
68
+
69
+ Metrics/CyclomaticComplexity:
70
+ Max: 10
71
+
72
+ Metrics/PerceivedComplexity:
73
+ Max: 8
74
+
75
+ Style/FileName:
76
+ Enabled: false
77
+
78
+ Style/SpecialGlobalVars:
79
+ Enabled: false
data/CHANGELOG.md CHANGED
@@ -1,83 +1,87 @@
1
- ## Releases
2
-
3
- To install betas run `gem install git-multirepo --pre`
4
-
5
- ## 1.0.0.beta63
6
-
7
- - **Bug Fix:** Remove some unnecessary debug console output
8
-
9
- ## 1.0.0.beta62
10
-
11
- - **Bug Fix:** Fix post-first-init commit
12
-
13
- ## 1.0.0.beta61
14
-
15
- - **Bug Fix:** Fix crasher in file permissions checking code
16
-
17
- ## 1.0.0.beta60
18
-
19
- - **Enhancement:** Implemented the `--force` option in `multi branch`
20
- - **Enhancement:** Prevent updating tracking files with an outdated version of the tool
21
- - **Bug Fix:** Fail gracefully in case of limited tracking file permissions
22
-
23
- ## 1.0.0.beta59
24
-
25
- - **Bug Fix:** Fix clone and install error when on-disk dependency directory case does not match
26
-
27
- ## 1.0.0.beta57
28
-
29
- - **Bug Fix:** Fixed error in multi install clone error message building
30
-
31
- ## 1.0.0.beta56
32
-
33
- - **Enhancement:** Using the `--extra-output` flag will output more CI server-specific info (checkout info, errors, etc.)
34
- - **Bug Fix:** Some config flags (such as `--verbose`) were reset when calling other commands internally
35
-
36
- ## 1.0.0.beta53
37
-
38
- - **Enhancement:** Added a `--extra-output` flag to output additional CI server-specific messages (such as TeamCity service messages)
39
-
40
- ## 1.0.0.beta52
41
-
42
- - **Enhancement:** InspectCommand now takes the name of a stat as input instead of flags and provides helpful output if the provided stat name is invalid
43
- - **Enhancement:** Added a `--force` flag to `multi checkout`, which ignores uncommitted changes
44
-
45
- ## 1.0.0.beta51
46
-
47
- - **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
48
- - **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
49
- - **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
50
- - **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
51
- - **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (`--deps`, `--main`, etc.)
52
-
53
- ## 1.0.0.beta50
54
-
55
- - **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
56
- - **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
57
- - **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
58
-
59
- ## 1.0.0.beta49
60
-
61
- - **Enhancement:** Added `--deps`, `--main` and `--all` flags to `multi update` and update all by default
62
- - **Enhancement:** Log a warning on multi install --ci if the main repo HEAD is a merge commit, for CI servers to pick up and optionally force fail with
63
- - **Bug Fix:** "HEAD" was stored in the lock file instead of `nil` when in floating HEAD, which caused some operations to have unexpected results
64
- - **Bug Fix:** Incorrect default behavior for `multi open` (now defaults to "all")
65
-
66
- ## 1.0.0.beta48
67
-
68
- - **New:** `multi update` now updates tracking files in subdependencies
69
- - **Enhancement:** Manual and automated code refactorings using RuboCop
70
-
71
- ## 1.0.0.beta47
72
-
73
- - **Enhancement:** Running commands using system() when we don't need to grab output (enables interactive commands in `multi do` and fixes clone/fetch progress output)
74
-
75
- ## 1.0.0.beta46
76
-
77
- - **Enhancement:** Better `multi install --ci` output
78
- - **Enhancement:** Not requiring a multirepo-enabled repo in InspectCommand, else it's not very useful to inspect random repos
79
- - **Bug Fix:** Fixed exception in `multi do` when providing only the `--help` flag
80
-
81
- ## 1.0.0.beta45 and earlier
82
-
83
- Refer to the commit history for details on earlier versions of git-multirepo.
1
+ ## Releases
2
+
3
+ To install betas run `gem install git-multirepo --pre`
4
+
5
+ ## 1.0.0.beta64
6
+
7
+ - **Enhancement:** The branch command does not push by default anymore (helps avoid creating branches in wrong origins when setting up new projects)
8
+
9
+ ## 1.0.0.beta63
10
+
11
+ - **Bug Fix:** Remove some unnecessary debug console output
12
+
13
+ ## 1.0.0.beta62
14
+
15
+ - **Bug Fix:** Fix post-first-init commit
16
+
17
+ ## 1.0.0.beta61
18
+
19
+ - **Bug Fix:** Fix crasher in file permissions checking code
20
+
21
+ ## 1.0.0.beta60
22
+
23
+ - **Enhancement:** Implemented the `--force` option in `multi branch`
24
+ - **Enhancement:** Prevent updating tracking files with an outdated version of the tool
25
+ - **Bug Fix:** Fail gracefully in case of limited tracking file permissions
26
+
27
+ ## 1.0.0.beta59
28
+
29
+ - **Bug Fix:** Fix clone and install error when on-disk dependency directory case does not match
30
+
31
+ ## 1.0.0.beta57
32
+
33
+ - **Bug Fix:** Fixed error in multi install clone error message building
34
+
35
+ ## 1.0.0.beta56
36
+
37
+ - **Enhancement:** Using the `--extra-output` flag will output more CI server-specific info (checkout info, errors, etc.)
38
+ - **Bug Fix:** Some config flags (such as `--verbose`) were reset when calling other commands internally
39
+
40
+ ## 1.0.0.beta53
41
+
42
+ - **Enhancement:** Added a `--extra-output` flag to output additional CI server-specific messages (such as TeamCity service messages)
43
+
44
+ ## 1.0.0.beta52
45
+
46
+ - **Enhancement:** InspectCommand now takes the name of a stat as input instead of flags and provides helpful output if the provided stat name is invalid
47
+ - **Enhancement:** Added a `--force` flag to `multi checkout`, which ignores uncommitted changes
48
+
49
+ ## 1.0.0.beta51
50
+
51
+ - **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
52
+ - **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
53
+ - **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
54
+ - **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
55
+ - **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (`--deps`, `--main`, etc.)
56
+
57
+ ## 1.0.0.beta50
58
+
59
+ - **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
60
+ - **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
61
+ - **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
62
+
63
+ ## 1.0.0.beta49
64
+
65
+ - **Enhancement:** Added `--deps`, `--main` and `--all` flags to `multi update` and update all by default
66
+ - **Enhancement:** Log a warning on multi install --ci if the main repo HEAD is a merge commit, for CI servers to pick up and optionally force fail with
67
+ - **Bug Fix:** "HEAD" was stored in the lock file instead of `nil` when in floating HEAD, which caused some operations to have unexpected results
68
+ - **Bug Fix:** Incorrect default behavior for `multi open` (now defaults to "all")
69
+
70
+ ## 1.0.0.beta48
71
+
72
+ - **New:** `multi update` now updates tracking files in subdependencies
73
+ - **Enhancement:** Manual and automated code refactorings using RuboCop
74
+
75
+ ## 1.0.0.beta47
76
+
77
+ - **Enhancement:** Running commands using system() when we don't need to grab output (enables interactive commands in `multi do` and fixes clone/fetch progress output)
78
+
79
+ ## 1.0.0.beta46
80
+
81
+ - **Enhancement:** Better `multi install --ci` output
82
+ - **Enhancement:** Not requiring a multirepo-enabled repo in InspectCommand, else it's not very useful to inspect random repos
83
+ - **Bug Fix:** Fixed exception in `multi do` when providing only the `--help` flag
84
+
85
+ ## 1.0.0.beta45 and earlier
86
+
87
+ Refer to the commit history for details on earlier versions of git-multirepo.
data/Gemfile CHANGED
@@ -1,4 +1,4 @@
1
- source 'https://rubygems.org'
2
-
3
- # Specify your gem's dependencies in git-multirepo.gemspec
4
- gemspec
1
+ source 'https://rubygems.org'
2
+
3
+ # Specify your gem's dependencies in git-multirepo.gemspec
4
+ gemspec