git-whence 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff4eae5cbbb56bd17fdd8baa9a653bb45b68f70b1214358d6b595d1c5b8b829
-  data.tar.gz: de12ddbebc457c3e72c324b17242787c96c5c4243868042d3ba199706d4f19e1
+  metadata.gz: d905ac8083db64392216de76354c9f4fdf082ec37654e6d17a5355c2d616091e
+  data.tar.gz: 80bcec14ef080aecc1b8ad0db28ba44d9eb273ce890cbd75e7bc76d21fac17f9
 SHA512:
-  metadata.gz: 5a3193767c1a1cb822946ae91b9e4956294349669f32664364f62ea99806ad0af882e3313998bb2f8c3c5505c4a2daced0087af63858e0162fdca48a2a88902f
-  data.tar.gz: 7c6c048d81234fdeae88b330d768d6485bb5a5dd18a3c3f923d49aa2ba99a5196a22a268203d76be7ffe4882fb08d1f14b54f43b579e9a301868bcab55ce9680
+  metadata.gz: 0d3626ddbb2c37530b32f152809ac02675f816df2457e1c339af15da06a0c87a75a1d67b7f2ca6820769eb55c286cee7385881ae92182b06772fe1f0aba8325e
+  data.tar.gz: a35ab59affb9244aed513371ad3ebdc2b0c9b29c060dd945b1d801a7578b18d19f8d4d0c89957e670587f60a6118d2074ad62d374097fd5c87cc5818226d03ee

data/lib/git/whence/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Whence
-    VERSION = "0.2.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/git/whence.rb

@@ -3,6 +3,9 @@ require "optparse"
 
 module Git::Whence
   module CLI
+    SQUASH_REGEX = /\(#(\d+)\)$/
+    DEFAULT_BRANCHES = ["main", "master"]
+
     class << self
       def run(argv)
         options = parse_options(argv)
@@ -19,8 +22,7 @@ module Git::Whence
           show_commit(commit, options)
           1
         else
-          merge = find_merge(commit)
-          if merge
+          if merge = find_merge(commit)
             show_commit(merge, options)
             0
           else
@@ -44,7 +46,7 @@ module Git::Whence
       def show_commit(merge, options)
         info = sh("git show -s --oneline #{merge}").strip
         if options[:open]
-          if pr = info[/Merge pull request #(\d+) from /, 1]
+          if pr = info[/Merge pull request #(\d+) from /, 1] || info[SQUASH_REGEX, 1]
             exec "open", "https://github.com/#{origin}/pull/#{pr}"
           else
             warn "Unable to find PR number in #{info}"
@@ -57,19 +59,23 @@ module Git::Whence
 
       # https://github.com/foo/bar or git@github.com:foo/bar.git -> foo/bar
       def origin
-        repo = sh("git remote get-url origin").strip
+        repo = sh("git remote get-url origin").strip # TODO: read file instead
         repo.sub!(/\.git$/, "")
         repo.split(/[:\/]/).last(2).join("/")
       end
 
       def find_merge(commit)
-        commit, merge = (
+        merge_commit, merge = (
           find_merge_simple(commit, "HEAD") ||
-          find_merge_simple(commit, "master") ||
-          find_merge_fuzzy(commit, "master")
+          find_merge_simple(commit, default_branch) ||
+          find_merge_fuzzy(commit, default_branch)
         )
 
-        merge if merge && merge_include_commit?(merge, commit)
+        if merge && merge_include_commit?(merge, merge_commit)
+          merge
+        else
+          find_squash_merge(commit) # not very exact, so do this last ... ideally ask github api
+        end
       end
 
       def merge_include_commit?(merge, commit)
@@ -78,23 +84,45 @@ module Git::Whence
       end
 
       def find_merge_fuzzy(commit, branch)
-        if similar = find_similar(commit, branch)
+        if (similar = find_similar(commit, branch))
           find_merge_simple(similar, branch)
         end
       end
 
+      def default_branch
+        @default_branch ||= remote_default_branch || local_default_branch
+      end
+
+      def remote_default_branch
+        remotes = sh("git remote").split("\n")
+        return nil if remotes.empty?
+        preferred = (remotes.include?("origin") ? "origin" : remotes.first)
+        folder = ".git/refs/remotes/#{preferred}"
+        (Dir["#{folder}/*"].map { |f| f.sub("#{folder}/", "") } & DEFAULT_BRANCHES).sort.first
+      end
+
+      # guess default branch by last changed commonly used default branch or current branch
+      def local_default_branch
+        branches = sh("git branch --sort=-committerdate").split("\n").map { |br| br.split(" ").last }
+        (branches & DEFAULT_BRANCHES).first || sh("git symbolic-ref HEAD").strip.sub("refs/heads/", "")
+      end
+
+      def find_squash_merge(commit)
+        commit if sh("git show -s --format='%s' #{commit}") =~ SQUASH_REGEX
+      end
+
       def find_similar(commit, branch)
         month = 30 * 24 * 60 * 60
         time, search = sh("git show -s --format='%ct %an %s' #{commit}").strip.split(" ", 2)
         time = time.to_i
         same = sh("git log #{branch} --pretty=format:'%H %an %s' --before #{time + month} --after #{time - month}")
         found = same.split("\n").map { |x| x.split(" ", 2) }.detect { |_, message| message == search }
-        found && found.first
+        found&.first
       end
 
       def find_merge_simple(commit, branch)
-        result = sh "git log #{commit}..#{branch} --ancestry-path --merges --pretty='%H' 2>/dev/null | tail -n 1"
-        [commit, result.strip] unless result.strip.empty?
+        result = sh("git log #{commit}..#{branch} --ancestry-path --merges --pretty='%H' 2>/dev/null | tail -n 1").chomp
+        [commit, result] unless result.empty?
       end
 
       def sh(command)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: michael@grosser.it
 executables:
 - git-whence
@@ -25,7 +25,7 @@ homepage: https://github.com/grosser/git-whence
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -33,16 +33,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Find the merge and pull request a commit came from + find cherry-picks
 test_files: []