mgit 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjg4MjgyNDhlYzIyYjM3ZDU5OTk3ZTA2ZDQ5YzcxZDBjMTk2YjBkMQ==
+    ZjNmMTI1NTJjZWIzMjNhNGUzODNhYTZjZThlZGU3N2M5NTI1NDQ1Mw==
   data.tar.gz: !binary |-
-    NThkN2I2YzJmOTI3OGJkMDE3YzM0ZWY5MDYzMDNlZmM5ZmFjOGQ5ZA==
+    MjMyZTNiYjBlMTgyMzg5ZWRmYzQ5YjQzYzAyY2VlZmYwZGRmODgxZA==
 SHA512:
   metadata.gz: !binary |-
-    YTNiMGM4YzkzMTU1MzYwZWI1OGRkM2RkMGY4NTExOWRiNzc4NmRiNDlmMzVi
-    MTJjZjI2NDJiYTBkZWRmMDc0NDkzOTQwNzlkZDU2YmFiYWRlMWRhNDQ5ZmQy
-    ZTgwNzEwZjQwYmRmYWNkNjc4OGEyNTZhYWMzM2UxYTkzNjU1MzM=
+    M2EyYjBkYzg5ZDdiZjIwZWJjZDIyYzNkMTM0MTJlNzNjMjgxYTA0ZTcxZWIw
+    OTJhYWU2NDIzNjlmYzEzOGQ2NmY0M2UxN2Y3ZGMwZmEyMDViN2I4M2QxM2U1
+    ZTYxZWJmZGFiOGMyMjI2ZWNmMTFiMWMwZGFkNWI1ZThlYjUzN2U=
   data.tar.gz: !binary |-
-    YzMyY2UyM2FlN2NhNTNhYjgyNjc1YWVhMzkzYmY3MTZjZjI5YWQ0ZDg4NDU1
-    MjJiMWM4MGQzYzUyMWZiZmFlZGUxYjJlMTk1NmU1OTM4MmQ2ZTg0ZTljZmEz
-    ZjIzNmI3MjczODczYmU5ZGZjOTM0OWExMTJhYzdiODdmMGYzZDU=
+    Y2RjNTlmMGYzMmI2MGU3YzMzYmMwZGYxNTljYTMxNjNkNTc0OTdiY2U5YWU4
+    NjJiZmMwMTc0ZDkxOWQzY2M0MGRkN2NiYmI5NmE2NDNiYTg2ZDdhN2VlN2Jh
+    ZDYyOTNjMDcxNWZlNmRjYTlkMmExZDQxODgwZGZhODBiNWUwNTU=

data/lib/mgit/commands/ffmerge.rb

@@ -2,6 +2,13 @@ module MGit
   class FFMergeCommand < Command
     def execute(args)
       Registry.chdir_each do |repo|
+
+        bs = repo.remote_tracking_branches.select do |branch, upstream|
+          !repo.unmerged_commits(branch, upstream).empty?
+        end.map { |b, u| b }
+
+        next if bs.empty?
+
         if repo.dirty?
           pwarn "Skipping repository #{repo.name} since it's dirty."
           next
@@ -10,7 +17,7 @@ module MGit
         pinfo "Fast-forward merging branches in repository #{repo.name}..."
 
         cb = repo.current_branch
-        repo.remote_tracking_branches.each do |b, u|
+        bs.each do |b|
           `git checkout -q #{b}`
           `git merge --ff-only @{u}`
         end

data/lib/mgit/commands/log.rb

@@ -3,7 +3,7 @@ module MGit
     def execute(args)
       Registry.chdir_each do |repo|
         repo.remote_tracking_branches.each do |branch, upstream|
-          uc = unmerged_commits(branch, upstream)
+          uc = repo.unmerged_commits(branch, upstream)
           next if uc.empty?
 
           pinfo "In repository #{repo.name}, branch #{upstream} the following commits were made:"
@@ -28,20 +28,5 @@ module MGit
     end
 
     register_command :log
-
-  private
-
-    def unmerged_commits(branch, upstream)
-      `git log --pretty=format:"%h#%an#%s" --reverse  --relative-date #{branch}..#{upstream}`.
-        split("\n").
-        map { |line| line.split('#') }.
-        map do |words| 
-          {
-            :commit => words[0],
-            :author => words[1],
-            :subject => words[2..-1].join('#')
-          }
-        end
-    end
   end
 end

data/lib/mgit/repository.rb

@@ -36,6 +36,21 @@ module MGit
       end
     end
 
+    def unmerged_commits(branch, upstream)
+      in_repo do
+        `git log --pretty=format:"%h#%an#%s" --reverse  --relative-date #{branch}..#{upstream}`.
+          split("\n").
+          map { |line| line.split('#') }.
+          map do |words| 
+            {
+              :commit => words[0],
+              :author => words[1],
+              :subject => words[2..-1].join('#')
+            }
+          end
+      end
+    end
+
     def flags
       flags = Set.new
       status_lines do |s|

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - FlavourSys Technology GmbH