hiiro 0.1.83 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599e565871c2afc37ae659954e4ccf01568bed4375032fb9d8ba21007e7e2673
-  data.tar.gz: 4fdcbf43a79f2b63ec3f95ecd003973cb3175b4ef0b6cdbb0cbc36444439b259
+  metadata.gz: 711ddf464139bf62e19c852705b3bc4663f563d5513ad5d254d82225ed18622a
+  data.tar.gz: 407f809d3cd61e38badea49d6a0aa07da9e37bea82a2b51a8490fe38c380b8b4
 SHA512:
-  metadata.gz: e8945bc066927371fa804f6b0deef00ee36f84be0fc9178033e52d5228ce5f6b895b114cb3a0a37129e491f2c8d4a1156cfce36e18740d28048fa7885ad1f792
-  data.tar.gz: 31acaf4e204e3be5f8c6fddbf6009f0e757bad86e3dcbe5c770637c05d848a6c4a65c42552617e015bd8b55171aecc9d2fde86b58e6b16ed06ef23f8bdef6179
+  metadata.gz: 6c3d6e03f0d0fecc10ee37035c445a4f5cd127c8c657e741a269a1901ab947aee813a6d71eb73e164cef6232fe5fd939362c7c8d503c1db30adbcd1834265367
+  data.tar.gz: c5b40ea4b56ad100bca2d0670d3338187ff1effcde9c24b63695652b46056e5704366f5fb16364fa01906e945412e478bd35fd69dd0eec6988ac95c067e0119f

data/bin/h-branch

@@ -14,14 +14,6 @@ class BranchManager
     @hiiro = hiiro
   end
 
-  def help
-    puts "Usage: h branch <subcommand> [args]"
-    puts
-    puts "Subcommands:"
-    puts "  save                  Record current branch for this task"
-    puts "  current               Show current branch info"
-  end
-
   def save
     branch_name = current_branch
     unless branch_name
@@ -129,7 +121,9 @@ manager = BranchManager.new(hiiro)
 
 hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:save) { manager.save }
-hiiro.add_subcmd(:current) { manager.current }
+hiiro.add_subcmd(:history) { |*args| manager.history(args) }
+hiiro.add_subcmd(:current) { print `git branch --show-current` }
+hiiro.add_subcmd(:info) { manager.current }
 hiiro.add_subcmd(:select) do |*args|
   branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
 
@@ -265,6 +259,36 @@ hiiro.add_subcmd(:diff) { |*args|
   system('git', 'log', '--oneline', '--decorate', range)
 }
 
+hiiro.add_subcmd(:changed) { |*args|
+  show_all = args.delete('-a') || args.delete('--all')
+  upstream = args.first
+
+  upstream ||= %w[origin/master master origin/main main].find { |ref|
+    system("git rev-parse --verify #{ref} >/dev/null 2>&1")
+  }
+
+  unless upstream
+    puts "Cannot find master or origin/master"
+    next
+  end
+
+  forkpoint = `git merge-base --fork-point #{upstream} HEAD 2>/dev/null`.strip
+  if forkpoint.empty?
+    forkpoint = `git merge-base #{upstream} HEAD 2>/dev/null`.strip
+  end
+
+  if forkpoint.empty?
+    puts "Could not find fork point"
+    next
+  end
+
+  if show_all
+    system('git', 'diff', '--name-only', "#{forkpoint}...HEAD")
+  else
+    system('git', 'diff', '--name-only', '--relative', "#{forkpoint}...HEAD")
+  end
+}
+
 hiiro.add_subcmd(:ahead) { |*args|
   case args.length
   when 0
@@ -434,6 +458,4 @@ hiiro.add_subcmd(:ancestor) { |*args|
   end
 }
 
-hiiro.add_default { manager.help }
-
 hiiro.run

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.83"
+  VERSION = "0.1.85"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.83
+  version: 0.1.85
 platform: ruby
 authors:
 - Joshua Toyota