Move merge command to plugin

resolve_reponame is now duplicated since other functions use it.

cmd_edit uses everything, so they can be removed from morphlib.app
when it is moved to a plugin.

1 files changed, 0 insertions, 18 deletions

diff --git a/morphlib/app.py b/morphlib/app.py
index 80cd20e3..d36d7370 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -730,24 +730,6 @@ class Morph(cliapp.Application):
             f.write('\n')
         os.rename(tempname, filename)
 
-    def cmd_merge(self, args):
-        '''Merge specified repositories from another system branch.'''
-
-        if len(args) == 0:
-            raise cliapp.AppException('morph merge must get a branch name '
-                                      'and some repo names as arguments')
-
-        other_branch = args[0]
-        mine = self._deduce_mine_directory()
-        this_branch = self._deduce_system_branch()
-
-        for repo in args[1:]:
-            repo = self._resolve_reponame(repo)
-            basename = os.path.basename(repo)
-            pull_from = os.path.join(mine, other_branch, basename)
-            repo_dir = os.path.join(mine, this_branch, basename)
-            self.runcmd(['git', 'pull', pull_from, other_branch], cwd=repo_dir)
-
     def status(self, **kwargs):
         '''Show user a status update.