hiiro 0.1.83 → 0.1.84
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/bin/h-branch +33 -1
- data/lib/hiiro/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2d0be8d4a48899d54ef68c3c9b8a613c47c1d486a05429dbb11a33964c7a58f7
|
|
4
|
+
data.tar.gz: 181b1da19512818ee390c7a9728db902782ee5f686a6e3719c80fae1d271f35d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 678087897c00f26c4771a9f5a1ea9bfedd7c38592437c7e2d51f2558545f827d03a445cc5ee9cfa2413032015ee1720436ea5a09d4c5312d960e94f74780d64a
|
|
7
|
+
data.tar.gz: 59bb52bfbb9ba92cdd167f40d427428d328fce990bf82f00e5af6e4d3e6b6b7c027348b4bc2a60be1bd6cb0c6eb3bf330c0646d5983b7ddb9ac8b3841be40514
|
data/bin/h-branch
CHANGED
|
@@ -129,7 +129,9 @@ manager = BranchManager.new(hiiro)
|
|
|
129
129
|
|
|
130
130
|
hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
|
|
131
131
|
hiiro.add_subcmd(:save) { manager.save }
|
|
132
|
-
hiiro.add_subcmd(:
|
|
132
|
+
hiiro.add_subcmd(:history) { |*args| manager.history(args) }
|
|
133
|
+
hiiro.add_subcmd(:current) { print `git branch --show-current` }
|
|
134
|
+
hiiro.add_subcmd(:info) { manager.current }
|
|
133
135
|
hiiro.add_subcmd(:select) do |*args|
|
|
134
136
|
branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
|
|
135
137
|
|
|
@@ -265,6 +267,36 @@ hiiro.add_subcmd(:diff) { |*args|
|
|
|
265
267
|
system('git', 'log', '--oneline', '--decorate', range)
|
|
266
268
|
}
|
|
267
269
|
|
|
270
|
+
hiiro.add_subcmd(:changed) { |*args|
|
|
271
|
+
show_all = args.delete('-a') || args.delete('--all')
|
|
272
|
+
upstream = args.first
|
|
273
|
+
|
|
274
|
+
upstream ||= %w[origin/master master origin/main main].find { |ref|
|
|
275
|
+
system("git rev-parse --verify #{ref} >/dev/null 2>&1")
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
unless upstream
|
|
279
|
+
puts "Cannot find master or origin/master"
|
|
280
|
+
next
|
|
281
|
+
end
|
|
282
|
+
|
|
283
|
+
forkpoint = `git merge-base --fork-point #{upstream} HEAD 2>/dev/null`.strip
|
|
284
|
+
if forkpoint.empty?
|
|
285
|
+
forkpoint = `git merge-base #{upstream} HEAD 2>/dev/null`.strip
|
|
286
|
+
end
|
|
287
|
+
|
|
288
|
+
if forkpoint.empty?
|
|
289
|
+
puts "Could not find fork point"
|
|
290
|
+
next
|
|
291
|
+
end
|
|
292
|
+
|
|
293
|
+
if show_all
|
|
294
|
+
system('git', 'diff', '--name-only', "#{forkpoint}...HEAD")
|
|
295
|
+
else
|
|
296
|
+
system('git', 'diff', '--name-only', '--relative', "#{forkpoint}...HEAD")
|
|
297
|
+
end
|
|
298
|
+
}
|
|
299
|
+
|
|
268
300
|
hiiro.add_subcmd(:ahead) { |*args|
|
|
269
301
|
case args.length
|
|
270
302
|
when 0
|
data/lib/hiiro/version.rb
CHANGED