git-multirepo 1.0.0.beta56 → 1.0.0.beta57

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 +2 -2
  3. data/.gitbugtraq +3 -3
  4. data/.gitignore +38 -38
  5. data/.multirepo.meta +2 -2
  6. data/.rspec +2 -2
  7. data/.rubocop.yml +79 -79
  8. data/CHANGELOG.md +61 -57
  9. data/Gemfile +4 -4
  10. data/Gemfile.lock +42 -42
  11. data/LICENSE +22 -22
  12. data/README.md +179 -178
  13. data/Rakefile +1 -1
  14. data/bin/multi +11 -11
  15. data/docs/bug-repros/91565510-repro.sh +20 -20
  16. data/git-multirepo.gemspec +31 -31
  17. data/lib/git-multirepo.rb +3 -3
  18. data/lib/multirepo/commands/add-command.rb +51 -51
  19. data/lib/multirepo/commands/branch-command.rb +82 -82
  20. data/lib/multirepo/commands/checkout-command.rb +127 -127
  21. data/lib/multirepo/commands/clone-command.rb +68 -68
  22. data/lib/multirepo/commands/command.rb +87 -87
  23. data/lib/multirepo/commands/commands.rb +15 -15
  24. data/lib/multirepo/commands/do-command.rb +101 -101
  25. data/lib/multirepo/commands/graph-command.rb +43 -43
  26. data/lib/multirepo/commands/init-command.rb +121 -121
  27. data/lib/multirepo/commands/inspect-command.rb +48 -48
  28. data/lib/multirepo/commands/install-command.rb +161 -161
  29. data/lib/multirepo/commands/merge-command.rb +249 -249
  30. data/lib/multirepo/commands/open-command.rb +55 -55
  31. data/lib/multirepo/commands/remove-command.rb +48 -48
  32. data/lib/multirepo/commands/uninit-command.rb +18 -18
  33. data/lib/multirepo/commands/update-command.rb +112 -112
  34. data/lib/multirepo/config.rb +19 -19
  35. data/lib/multirepo/files/config-entry.rb +39 -39
  36. data/lib/multirepo/files/config-file.rb +46 -46
  37. data/lib/multirepo/files/lock-entry.rb +29 -29
  38. data/lib/multirepo/files/lock-file.rb +56 -56
  39. data/lib/multirepo/files/meta-file.rb +41 -41
  40. data/lib/multirepo/files/tracking-file.rb +9 -9
  41. data/lib/multirepo/files/tracking-files.rb +47 -47
  42. data/lib/multirepo/git/branch.rb +32 -32
  43. data/lib/multirepo/git/change.rb +11 -11
  44. data/lib/multirepo/git/commit.rb +7 -7
  45. data/lib/multirepo/git/git-runner.rb +56 -56
  46. data/lib/multirepo/git/git.rb +10 -10
  47. data/lib/multirepo/git/ref.rb +38 -38
  48. data/lib/multirepo/git/remote.rb +17 -17
  49. data/lib/multirepo/git/repo.rb +129 -129
  50. data/lib/multirepo/hooks/post-commit-hook.rb +23 -23
  51. data/lib/multirepo/hooks/pre-commit-hook.rb +35 -35
  52. data/lib/multirepo/info.rb +5 -5
  53. data/lib/multirepo/logic/dependency.rb +6 -6
  54. data/lib/multirepo/logic/merge-descriptor.rb +95 -95
  55. data/lib/multirepo/logic/node.rb +72 -72
  56. data/lib/multirepo/logic/performer.rb +55 -55
  57. data/lib/multirepo/logic/repo-selection.rb +25 -25
  58. data/lib/multirepo/logic/revision-selection.rb +15 -15
  59. data/lib/multirepo/logic/revision-selector.rb +23 -23
  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 +6 -6
  70. data/resources/pre-commit +6 -6
  71. data/spec/integration/init_spec.rb +19 -19
  72. data/spec/spec_helper.rb +89 -89
  73. metadata +3 -3
