donald 0.1.2 → 0.1.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.
- data/lib/donald/merge_tool.rb +14 -3
- metadata +2 -2
data/lib/donald/merge_tool.rb
CHANGED
|
@@ -30,14 +30,25 @@ module Donald
|
|
|
30
30
|
files = []
|
|
31
31
|
|
|
32
32
|
text.each_line do |line|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
end
|
|
33
|
+
file = conflicted_file(line)
|
|
34
|
+
files << file unless file.nil?
|
|
36
35
|
end
|
|
37
36
|
|
|
38
37
|
files
|
|
39
38
|
end
|
|
40
39
|
|
|
40
|
+
def conflicted_file line
|
|
41
|
+
conflicted_types = ['unmerged', 'both modified']
|
|
42
|
+
|
|
43
|
+
conflicted_types.each do |conflicted_type|
|
|
44
|
+
if line.match /#{conflicted_type}: (.*)/
|
|
45
|
+
return $1.strip
|
|
46
|
+
end
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
nil
|
|
50
|
+
end
|
|
51
|
+
|
|
41
52
|
def call_vim files
|
|
42
53
|
editor = @options[:editor] || DEFAULT_EDITOR
|
|
43
54
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: donald
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Bruno Grasselli
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2010-04-
|
|
12
|
+
date: 2010-04-21 00:00:00 -03:00
|
|
13
13
|
default_executable: donald
|
|
14
14
|
dependencies: []
|
|
15
15
|
|