Remove unused "check merged" code path

The common.push_patches() function no longer has any callers that use the
check_merged argument. Code exclusive to this path is now eliminated.

Signed-off-by: Peter Grayson <[email protected]>

Author: jpgrayson

stgit/commands/common.py

@@ -194,7 +194,7 @@ def print_crt_patch(crt_series, branch=None):
         out.info('No patches applied')
 
 
-def push_patches(crt_series, patches, check_merged=False):
+def push_patches(crt_series, patches):
     """Push multiple patches onto the stack. This function is shared
     between the push and pull commands
     """
@@ -207,31 +207,17 @@ def push_patches(crt_series, patches, check_merged=False):
 
     names = patches[forwarded:]
 
-    # check for patches merged upstream
-    if names and check_merged:
-        out.start('Checking for patches merged upstream')
-
-        merged = crt_series.merged_patches(names)
-
-        out.done('%d found' % len(merged))
-    else:
-        merged = []
-
     for p in names:
         out.start('Pushing patch "%s"' % p)
 
-        if p in merged:
-            crt_series.push_empty_patch(p)
-            out.done('merged upstream')
-        else:
-            modified = crt_series.push_patch(p)
+        modified = crt_series.push_patch(p)
 
-            if crt_series.empty_patch(p):
-                out.done('empty patch')
-            elif modified:
-                out.done('modified')
-            else:
-                out.done()
+        if crt_series.empty_patch(p):
+            out.done('empty patch')
+        elif modified:
+            out.done('modified')
+        else:
+            out.done()
 
 
 def pop_patches(crt_series, patches, keep=False):

stgit/stack.py

@@ -989,41 +989,6 @@ def forward_patches(self, names):
 
         return forwarded
 
-    def merged_patches(self, names):
-        """Test which patches were merged upstream by reverse-applying
-        them in reverse order. The function returns the list of
-        patches detected to have been applied. The state of the tree
-        is restored to the original one
-        """
-        patches = [self.get_patch(name) for name in names]
-        patches.reverse()
-
-        merged = []
-        for p in patches:
-            if git.apply_diff(p.get_top(), p.get_bottom()):
-                merged.append(p.name)
-        merged.reverse()
-
-        git.reset()
-
-        return merged
-
-    def push_empty_patch(self, name):
-        """Pushes an empty patch on the stack
-        """
-        unapplied = self.get_unapplied()
-        assert(name in unapplied)
-
-        # patch = self.get_patch(name)
-        head = git.get_head()
-
-        append_string(self._applied_file, name)
-
-        unapplied.remove(name)
-        write_strings(self._unapplied_file, unapplied)
-
-        self.refresh_patch(bottom=head, cache_update=False, log='push(m)')
-
     def push_patch(self, name):
         """Pushes a patch on the stack
         """