@@ -1,72 +1,72 @@
1
- require "multirepo/files/config-file"
2
-
3
- module MultiRepo
4
- class Node
5
- attr_accessor :path
6
- attr_accessor :depth
7
- attr_accessor :parent
8
-
9
- def initialize(path, parent = nil, depth = 0)
10
- @path = path
11
- @depth = depth
12
- @parent = parent
13
- end
14
-
15
- def name
16
- Pathname.new(File.expand_path(@path)).basename.to_s
17
- end
18
-
19
- def children
20
- return [] unless Utils.multirepo_enabled?(@path)
21
- config_entries = ConfigFile.new(@path).load_entries
22
- return config_entries.map { |e| Node.new(e.path, self, @depth + 1) }
23
- end
24
-
25
- def ordered_descendants_including_self
26
- return ordered_descendants.push(self)
27
- end
28
-
29
- def ordered_descendants
30
- descendants = find_descendants_recursive(self)
31
-
32
- unique_paths = descendants.map(&:path).uniq
33
- unique_nodes = unique_paths.collect do |path|
34
- nodes_for_path = descendants.select { |d| d.path == path }
35
- next nodes_for_path.sort_by(&:depth).first
36
- end
37
-
38
- return unique_nodes.sort_by(&:depth).reverse
39
- end
40
-
41
- def find_descendants_recursive(node)
42
- ensure_no_dependency_cycle(node)
43
-
44
- descendants = node.children
45
- descendants.each { |d| descendants.push(*find_descendants_recursive(d)) }
46
- return descendants
47
- end
48
-
49
- def ensure_no_dependency_cycle(node)
50
- parent = node.parent
51
- visited = []
52
- while parent
53
- visited.push(parent)
54
- if parent == node
55
- Console.log_warning("Dependency cycle detected:")
56
- visited.reverse.each_with_index do |n, i|
57
- description = "[first]" if i == visited.count - 1
58
- description = "itself" if visited.count == 1
59
- Console.log_warning("'#{n.path}' depends on #{description}")
60
- end
61
- fail MultiRepoException, "Dependency cycles are not supported by multirepo."
62
- end
63
- parent = parent.parent # Will eventually be nil (root node), which will break out of the loop
64
- end
65
- end
66
-
67
- def ==(other)
68
- other.class == self.class &&
69
- other.path == @path
70
- end
71
- end
72
- end
1
+ require "multirepo/files/config-file"
2
+
3
+ module MultiRepo
4
+ class Node
5
+ attr_accessor :path
6
+ attr_accessor :depth
7
+ attr_accessor :parent
8
+
9
+ def initialize(path, parent = nil, depth = 0)
10
+ @path = path
11
+ @depth = depth
12
+ @parent = parent
13
+ end
14
+
15
+ def name
16
+ Pathname.new(File.expand_path(@path)).basename.to_s
17
+ end
18
+
19
+ def children
20
+ return [] unless Utils.multirepo_enabled?(@path)
21
+ config_entries = ConfigFile.new(@path).load_entries
22
+ return config_entries.map { |e| Node.new(e.path, self, @depth + 1) }
23
+ end
24
+
25
+ def ordered_descendants_including_self
26
+ return ordered_descendants.push(self)
27
+ end
28
+
29
+ def ordered_descendants
30
+ descendants = find_descendants_recursive(self)
31
+
32
+ unique_paths = descendants.map(&:path).uniq
33
+ unique_nodes = unique_paths.collect do |path|
34
+ nodes_for_path = descendants.select { |d| d.path == path }
35
+ next nodes_for_path.sort_by(&:depth).first
36
+ end
37
+
38
+ return unique_nodes.sort_by(&:depth).reverse
39
+ end
40
+
41
+ def find_descendants_recursive(node)
42
+ ensure_no_dependency_cycle(node)
43
+
44
+ descendants = node.children
45
+ descendants.each { |d| descendants.push(*find_descendants_recursive(d)) }
46
+ return descendants
47
+ end
48
+
49
+ def ensure_no_dependency_cycle(node)
50
+ parent = node.parent
51
+ visited = []
52
+ while parent
53
+ visited.push(parent)
54
+ if parent == node
55
+ Console.log_warning("Dependency cycle detected:")
56
+ visited.reverse.each_with_index do |n, i|
57
+ description = "[first]" if i == visited.count - 1
58
+ description = "itself" if visited.count == 1
59
+ Console.log_warning("'#{n.path}' depends on #{description}")
60
+ end
61
+ fail MultiRepoException, "Dependency cycles are not supported by multirepo."
62
+ end
63
+ parent = parent.parent # Will eventually be nil (root node), which will break out of the loop
64
+ end
65
+ end
66
+
67
+ def ==(other)
68
+ other.class == self.class &&
69
+ other.path == @path
70
+ end
71
+ end
72
+ end
@@ -1,55 +1,55 @@
1
- require "multirepo/files/config-file"
2
- require "multirepo/files/lock-file"
3
-
4
- require_relative "dependency"
5
-
6
- module MultiRepo
7
- class Performer
8
- def self.perform_main_repo_checkout(main_repo, ref_name, force = false, message = nil)
9
- # Make sure the main repo is clean before attempting a checkout
10
- unless force || main_repo.clean?
11
- fail MultiRepoException, "Can't checkout #{ref_name} because the main repo contains uncommitted changes"
12
- end
13
-
14
- # Checkout the specified ref
15
- unless main_repo.checkout(ref_name)
16
- fail MultiRepoException, "Couldn't perform checkout of main repo #{ref_name}!"
17
- end
18
-
19
- Console.log_substep(message || "Checked out main repo #{ref_name}")
20
-
21
- # After checkout, make sure we're working with a multirepo-enabled ref
22
- unless Utils.multirepo_tracked?(".")
23
- fail MultiRepoException, "Revision #{ref_name} is not tracked by multirepo!"
24
- end
25
- end
26
-
27
- def self.dependencies
28
- config_entries = ConfigFile.new(".").load_entries
29
- lock_entries = LockFile.new(".").load_entries
30
-
31
- dependencies = build_dependencies(config_entries, lock_entries)
32
- dependency_ordered_nodes = Node.new(".").ordered_descendants
33
-
34
- return dependency_ordered_nodes.map do |node|
35
- dependencies.find { |d| d.config_entry.path == node.path }
36
- end
37
- end
38
-
39
- def self.build_dependencies(config_entries, lock_entries)
40
- lock_entries.map do |lock_entry|
41
- config_entry = config_entry_for_lock_entry(config_entries, lock_entry)
42
-
43
- dependency = Dependency.new
44
- dependency.config_entry = config_entry
45
- dependency.lock_entry = lock_entry
46
-
47
- next dependency
48
- end
49
- end
50
-
51
- def self.config_entry_for_lock_entry(config_entries, lock_entry)
52
- config_entries.find { |config_entry| config_entry.id == lock_entry.id }
53
- end
54
- end
55
- end
1
+ require "multirepo/files/config-file"
2
+ require "multirepo/files/lock-file"
3
+
4
+ require_relative "dependency"
5
+
6
+ module MultiRepo
7
+ class Performer
8
+ def self.perform_main_repo_checkout(main_repo, ref_name, force = false, message = nil)
9
+ # Make sure the main repo is clean before attempting a checkout
10
+ unless force || main_repo.clean?
11
+ fail MultiRepoException, "Can't checkout #{ref_name} because the main repo contains uncommitted changes"
12
+ end
13
+
14
+ # Checkout the specified ref
15
+ unless main_repo.checkout(ref_name)
16
+ fail MultiRepoException, "Couldn't perform checkout of main repo #{ref_name}!"
17
+ end
18
+
19
+ Console.log_substep(message || "Checked out main repo #{ref_name}")
20
+
21
+ # After checkout, make sure we're working with a multirepo-enabled ref
22
+ unless Utils.multirepo_tracked?(".")
23
+ fail MultiRepoException, "Revision #{ref_name} is not tracked by multirepo!"
24
+ end
25
+ end
26
+
27
+ def self.dependencies
28
+ config_entries = ConfigFile.new(".").load_entries
29
+ lock_entries = LockFile.new(".").load_entries
30
+
31
+ dependencies = build_dependencies(config_entries, lock_entries)
32
+ dependency_ordered_nodes = Node.new(".").ordered_descendants
33
+
34
+ return dependency_ordered_nodes.map do |node|
35
+ dependencies.find { |d| d.config_entry.path == node.path }
36
+ end
37
+ end
38
+
39
+ def self.build_dependencies(config_entries, lock_entries)
40
+ lock_entries.map do |lock_entry|
41
+ config_entry = config_entry_for_lock_entry(config_entries, lock_entry)
42
+
43
+ dependency = Dependency.new
44
+ dependency.config_entry = config_entry
45
+ dependency.lock_entry = lock_entry
46
+
47
+ next dependency
48
+ end
49
+ end
50
+
51
+ def self.config_entry_for_lock_entry(config_entries, lock_entry)
52
+ config_entries.find { |config_entry| config_entry.id == lock_entry.id }
53
+ end
54
+ end
55
+ end
@@ -1,25 +1,25 @@
1
- require "multirepo/utility/utils"
2
-
3
- module MultiRepo
4
- class RepoSelection
5
- ALL = 0
6
- MAIN = 1
7
- DEPS = 2
8
-
9
- def initialize(argv)
10
- @main = argv.flag?("main")
11
- @deps = argv.flag?("deps")
12
- @all = argv.flag?("all")
13
- end
14
-
15
- def valid?
16
- Utils.only_one_true?(@main, @deps, @all)
17
- end
18
-
19
- def value
20
- return MAIN if @main
21
- return DEPS if @deps
22
- return ALL # Default if unspecified
23
- end
24
- end
25
- end
1
+ require "multirepo/utility/utils"
2
+
3
+ module MultiRepo
4
+ class RepoSelection
5
+ ALL = 0
6
+ MAIN = 1
7
+ DEPS = 2
8
+
9
+ def initialize(argv)
10
+ @main = argv.flag?("main")
11
+ @deps = argv.flag?("deps")
12
+ @all = argv.flag?("all")
13
+ end
14
+
15
+ def valid?
16
+ Utils.only_one_true?(@main, @deps, @all)
17
+ end
18
+
19
+ def value
20
+ return MAIN if @main
21
+ return DEPS if @deps
22
+ return ALL # Default if unspecified
23
+ end
24
+ end
25
+ end
@@ -1,15 +1,15 @@
1
- module MultiRepo
2
- class RevisionSelection
3
- AS_LOCK = 0
4
- LATEST = 1
5
- EXACT = 2
6
-
7
- def self.name_for_mode(mode)
8
- case mode
9
- when AS_LOCK then "as-lock"
10
- when LATEST then "latest"
11
- when EXACT then "exact"
12
- end
13
- end
14
- end
15
- end
1
+ module MultiRepo
2
+ class RevisionSelection
3
+ AS_LOCK = 0
4
+ LATEST = 1
5
+ EXACT = 2
6
+
7
+ def self.name_for_mode(mode)
8
+ case mode
9
+ when AS_LOCK then "as-lock"
10
+ when LATEST then "latest"
11
+ when EXACT then "exact"
12
+ end
13
+ end
14
+ end
15
+ end
@@ -1,23 +1,23 @@
1
- require_relative "revision-selection"
2
-
3
- module MultiRepo
4
- class RevisionSelector
5
- def self.mode_for_args(checkout_latest, checkout_exact)
6
- if checkout_latest
7
- RevisionSelection::LATEST
8
- elsif checkout_exact
9
- RevisionSelection::EXACT
10
- else
11
- RevisionSelection::AS_LOCK
12
- end
13
- end
14
-
15
- def self.revision_for_mode(mode, ref_name, lock_entry)
16
- case mode
17
- when RevisionSelection::AS_LOCK then lock_entry.head
18
- when RevisionSelection::LATEST then lock_entry.branch
19
- when RevisionSelection::EXACT then ref_name
20
- end
21
- end
22
- end
23
- end
1
+ require_relative "revision-selection"
2
+
3
+ module MultiRepo
4
+ class RevisionSelector
5
+ def self.mode_for_args(checkout_latest, checkout_exact)
6
+ if checkout_latest
7
+ RevisionSelection::LATEST
8
+ elsif checkout_exact
9
+ RevisionSelection::EXACT
10
+ else
11
+ RevisionSelection::AS_LOCK
12
+ end
13
+ end
14
+
15
+ def self.revision_for_mode(mode, ref_name, lock_entry)
16
+ case mode
17
+ when RevisionSelection::AS_LOCK then lock_entry.head
18
+ when RevisionSelection::LATEST then lock_entry.branch
19
+ when RevisionSelection::EXACT then ref_name
20
+ end
21
+ end
22
+ end
23
+ end
@@ -1,6 +1,6 @@
1
- require "claide/informative_error"
2
-
3
- module MultiRepo
4
- class MultiRepoException < StandardError
5
- end
6
- end
1
+ require "claide/informative_error"
2
+
3
+ module MultiRepo
4
+ class MultiRepoException < StandardError
5
+ end
6
+ end
@@ -1,12 +1,12 @@
1
- require_relative "teamcity-extra-output"
2
-
3
- module MultiRepo
4
- class ExtraOutput < BasicObject
5
- def self.method_missing(sym, *args, &block)
6
- output = case Config.instance.extra_output
7
- when "teamcity"; TeamCityExtraOutput.new
8
- end
9
- output.send(sym, *args, &block) if output
10
- end
11
- end
12
- end
1
+ require_relative "teamcity-extra-output"
2
+
3
+ module MultiRepo
4
+ class ExtraOutput < BasicObject
5
+ def self.method_missing(sym, *args, &block)
6
+ output = case Config.instance.extra_output
7
+ when "teamcity"; TeamCityExtraOutput.new
8
+ end
9
+ output.send(sym, *args, &block) if output
10
+ end
11
+ end
12
+ end
@@ -1,11 +1,11 @@
1
- module MultiRepo
2
- class TeamCityExtraOutput
3
- def progress(message)
4
- puts "##teamcity[progressMessage '#{message}']"
5
- end
6
-
7
- def error(message)
8
- puts "##teamcity[buildProblem description='#{message}']"
9
- end
10
- end
11
- end
1
+ module MultiRepo
2
+ class TeamCityExtraOutput
3
+ def progress(message)
4
+ puts "##teamcity[progressMessage '#{message}']"
5
+ end
6
+
7
+ def error(message)
8
+ puts "##teamcity[buildProblem description='#{message}']"
9
+ end
10
+ end
11
+ end