git-multirepo 1.0.0.beta68 → 1.0.0.beta69

Sign up to get free protection for your applications and to get access to all the features.
Files changed (72) hide show
  1. checksums.yaml +5 -5
  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 +107 -99
  8. data/Gemfile +4 -4
  9. data/Gemfile.lock +47 -47
  10. data/LICENSE +22 -22
  11. data/README.md +178 -178
  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 +31 -31
  16. data/lib/git-multirepo.rb +3 -3
  17. data/lib/multirepo/commands/add-command.rb +55 -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 +14 -14
  23. data/lib/multirepo/commands/do-command.rb +101 -101
  24. data/lib/multirepo/commands/init-command.rb +121 -121
  25. data/lib/multirepo/commands/inspect-command.rb +48 -48
  26. data/lib/multirepo/commands/install-command.rb +170 -170
  27. data/lib/multirepo/commands/merge-command.rb +251 -251
  28. data/lib/multirepo/commands/open-command.rb +55 -55
  29. data/lib/multirepo/commands/remove-command.rb +48 -48
  30. data/lib/multirepo/commands/uninit-command.rb +18 -18
  31. data/lib/multirepo/commands/update-command.rb +112 -112
  32. data/lib/multirepo/config.rb +19 -19
  33. data/lib/multirepo/files/config-entry.rb +39 -39
  34. data/lib/multirepo/files/config-file.rb +52 -52
  35. data/lib/multirepo/files/lock-entry.rb +29 -29
  36. data/lib/multirepo/files/lock-file.rb +62 -62
  37. data/lib/multirepo/files/meta-file.rb +51 -51
  38. data/lib/multirepo/files/tracking-file.rb +9 -9
  39. data/lib/multirepo/files/tracking-files.rb +64 -64
  40. data/lib/multirepo/git/branch.rb +32 -32
  41. data/lib/multirepo/git/change.rb +11 -11
  42. data/lib/multirepo/git/commit.rb +7 -7
  43. data/lib/multirepo/git/git-runner.rb +56 -56
  44. data/lib/multirepo/git/git.rb +10 -10
  45. data/lib/multirepo/git/ref.rb +38 -38
  46. data/lib/multirepo/git/remote.rb +17 -17
  47. data/lib/multirepo/git/repo.rb +129 -129
  48. data/lib/multirepo/hooks/post-commit-hook.rb +23 -23
  49. data/lib/multirepo/hooks/pre-commit-hook.rb +35 -35
  50. data/lib/multirepo/info.rb +5 -5
  51. data/lib/multirepo/logic/dependency.rb +6 -6
  52. data/lib/multirepo/logic/merge-descriptor.rb +95 -95
  53. data/lib/multirepo/logic/node.rb +75 -75
  54. data/lib/multirepo/logic/performer.rb +62 -62
  55. data/lib/multirepo/logic/repo-selection.rb +25 -25
  56. data/lib/multirepo/logic/revision-selection.rb +15 -15
  57. data/lib/multirepo/logic/revision-selector.rb +23 -23
  58. data/lib/multirepo/logic/version-comparer.rb +10 -10
  59. data/lib/multirepo/multirepo-exception.rb +6 -6
  60. data/lib/multirepo/output/extra-output.rb +12 -12
  61. data/lib/multirepo/output/teamcity-extra-output.rb +11 -11
  62. data/lib/multirepo/utility/console.rb +52 -52
  63. data/lib/multirepo/utility/popen-runner.rb +27 -27
  64. data/lib/multirepo/utility/system-runner.rb +14 -14
  65. data/lib/multirepo/utility/utils.rb +107 -107
  66. data/lib/multirepo/utility/verbosity.rb +6 -6
  67. data/resources/.gitconfig +2 -2
  68. data/resources/post-commit +0 -0
  69. data/resources/pre-commit +0 -0
  70. data/spec/integration/init_spec.rb +19 -19
  71. data/spec/spec_helper.rb +89 -89
  72. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 5ad6d2c08552b45aa55273d43af72fadb98c2e7a
4
- data.tar.gz: ea3133fff7c5a8e3a8d7485a94b0cce30264b21e
2
+ SHA256:
3
+ metadata.gz: b40cad2226c22a8f39e307fa8278d760119cbbb59c7ba6384f53fa33fbcfafd4
4
+ data.tar.gz: 96f73d4fd32a3ce810cea340219cc32d55300c5c596321cd52a74db00ec525d6
5
5
  SHA512:
