braid 1.0.2 → 1.0.3
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.
- checksums.yaml +4 -4
- data/.travis.yml +3 -0
- data/README.md +3 -0
- data/braid.gemspec +1 -1
- data/lib/braid/commands/update.rb +10 -2
- data/lib/braid/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aa691f5a28cf6daca3abe0a103bc9bc50786ee8b
|
|
4
|
+
data.tar.gz: 6dac5a1ac3d0f1f8c2d4e25eae222dd4ebbaea1e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 49d8bab55f41ee73ea9fc92ee80cb4993e0ce409ae56b329c6a23c0d227a22477bc530061f11e97ce231641b4feb49c4c2fe8fdf1879fd3c4dfff13065a2f5be
|
|
7
|
+
data.tar.gz: 3bf6c71c7f52c1a0b757308ab2e3fb7296f04550becce5983d0a8b20cdc06e64a7382aca3839637b0a7d44b5ca437bb0be05c6a15591bff1120c015d03dbb45b
|
data/.travis.yml
CHANGED
data/README.md
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
# Braid
|
|
2
2
|
|
|
3
|
+
[](http://travis-ci.org/cristibalan/braid)
|
|
4
|
+
[]()
|
|
5
|
+
|
|
3
6
|
Braid is a simple tool to help track vendor branches in a
|
|
4
7
|
[Git](http://git-scm.com/) repository.
|
|
5
8
|
|
data/braid.gemspec
CHANGED
|
@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
|
|
|
28
28
|
s.add_dependency(%q<main>, ['>= 4.7.3'])
|
|
29
29
|
s.add_dependency(%q<open4>, ['>= 1.0.1']) unless defined?(JRUBY_VERSION)
|
|
30
30
|
|
|
31
|
-
s.add_development_dependency(%q<rspec>, ['
|
|
31
|
+
s.add_development_dependency(%q<rspec>, ['>= 2.12.0'])
|
|
32
32
|
s.add_development_dependency(%q<mocha>, ['>= 0.9.11'])
|
|
33
33
|
end
|
|
@@ -23,6 +23,8 @@ module Braid
|
|
|
23
23
|
revision_message = options["revision"] ? " to #{display_revision(mirror, options["revision"])}" : ""
|
|
24
24
|
msg "Updating mirror '#{mirror.path}'#{revision_message}."
|
|
25
25
|
|
|
26
|
+
was_locked = mirror.locked?
|
|
27
|
+
|
|
26
28
|
# check options for lock modification
|
|
27
29
|
if mirror.locked?
|
|
28
30
|
if options['head']
|
|
@@ -38,10 +40,16 @@ module Braid
|
|
|
38
40
|
msg "Fetching new commits for '#{mirror.path}'." if verbose?
|
|
39
41
|
mirror.fetch
|
|
40
42
|
|
|
41
|
-
new_revision
|
|
43
|
+
new_revision = options['revision']
|
|
44
|
+
begin
|
|
45
|
+
new_revision = validate_new_revision(mirror, options['revision'])
|
|
46
|
+
rescue InvalidRevision
|
|
47
|
+
# Ignored as it means the revision matches expecte
|
|
48
|
+
end
|
|
42
49
|
target_revision = determine_target_revision(new_revision)
|
|
43
50
|
|
|
44
|
-
if mirror.
|
|
51
|
+
if (options['revision'] && was_locked && target_revision == mirror.base_revision) ||
|
|
52
|
+
(options['revision'].nil? && !was_locked && mirror.merged?(target_revision))
|
|
45
53
|
msg "Mirror '#{mirror.path}' is already up to date."
|
|
46
54
|
return
|
|
47
55
|
end
|
data/lib/braid/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: braid
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Cristi Balan
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2016-
|
|
13
|
+
date: 2016-07-25 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: main
|
|
@@ -44,14 +44,14 @@ dependencies:
|
|
|
44
44
|
name: rspec
|
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
|
46
46
|
requirements:
|
|
47
|
-
- -
|
|
47
|
+
- - ">="
|
|
48
48
|
- !ruby/object:Gem::Version
|
|
49
49
|
version: 2.12.0
|
|
50
50
|
type: :development
|
|
51
51
|
prerelease: false
|
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
|
53
53
|
requirements:
|
|
54
|
-
- -
|
|
54
|
+
- - ">="
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
56
|
version: 2.12.0
|
|
57
57
|
- !ruby/object:Gem::Dependency
|