git-multirepo 1.0.0.beta40 → 1.0.0.beta42
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitattributes +2 -2
- data/.gitbugtraq +3 -3
- data/.gitignore +38 -38
- data/.multirepo.meta +2 -2
- data/.rspec +2 -2
- data/Gemfile +4 -4
- data/Gemfile.lock +42 -42
- data/LICENSE +22 -22
- data/README.md +143 -146
- data/Rakefile +2 -2
- data/bin/multi +10 -10
- data/docs/bug-repros/91565510-repro.sh +20 -20
- data/docs/git-multirepo-cheatsheet.docx +0 -0
- data/git-multirepo.gemspec +31 -31
- data/lib/commands.rb +13 -15
- data/lib/git-multirepo.rb +2 -2
- data/lib/info.rb +4 -4
- data/lib/multirepo/commands/add-command.rb +50 -53
- data/lib/multirepo/commands/branch-command.rb +81 -82
- data/lib/multirepo/commands/checkout-command.rb +119 -122
- data/lib/multirepo/commands/clone-command.rb +67 -70
- data/lib/multirepo/commands/command.rb +89 -75
- data/lib/multirepo/commands/do-command.rb +100 -75
- data/lib/multirepo/commands/graph-command.rb +42 -45
- data/lib/multirepo/commands/init-command.rb +119 -119
- data/lib/multirepo/commands/install-command.rb +106 -103
- data/lib/multirepo/commands/merge-command.rb +225 -167
- data/lib/multirepo/commands/open-command.rb +55 -57
- data/lib/multirepo/commands/remove-command.rb +47 -50
- data/lib/multirepo/commands/uninit-command.rb +17 -20
- data/lib/multirepo/commands/update-command.rb +55 -60
- data/lib/multirepo/config.rb +15 -15
- data/lib/multirepo/files/config-entry.rb +38 -38
- data/lib/multirepo/files/config-file.rb +45 -45
- data/lib/multirepo/files/lock-entry.rb +28 -24
- data/lib/multirepo/files/lock-file.rb +55 -38
- data/lib/multirepo/files/meta-file.rb +40 -40
- data/lib/multirepo/files/tracking-file.rb +8 -8
- data/lib/multirepo/files/tracking-files.rb +46 -46
- data/lib/multirepo/git/branch.rb +31 -30
- data/lib/multirepo/git/change.rb +10 -10
- data/lib/multirepo/git/commit.rb +6 -17
- data/lib/multirepo/git/git-runner.rb +46 -46
- data/lib/multirepo/git/git.rb +10 -0
- data/lib/multirepo/git/ref.rb +38 -0
- data/lib/multirepo/git/remote.rb +16 -16
- data/lib/multirepo/git/repo.rb +122 -77
- data/lib/multirepo/hooks/post-commit-hook.rb +22 -22
- data/lib/multirepo/hooks/pre-commit-hook.rb +34 -31
- data/lib/multirepo/logic/dependency.rb +6 -0
- data/lib/multirepo/logic/merge-descriptor.rb +94 -12
- data/lib/multirepo/logic/node.rb +71 -44
- data/lib/multirepo/logic/performer.rb +56 -62
- data/lib/multirepo/logic/revision-selector.rb +34 -34
- data/lib/multirepo/multirepo-exception.rb +5 -5
- data/lib/multirepo/utility/console.rb +51 -51
- data/lib/multirepo/utility/runner.rb +34 -34
- data/lib/multirepo/utility/utils.rb +94 -81
- data/resources/.gitconfig +2 -2
- data/resources/post-commit +5 -5
- data/resources/pre-commit +5 -5
- data/spec/integration/init_spec.rb +18 -18
- data/spec/spec_helper.rb +89 -89
- metadata +6 -5
- data/lib/multirepo/commands/clean-command.rb +0 -32
- data/lib/multirepo/commands/fetch-command.rb +0 -31
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git-multirepo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.0.
|
4
|
+
version: 1.0.0.beta42
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michaël Fortin
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-05-
|
11
|
+
date: 2015-05-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -161,11 +161,9 @@ files:
|
|
161
161
|
- lib/multirepo/commands/add-command.rb
|
162
162
|
- lib/multirepo/commands/branch-command.rb
|
163
163
|
- lib/multirepo/commands/checkout-command.rb
|
164
|
-
- lib/multirepo/commands/clean-command.rb
|
165
164
|
- lib/multirepo/commands/clone-command.rb
|
166
165
|
- lib/multirepo/commands/command.rb
|
167
166
|
- lib/multirepo/commands/do-command.rb
|
168
|
-
- lib/multirepo/commands/fetch-command.rb
|
169
167
|
- lib/multirepo/commands/graph-command.rb
|
170
168
|
- lib/multirepo/commands/init-command.rb
|
171
169
|
- lib/multirepo/commands/install-command.rb
|
@@ -186,10 +184,13 @@ files:
|
|
186
184
|
- lib/multirepo/git/change.rb
|
187
185
|
- lib/multirepo/git/commit.rb
|
188
186
|
- lib/multirepo/git/git-runner.rb
|
187
|
+
- lib/multirepo/git/git.rb
|
188
|
+
- lib/multirepo/git/ref.rb
|
189
189
|
- lib/multirepo/git/remote.rb
|
190
190
|
- lib/multirepo/git/repo.rb
|
191
191
|
- lib/multirepo/hooks/post-commit-hook.rb
|
192
192
|
- lib/multirepo/hooks/pre-commit-hook.rb
|
193
|
+
- lib/multirepo/logic/dependency.rb
|
193
194
|
- lib/multirepo/logic/merge-descriptor.rb
|
194
195
|
- lib/multirepo/logic/node.rb
|
195
196
|
- lib/multirepo/logic/performer.rb
|
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
223
224
|
version: 1.3.1
|
224
225
|
requirements: []
|
225
226
|
rubyforge_project:
|
226
|
-
rubygems_version: 2.
|
227
|
+
rubygems_version: 2.0.14
|
227
228
|
signing_key:
|
228
229
|
specification_version: 4
|
229
230
|
summary: Track multiple Git repositories side-by-side
|
@@ -1,32 +0,0 @@
|
|
1
|
-
require "multirepo/utility/console"
|
2
|
-
|
3
|
-
module MultiRepo
|
4
|
-
class CleanCommand < Command
|
5
|
-
self.command = "clean"
|
6
|
-
self.summary = "Performs a 'git clean -df' on the main repo and all dependencies."
|
7
|
-
|
8
|
-
def run
|
9
|
-
super
|
10
|
-
ensure_in_work_tree
|
11
|
-
ensure_multirepo_enabled
|
12
|
-
|
13
|
-
Console.log_step("Fetching dependencies...")
|
14
|
-
|
15
|
-
Console.log_substep("Cleaning main repo...")
|
16
|
-
clean(".")
|
17
|
-
|
18
|
-
ConfigFile.new(".").load_entries.each do |entry|
|
19
|
-
Console.log_substep("Cleaning #{entry.repo.path} ...")
|
20
|
-
clean(entry.repo.path)
|
21
|
-
end
|
22
|
-
|
23
|
-
Console.log_step("Done!")
|
24
|
-
rescue MultiRepoException => e
|
25
|
-
Console.log_error(e.message)
|
26
|
-
end
|
27
|
-
|
28
|
-
def clean(repo_path)
|
29
|
-
GitRunner.run_in_working_dir(repo_path, "clean -df", Runner::Verbosity::OUTPUT_ALWAYS)
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
require "multirepo/utility/console"
|
2
|
-
|
3
|
-
module MultiRepo
|
4
|
-
class FetchCommand < Command
|
5
|
-
self.command = "fetch"
|
6
|
-
self.summary = "Performs a git fetch on all dependencies."
|
7
|
-
|
8
|
-
def run
|
9
|
-
super
|
10
|
-
ensure_in_work_tree
|
11
|
-
ensure_multirepo_enabled
|
12
|
-
|
13
|
-
Console.log_step("Fetching main repo...")
|
14
|
-
|
15
|
-
main_repo = Repo.new(".")
|
16
|
-
Console.log_substep("Fetching from #{main_repo.remote('origin').url}...")
|
17
|
-
main_repo.fetch
|
18
|
-
|
19
|
-
Console.log_step("Fetching dependencies...")
|
20
|
-
|
21
|
-
ConfigFile.new(".").load_entries.each do |entry|
|
22
|
-
Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
|
23
|
-
entry.repo.fetch
|
24
|
-
end
|
25
|
-
|
26
|
-
Console.log_step("Done!")
|
27
|
-
rescue MultiRepoException => e
|
28
|
-
Console.log_error(e.message)
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|