autoproj 1.7.19.rc2 → 1.7.19
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.
- data/History.txt +3 -2
- data/lib/autoproj/cmdline.rb +4 -4
- data/lib/autoproj/version.rb +1 -1
- metadata +8 -12
data/History.txt
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
= Version 1.7.19
|
|
2
|
-
* use different colors for remote-only and local-only commits
|
|
2
|
+
* use different colors for remote-only and local-only commits in autoproj
|
|
3
|
+
status
|
|
3
4
|
* fix some issues with handling of osdeps vs. exclusion/ignore handling
|
|
4
|
-
* fix handling of optional dependencies osdeps
|
|
5
|
+
* fix handling of optional dependencies that are provided by osdeps
|
|
5
6
|
|
|
6
7
|
= Version 1.7.18
|
|
7
8
|
* properly detect and report circular dependencies
|
data/lib/autoproj/cmdline.rb
CHANGED
|
@@ -1197,12 +1197,12 @@ where 'mode' is one of:
|
|
|
1197
1197
|
when Autobuild::Importer::Status::NEEDS_MERGE
|
|
1198
1198
|
result.local = true
|
|
1199
1199
|
result.remote = true
|
|
1200
|
-
lines <<
|
|
1201
|
-
lines << " -- local commits --"
|
|
1200
|
+
lines << " local and remote have diverged with respectively #{status.local_commits.size} and #{status.remote_commits.size} commits each"
|
|
1201
|
+
lines << Autoproj.color(" -- local commits --", :blue)
|
|
1202
1202
|
status.local_commits.each do |line|
|
|
1203
|
-
lines << Autoproj.color(" #{line}", :
|
|
1203
|
+
lines << Autoproj.color(" #{line}", :blue)
|
|
1204
1204
|
end
|
|
1205
|
-
lines << " -- remote commits --"
|
|
1205
|
+
lines << Autoproj.color(" -- remote commits --", :magenta)
|
|
1206
1206
|
status.remote_commits.each do |line|
|
|
1207
1207
|
lines << Autoproj.color(" #{line}", :magenta)
|
|
1208
1208
|
end
|
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: autoproj
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
5
|
-
prerelease:
|
|
4
|
+
hash: 45
|
|
5
|
+
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 1
|
|
8
8
|
- 7
|
|
9
9
|
- 19
|
|
10
|
-
|
|
11
|
-
- 2
|
|
12
|
-
version: 1.7.19.rc2
|
|
10
|
+
version: 1.7.19
|
|
13
11
|
platform: ruby
|
|
14
12
|
authors:
|
|
15
13
|
- Sylvain Joyeux
|
|
@@ -17,7 +15,7 @@ autorequire:
|
|
|
17
15
|
bindir: bin
|
|
18
16
|
cert_chain: []
|
|
19
17
|
|
|
20
|
-
date: 2012-02-
|
|
18
|
+
date: 2012-02-25 00:00:00 Z
|
|
21
19
|
dependencies:
|
|
22
20
|
- !ruby/object:Gem::Dependency
|
|
23
21
|
name: autobuild
|
|
@@ -188,14 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
188
186
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
189
187
|
none: false
|
|
190
188
|
requirements:
|
|
191
|
-
- - "
|
|
189
|
+
- - ">="
|
|
192
190
|
- !ruby/object:Gem::Version
|
|
193
|
-
hash:
|
|
191
|
+
hash: 3
|
|
194
192
|
segments:
|
|
195
|
-
-
|
|
196
|
-
|
|
197
|
-
- 1
|
|
198
|
-
version: 1.3.1
|
|
193
|
+
- 0
|
|
194
|
+
version: "0"
|
|
199
195
|
requirements: []
|
|
200
196
|
|
|
201
197
|
rubyforge_project: autobuild
|