git-conflict-blame 0.3.0 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +94 -3
- data/git-conflict-blame.gemspec +2 -0
- data/lib/git-conflict-blame/version.rb +1 -1
- metadata +2 -6
- data/bin/console +0 -14
- data/bin/setup +0 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3ba336c946c4cfd3a24b327810946ca95f230a19
|
|
4
|
+
data.tar.gz: 004e24d928ccda8fa28619570adb9b94efc6e33c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 42e753b8727d85da20f2b82f06066e60b9ff3449279685e7f33e9f51a2ae390dcdd314cf25442627a7ca9c9c3c73c5989cb92e89763dbbb211b06af28989fed8
|
|
7
|
+
data.tar.gz: ea9af7d55fd4bfee8594e080cae3d4c90c84b0f4b5fbc6500f849f44ff448e3dd582c12c1cd30e5252e13f854b4c90e7892e1ad8d11220582d4867873d46ab0d
|
data/README.md
CHANGED
|
@@ -38,24 +38,115 @@ sudo apt-get install cmake
|
|
|
38
38
|
Run this inside a directory of your git repository. If there are no conflicts,
|
|
39
39
|
nothing will be displayed.
|
|
40
40
|
|
|
41
|
-
To output in a colorized pretty format
|
|
41
|
+
### To output in a colorized pretty format
|
|
42
|
+
|
|
43
|
+
#### Run this:
|
|
42
44
|
|
|
43
45
|
```bash
|
|
44
46
|
git conflict-blame
|
|
45
47
|
```
|
|
46
48
|
|
|
47
|
-
To
|
|
49
|
+
#### To see this:
|
|
50
|
+
|
|
51
|
+
```
|
|
52
|
+
1 files in conflict found!
|
|
53
|
+
Parsing files to find out who is to blame...
|
|
54
|
+
app.rb
|
|
55
|
+
00000000 not.committed.yet 2015-10-15 [7 ] <<<<<<< HEAD
|
|
56
|
+
ad3e1b25 bob.fred@example.com 2015-10-15 [8 ] output = add( 5, 6
|
|
57
|
+
ad3e1b25 bob.fred@example.com 2015-10-15 [9 ] puts output
|
|
58
|
+
00000000 not.committed.yet 2015-10-15 [10 ] =======
|
|
59
|
+
b8fb28f1 bob.fred@example.com 2015-10-15 [11 ] puts add( 5, 6
|
|
60
|
+
00000000 not.committed.yet 2015-10-15 [12 ] >>>>>>> master
|
|
61
|
+
|
|
62
|
+
README.md
|
|
63
|
+
00000000 not.committed.yet 2015-10-15 [1 ] <<<<<<< HEAD
|
|
64
|
+
db0d9920 bob.fred@example.com 2015-10-15 [2 ] My totally awesome readme file!
|
|
65
|
+
00000000 not.committed.yet 2015-10-15 [6 ] =======
|
|
66
|
+
2e9fcc79 bob.fred@example.com 2015-10-15 [7 ] My awesome readme file for everyone!
|
|
67
|
+
00000000 not.committed.yet 2015-10-15 [10 ] >>>>>>> master
|
|
68
|
+
```
|
|
69
|
+
|
|
70
|
+
### To output machine-readable data
|
|
71
|
+
|
|
72
|
+
#### Run this:
|
|
48
73
|
|
|
49
74
|
```bash
|
|
50
75
|
git conflict-blame --json
|
|
51
76
|
```
|
|
52
77
|
|
|
53
|
-
To
|
|
78
|
+
#### To see this:
|
|
79
|
+
|
|
80
|
+
```json
|
|
81
|
+
{"exception":false,"count":1,"data":{"app.rb":[[{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":7,"line_content":"<<<<<<< HEAD"},{"commit_id":"ad3e1b25","email":"bob.fred@example.com","date":"2015-10-15","line_number":8,"line_content":"output = add( 5, 6 "},{"commit_id":"ad3e1b25","email":"bob.fred@example.com","date":"2015-10-15","line_number":9,"line_content":"puts output"},{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":10,"line_content":"======="},{"commit_id":"b8fb28f1","email":"bob.fred@example.com","date":"2015-10-15","line_number":11,"line_content":"puts add( 5, 6 "},{"commit_id":"00000000","email":"not.committed.yet","date":"2015-10-15","line_number":12,"line_content":">>>>>>> master"}]]}}
|
|
82
|
+
```
|
|
83
|
+
|
|
84
|
+
### To output pretty machine-readable data
|
|
85
|
+
|
|
86
|
+
#### Run this:
|
|
54
87
|
|
|
55
88
|
```bash
|
|
56
89
|
git conflict-blame --json --pretty
|
|
57
90
|
```
|
|
58
91
|
|
|
92
|
+
#### To see this:
|
|
93
|
+
|
|
94
|
+
```json
|
|
95
|
+
{
|
|
96
|
+
"exception": false,
|
|
97
|
+
"count": 1,
|
|
98
|
+
"data": {
|
|
99
|
+
"app.rb": [
|
|
100
|
+
[
|
|
101
|
+
{
|
|
102
|
+
"commit_id": "00000000",
|
|
103
|
+
"email": "not.committed.yet",
|
|
104
|
+
"date": "2015-10-15",
|
|
105
|
+
"line_number": 7,
|
|
106
|
+
"line_content": "<<<<<<< HEAD"
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
"commit_id": "ad3e1b25",
|
|
110
|
+
"email": "bob.fred@example.com",
|
|
111
|
+
"date": "2015-10-15",
|
|
112
|
+
"line_number": 8,
|
|
113
|
+
"line_content": "output = add( 5, 6 "
|
|
114
|
+
},
|
|
115
|
+
{
|
|
116
|
+
"commit_id": "ad3e1b25",
|
|
117
|
+
"email": "bob.fred@example.com",
|
|
118
|
+
"date": "2015-10-15",
|
|
119
|
+
"line_number": 9,
|
|
120
|
+
"line_content": "puts output"
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
"commit_id": "00000000",
|
|
124
|
+
"email": "not.committed.yet",
|
|
125
|
+
"date": "2015-10-15",
|
|
126
|
+
"line_number": 10,
|
|
127
|
+
"line_content": "======="
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
"commit_id": "b8fb28f1",
|
|
131
|
+
"email": "bob.fred@example.com",
|
|
132
|
+
"date": "2015-10-15",
|
|
133
|
+
"line_number": 11,
|
|
134
|
+
"line_content": "puts add( 5, 6 "
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
"commit_id": "00000000",
|
|
138
|
+
"email": "not.committed.yet",
|
|
139
|
+
"date": "2015-10-15",
|
|
140
|
+
"line_number": 12,
|
|
141
|
+
"line_content": ">>>>>>> master"
|
|
142
|
+
}
|
|
143
|
+
]
|
|
144
|
+
]
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
```
|
|
149
|
+
|
|
59
150
|
## Contributing
|
|
60
151
|
|
|
61
152
|
Bug reports and pull requests are welcome on GitHub at https://github.com/eterry1388/git-conflict-blame.
|
data/git-conflict-blame.gemspec
CHANGED
|
@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
|
|
|
18
18
|
spec.executables = spec.files.grep( %r{^bin/} ) { |f| File.basename( f ) }
|
|
19
19
|
spec.require_paths = ['lib']
|
|
20
20
|
|
|
21
|
+
spec.required_ruby_version = '>= 2.1.0'
|
|
22
|
+
|
|
21
23
|
spec.add_development_dependency 'bundler', '~> 1.10'
|
|
22
24
|
spec.add_development_dependency 'rake', '~> 10.0'
|
|
23
25
|
spec.add_development_dependency 'rspec', '~> 3.3'
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-conflict-blame
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eric Terry
|
|
@@ -98,9 +98,7 @@ description: Git command that shows the blame on the lines that are in conflict
|
|
|
98
98
|
email:
|
|
99
99
|
- eterry1388@aol.com
|
|
100
100
|
executables:
|
|
101
|
-
- console
|
|
102
101
|
- git-conflict-blame
|
|
103
|
-
- setup
|
|
104
102
|
extensions: []
|
|
105
103
|
extra_rdoc_files: []
|
|
106
104
|
files:
|
|
@@ -110,9 +108,7 @@ files:
|
|
|
110
108
|
- LICENSE
|
|
111
109
|
- README.md
|
|
112
110
|
- Rakefile
|
|
113
|
-
- bin/console
|
|
114
111
|
- bin/git-conflict-blame
|
|
115
|
-
- bin/setup
|
|
116
112
|
- git-conflict-blame.gemspec
|
|
117
113
|
- lib/git-conflict-blame.rb
|
|
118
114
|
- lib/git-conflict-blame/exceptions.rb
|
|
@@ -129,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
129
125
|
requirements:
|
|
130
126
|
- - ">="
|
|
131
127
|
- !ruby/object:Gem::Version
|
|
132
|
-
version:
|
|
128
|
+
version: 2.1.0
|
|
133
129
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
134
130
|
requirements:
|
|
135
131
|
- - ">="
|
data/bin/console
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env ruby
|
|
2
|
-
|
|
3
|
-
require 'bundler/setup'
|
|
4
|
-
require 'git-conflict-blame'
|
|
5
|
-
|
|
6
|
-
# You can add fixtures and/or initialization code here to make experimenting
|
|
7
|
-
# with your gem easier. You can also use a different console, if you like.
|
|
8
|
-
|
|
9
|
-
# (If you use this, don't forget to add pry to your Gemfile!)
|
|
10
|
-
# require "pry"
|
|
11
|
-
# Pry.start
|
|
12
|
-
|
|
13
|
-
require 'irb'
|
|
14
|
-
IRB.start
|