origen 0.7.11 → 0.7.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen/application.rb +2 -2
- data/lib/origen/commands/rc.rb +3 -3
- data/templates/git/gitignore.erb +6 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 33946b9e75374a0ba93e52a3923251d6c16e6a43
|
|
4
|
+
data.tar.gz: 37fe2e0d1c5881fe7f2ec06374d23febf07c16f7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 377a04b40b24eb727493cbfa2783fd29815ac116a18aaa906bb2f1909f6ba8034e61595fc885979fbd6b6c54c495e5440d387b8207fcace71b3769aa85d4e96e
|
|
7
|
+
data.tar.gz: 0e3855b23ad1d6767f7d5547cf365b94d6b1e7e91b0c506f11a7d6b46bff0f9bd6ca1fe1f4b0a54d8e51e96971190e1d0a33533cee761a1899f621ba92138249
|
data/config/version.rb
CHANGED
data/lib/origen/application.rb
CHANGED
|
@@ -100,7 +100,7 @@ module Origen
|
|
|
100
100
|
# as defined by Origen.app.config.rc_url. If the revision control URL has not been
|
|
101
101
|
# defined, or it does not resolve to a recognized revision control system, then this
|
|
102
102
|
# method will return nil.
|
|
103
|
-
def revision_controller
|
|
103
|
+
def revision_controller(options = {})
|
|
104
104
|
if current?
|
|
105
105
|
if config.rc_url
|
|
106
106
|
if config.rc_url =~ /^sync:/
|
|
@@ -113,7 +113,7 @@ module Origen
|
|
|
113
113
|
local: root,
|
|
114
114
|
# If a workspace is based on a fork of the master repo, config.rc_url may not
|
|
115
115
|
# be correct
|
|
116
|
-
remote: RevisionControl::Git.origin || config.rc_url
|
|
116
|
+
remote: (options[:uninitialized] ? config.rc_url : (RevisionControl::Git.origin || config.rc_url))
|
|
117
117
|
)
|
|
118
118
|
|
|
119
119
|
end
|
data/lib/origen/commands/rc.rb
CHANGED
|
@@ -426,10 +426,10 @@ The following options are available:
|
|
|
426
426
|
options[:comment] ||= 'Initial'
|
|
427
427
|
options[:unmanaged] = true
|
|
428
428
|
options[:initial] = true
|
|
429
|
-
if Origen.app.rc.git?
|
|
430
|
-
Origen.app.rc.send(:create_gitignore) unless File.exist?("#{Origen.root}/.gitignore")
|
|
429
|
+
if Origen.app.rc(uninitialized: true).git?
|
|
430
|
+
Origen.app.rc(uninitialized: true).send(:create_gitignore) unless File.exist?("#{Origen.root}/.gitignore")
|
|
431
431
|
end
|
|
432
|
-
Origen.app.rc.checkin(options)
|
|
432
|
+
Origen.app.rc(uninitialized: true).checkin(options)
|
|
433
433
|
end
|
|
434
434
|
end
|
|
435
435
|
puts
|
data/templates/git/gitignore.erb
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
# Misc
|
|
2
|
+
.irb_history
|
|
3
|
+
.byebug_history
|
|
4
|
+
|
|
1
5
|
# Editor cruft
|
|
2
6
|
*.swp
|
|
3
7
|
*.swo
|
|
4
8
|
*~
|
|
5
9
|
|
|
6
|
-
#
|
|
10
|
+
# Origen local files
|
|
7
11
|
/.bundle
|
|
8
12
|
/target/.default
|
|
9
13
|
/environment/.default
|
|
@@ -26,8 +30,7 @@
|
|
|
26
30
|
/.collection
|
|
27
31
|
/.bin
|
|
28
32
|
/.session
|
|
29
|
-
|
|
30
|
-
/.irb_history
|
|
33
|
+
/tmp
|
|
31
34
|
|
|
32
35
|
# Cruft from other revision control systems
|
|
33
36
|
.SYNC
|