6
- metadata.gz: e8436a2cdf77e0974dd22cb72f603d408356da6061a4f9473fc07860731b71edfa2c5cca36a88d4e29aa215ba76e0a43dec2d239e1aa0a8bbf62dbe3b99abe1e
7
- data.tar.gz: f1578fa69dfe4266cb1d1ea7904fe06eddd5522cc8c300d5c6d1aafbee0ccc822eaa5d95b0ee135ac39379ab26636725ce399062f80466f98e0f2d6dc20bcdc3
6
+ metadata.gz: 2307725527a45e3afe6178f565d067fdd1a002fc41faee989cb65dae9087fbbf24bf2755aecf3bd549ad73d13af9d573aa717febc0dcad6437474c37c633a2ac
7
+ data.tar.gz: 06b512f23d60bee2018e5c2c89f06e9d57b5c52630ec1550ddb3a1f501fce7e8fd4476666d76ce7acffc42598095eaa00984e085bf0bcd502f3735d18df60cc6
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,99 +1,107 @@
1
- ## Releases
2
-
3
- To install betas run `gem install git-multirepo --pre`
4
-
5
- ## 1.0.0.beta67
6
-
7
- * **Bug Fix:** Fix a crash related to the presence of trailing slashes in dependency paths
8
-
9
- ## 1.0.0.beta66
10
-
11
- * **Enhancement:** Add a `--no-ff` option to `multi merge` to optionally avoid fast-forwarding
12
-
13
- ## 1.0.0.beta65
14
-
15
- * **Removal:** The `graph` command was removed. It was unused and added an unnecessary dependency.
16
-
17
- ## 1.0.0.beta64
18
-
19
- * **Enhancement:** The branch command does not push by default anymore (helps avoid creating branches in wrong origins when setting up new projects)
20
-
21
- ## 1.0.0.beta63
22
-
23
- * **Bug Fix:** Remove some unnecessary debug console output
24
-
25
- ## 1.0.0.beta62
26
-
27
- * **Bug Fix:** Fix post-first-init commit
28
-
29
- ## 1.0.0.beta61
30
-
31
- * **Bug Fix:** Fix crasher in file permissions checking code
32
-
33
- ## 1.0.0.beta60
34
-
35
- * **Enhancement:** Implemented the `--force` option in `multi branch`
36
- * **Enhancement:** Prevent updating tracking files with an outdated version of the tool
37
- * **Bug Fix:** Fail gracefully in case of limited tracking file permissions
38
-
39
- ## 1.0.0.beta59
40
-
41
- * **Bug Fix:** Fix clone and install error when on-disk dependency directory case does not match
42
-
43
- ## 1.0.0.beta57
44
-
45
- * **Bug Fix:** Fixed error in multi install clone error message building
46
-
47
- ## 1.0.0.beta56
48
-
49
- * **Enhancement:** Using the `--extra-output` flag will output more CI server-specific info (checkout info, errors, etc.)
50
- * **Bug Fix:** Some config flags (such as `--verbose`) were reset when calling other commands internally
51
-
52
- ## 1.0.0.beta53
53
-
54
- * **Enhancement:** Added a `--extra-output` flag to output additional CI server-specific messages (such as TeamCity service messages)
55
-
56
- ## 1.0.0.beta52
57
-
58
- * **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
59
- * **Enhancement:** Added a `--force` flag to `multi checkout`, which ignores uncommitted changes
60
-
61
- ## 1.0.0.beta51
62
-
63
- * **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
64
- * **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
65
- * **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
66
- * **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
67
- * **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (`--deps`, `--main`, etc.)
68
-
69
- ## 1.0.0.beta50
70
-
71
- * **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
72
- * **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
73
- * **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
74
-
75
- ## 1.0.0.beta49
76
-
77
- * **Enhancement:** Added `--deps`, `--main` and `--all` flags to `multi update` and update all by default
78
- * **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
79
- * **Bug Fix:** "HEAD" was stored in the lock file instead of `nil` when in floating HEAD, which caused some operations to have unexpected results
80
- * **Bug Fix:** Incorrect default behavior for `multi open` (now defaults to "all")
81
-
82
- ## 1.0.0.beta48
83
-
84
- * **New:** `multi update` now updates tracking files in subdependencies
85
- * **Enhancement:** Manual and automated code refactorings using RuboCop
86
-
87
- ## 1.0.0.beta47
88
-
89
- * **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)
90
-
91
- ## 1.0.0.beta46
92
-
93
- * **Enhancement:** Better `multi install --ci` output
94
- * **Enhancement:** Not requiring a multirepo-enabled repo in InspectCommand, else it's not very useful to inspect random repos
95
- * **Bug Fix:** Fixed exception in `multi do` when providing only the `--help` flag
96
-
97
- ## 1.0.0.beta45 and earlier
98
-
99
- 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.beta69
6
+
7
+ * **Bug Fix:** The `add` command ensures that added repos' paths have a trailing slash (avoids some nasty issues)
8
+
9
+ ## 1.0.0.beta68
10
+
11
+ * **Bug Fix:** Fix a regression that prevented many commands from running
12
+
13
+ ## 1.0.0.beta67
14
+
15
+ * **Bug Fix:** Fix a crash related to the presence of trailing slashes in dependency paths
16
+
17
+ ## 1.0.0.beta66
18
+
19
+ * **Enhancement:** Add a `--no-ff` option to `multi merge` to optionally avoid fast-forwarding
20
+
21
+ ## 1.0.0.beta65
22
+
23
+ * **Removal:** The `graph` command was removed. It was unused and added an unnecessary dependency.
24
+
25
+ ## 1.0.0.beta64
26
+
27
+ * **Enhancement:** The branch command does not push by default anymore (helps avoid creating branches in wrong origins when setting up new projects)
28
+
29
+ ## 1.0.0.beta63
30
+
31
+ * **Bug Fix:** Remove some unnecessary debug console output
32
+
33
+ ## 1.0.0.beta62
34
+
35
+ * **Bug Fix:** Fix post-first-init commit
36
+
37
+ ## 1.0.0.beta61
38
+
39
+ * **Bug Fix:** Fix crasher in file permissions checking code
40
+
41
+ ## 1.0.0.beta60
42
+
43
+ * **Enhancement:** Implemented the `--force` option in `multi branch`
44
+ * **Enhancement:** Prevent updating tracking files with an outdated version of the tool
45
+ * **Bug Fix:** Fail gracefully in case of limited tracking file permissions
46
+
47
+ ## 1.0.0.beta59
48
+
49
+ * **Bug Fix:** Fix clone and install error when on-disk dependency directory case does not match
50
+
51
+ ## 1.0.0.beta57
52
+
53
+ * **Bug Fix:** Fixed error in multi install clone error message building
54
+
55
+ ## 1.0.0.beta56
56
+
57
+ * **Enhancement:** Using the `--extra-output` flag will output more CI server-specific info (checkout info, errors, etc.)
58
+ * **Bug Fix:** Some config flags (such as `--verbose`) were reset when calling other commands internally
59
+
60
+ ## 1.0.0.beta53
61
+
62
+ * **Enhancement:** Added a `--extra-output` flag to output additional CI server-specific messages (such as TeamCity service messages)
63
+
64
+ ## 1.0.0.beta52
65
+
66
+ * **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
67
+ * **Enhancement:** Added a `--force` flag to `multi checkout`, which ignores uncommitted changes
68
+
69
+ ## 1.0.0.beta51
70
+
71
+ * **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
72
+ * **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
73
+ * **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
74
+ * **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
75
+ * **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (`--deps`, `--main`, etc.)
76
+
77
+ ## 1.0.0.beta50
78
+
79
+ * **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
80
+ * **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
81
+ * **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
82
+
83
+ ## 1.0.0.beta49
84
+
85
+ * **Enhancement:** Added `--deps`, `--main` and `--all` flags to `multi update` and update all by default
86
+ * **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
87
+ * **Bug Fix:** "HEAD" was stored in the lock file instead of `nil` when in floating HEAD, which caused some operations to have unexpected results
88
+ * **Bug Fix:** Incorrect default behavior for `multi open` (now defaults to "all")
89
+
90
+ ## 1.0.0.beta48
91
+
92
+ * **New:** `multi update` now updates tracking files in subdependencies
93
+ * **Enhancement:** Manual and automated code refactorings using RuboCop
94
+
95
+ ## 1.0.0.beta47
96
+
97
+ * **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)
98
+
99
+ ## 1.0.0.beta46
100
+
101
+ * **Enhancement:** Better `multi install --ci` output
102
+ * **Enhancement:** Not requiring a multirepo-enabled repo in InspectCommand, else it's not very useful to inspect random repos
103
+ * **Bug Fix:** Fixed exception in `multi do` when providing only the `--help` flag
104
+
105
+ ## 1.0.0.beta45 and earlier
106
+
107
+ Refer to the commit history for details on earlier versions of git-multirepo.