auto stash on merge

Author: spderosso

gitless/cli/gl_commit.py

@@ -49,13 +49,9 @@ def main(args, repo):
   pprint.commit(ci)
 
   if curr_b.fuse_in_progress:
-    pprint.blank()
-    try:
-      curr_b.fuse_continue(fuse_cb=pprint.FUSE_CB)
-      pprint.ok('Fuse succeeded')
-    except core.ApplyFailedError as e:
-      pprint.ok('Fuse succeeded')
-      raise e
+    _op_continue(curr_b.fuse_continue, 'Fuse')
+  elif curr_b.merge_in_progress:
+    _op_continue(curr_b.merge_continue, 'Merge')
 
   return True
 
@@ -66,3 +62,13 @@ def _auto_track(files, curr_b):
     f = curr_b.status_file(fp)
     if f.type == core.GL_STATUS_UNTRACKED:
       curr_b.track_file(f.fp)
+
+
+def _op_continue(op, fn):
+  pprint.blank()
+  try:
+    op(op_cb=pprint.OP_CB)
+    pprint.ok('{0} succeeded'.format(op))
+  except core.ApplyFailedError as e:
+    pprint.ok('{0} succeeded'.format(op))
+    raise e

gitless/cli/gl_fuse.py

@@ -50,7 +50,7 @@ def parser(subparsers, repo):
 def main(args, repo):
   current_b = repo.current_branch
   if args.abort:
-    current_b.abort_fuse(fuse_cb=pprint.FUSE_CB)
+    current_b.abort_fuse(op_cb=pprint.OP_CB)
     pprint.ok('Fuse aborted successfully')
     return True
 
@@ -90,7 +90,7 @@ def valid_input(inp):
   try:
     current_b.fuse(
         src_branch, insertion_point, only=only, exclude=exclude,
-        fuse_cb=pprint.FUSE_CB)
+        op_cb=pprint.OP_CB)
     pprint.ok('Fuse succeeded')
   except core.ApplyFailedError as e:
     pprint.ok('Fuse succeeded')

gitless/cli/gl_merge.py

@@ -7,6 +7,7 @@
 
 from __future__ import unicode_literals
 
+from gitless import core
 
 from . import helpers, pprint
 
@@ -30,6 +31,11 @@ def main(args, repo):
     pprint.ok('Merge aborted successfully')
     return True
 
-  current_b.merge(helpers.get_branch_or_use_upstream(args.src, 'src', repo))
-  pprint.ok('Merge succeeded')
+  src_branch = helpers.get_branch_or_use_upstream(args.src, 'src', repo)
+  try:
+    current_b.merge(src_branch, op_cb=pprint.OP_CB)
+    pprint.ok('Merge succeeded')
+  except core.ApplyFailedError as e:
+    pprint.ok('Merge succeeded')
+    raise e
   return True

gitless/cli/pprint.py

@@ -145,7 +145,7 @@ def commit(ci, compact=False, stream=sys.stdout.write):
   with indent(4):
     puts(ci.message, stream=stream)
 
-# Fuse Callbacks
+# Op Callbacks
 
 def apply_ok(ci):
   ok('Insertion of {0} succeeded'.format(ci.id))
@@ -165,7 +165,7 @@ def save():
 def restore_ok():
   ok('Uncommitted changes applied successfully to the new head of the branch')
 
-FUSE_CB = core.FuseCb(apply_ok, apply_err, save, restore_ok)
+OP_CB = core.OpCb(apply_ok, apply_err, save, restore_ok)
 
 
 class FixedOffset(tzinfo):

gitless/core.py

@@ -776,7 +776,7 @@ def diff_file(self, path):
 
   # Merge related methods
 
-  def merge(self, src):
+  def merge(self, src, op_cb=None):
     """Merges the divergent changes of the src branch onto this one."""
     self._check_is_current()
     self._check_op_not_in_progress()
@@ -787,7 +787,27 @@ def merge(self, src):
     try:
       git.merge(src, '--no-ff')
     except ErrorReturnCode as e:
-      raise GlError(stdout(e) + stderr(e))
+      err = stderr(e)
+      if not 'stash' in err:
+        raise GlError(stdout(e) + err)
+      if op_cb and op_cb.save:
+        op_cb.save()
+      git.stash.save('--', _stash_msg_merge)
+      try:
+        git.merge(src, '--no-ff')
+      except ErrorReturnCode as e:
+        raise GlError(stdout(e) + stderr(e))
+
+    restore_fn = op_cb.restore_ok if op_cb else None
+    self._safe_restore(_stash_msg_merge, restore_fn=restore_fn)
+    self._state_cleanup()
+
+  def merge_continue(self, op_cb=None):
+    if not self.merge_in_progress:
+      raise GlError('No merge in progress, nothing to continue')
+    restore_fn = op_cb.restore_ok if op_cb else None
+    self._safe_restore(_stash_msg_merge, restore_fn=restore_fn)
+    self._state_cleanup()
 
   @property
   def merge_in_progress(self):
@@ -825,7 +845,7 @@ def _load_fuse_commits(self):
         yield git_repo[ci_id]
     os.remove(self._fuse_commits_fp)
 
-  def fuse(self, src, ip, only=None, exclude=None, fuse_cb=None):
+  def fuse(self, src, ip, only=None, exclude=None, op_cb=None):
     """Fuse the given commits onto this branch.
 
     Args:
@@ -835,12 +855,12 @@ def fuse(self, src, ip, only=None, exclude=None, fuse_cb=None):
         divergent commits from self or the divergent point.
       only: ids of commits to use only.
       exclude: ids of commtis to exclude.
-      fuse_cb: see FuseCb.
+      op_cb: see OpCb.
     """
     self._check_is_current()
     self._check_op_not_in_progress()
 
-    save_fn = fuse_cb.save if fuse_cb else None
+    save_fn = op_cb.save if op_cb else None
     repo = self.gl_repo
     mb = repo.merge_base(self, src)
 
@@ -872,16 +892,16 @@ def fuse(self, src, ip, only=None, exclude=None, fuse_cb=None):
           fuse_commits = itertools.chain([fuse_ci], fuse_commits)
           break
         detach_point = ci.id
-        if fuse_cb and fuse_cb.apply_ok:
-          fuse_cb.apply_ok(ci)
+        if op_cb and op_cb.apply_ok:
+          op_cb.apply_ok(ci)
 
     after_commits = self.history(reverse=True)
     after_commits.hide(ip)
     commits = itertools.chain(fuse_commits, after_commits)
     commits, _commits = itertools.tee(commits, 2)
     if not any(_commits):  # it's a ff
       self._safe_reset(detach_point, _stash_msg_fuse, save_fn=save_fn)
-      restore_fn = fuse_cb.restore_ok if fuse_cb else None
+      restore_fn = op_cb.restore_ok if op_cb else None
       self._safe_restore(_stash_msg_fuse, restore_fn=restore_fn)
       return
 
@@ -897,29 +917,29 @@ def fuse(self, src, ip, only=None, exclude=None, fuse_cb=None):
     repo.git_repo.set_head(repo.git_repo.head.peel().id)
     self._safe_reset(detach_point, _stash_msg_fuse, save_fn=save_fn)
 
-    self._fuse(commits, fuse_cb=fuse_cb)
+    self._fuse(commits, op_cb=op_cb)
 
-  def fuse_continue(self, fuse_cb=None):
+  def fuse_continue(self, op_cb=None):
     if not self.fuse_in_progress:
       raise GlError('No fuse in progress, nothing to continue')
     commits = self._load_fuse_commits()
-    self._fuse(commits, fuse_cb=fuse_cb)
+    self._fuse(commits, op_cb=op_cb)
 
-  def _fuse(self, commits, fuse_cb=None):
+  def _fuse(self, commits, op_cb=None):
     git_repo = self.gl_repo.git_repo
     committer = git_repo.default_signature
 
     for ci in commits:
       git_repo.cherrypick(ci.id)
       index = self._index
       if index.conflicts:
-        if fuse_cb and fuse_cb.apply_err:
-          fuse_cb.apply_err(ci)
+        if op_cb and op_cb.apply_err:
+          op_cb.apply_err(ci)
         self._save_fuse_commits(commits)
         raise GlError('There are conflicts you need to resolve')
 
-      if fuse_cb and fuse_cb.apply_ok:
-        fuse_cb.apply_ok(ci)
+      if op_cb and op_cb.apply_ok:
+        op_cb.apply_ok(ci)
       tree_oid = index.write_tree(git_repo)
       git_repo.create_commit(
           'HEAD',  # the name of the reference to update
@@ -931,22 +951,22 @@ def _fuse(self, commits, fuse_cb=None):
     orig_branch_ref.set_target(git_repo.head.target)
     git_repo.set_head(orig_branch_ref.name)
     self._state_cleanup()
-    restore_fn = fuse_cb.restore_ok if fuse_cb else None
+    restore_fn = op_cb.restore_ok if op_cb else None
     self._safe_restore(_stash_msg_fuse, restore_fn=restore_fn)
 
   @property
   def fuse_in_progress(self):
     return self.gl_repo._ref_exists('GL_FUSE_ORIG_HEAD')
 
-  def abort_fuse(self, fuse_cb=None):
+  def abort_fuse(self, op_cb=None):
     if not self.fuse_in_progress:
       raise GlError('No fuse in progress, nothing to abort')
     git_repo = self.gl_repo.git_repo
     git_repo.set_head(git_repo.lookup_reference('GL_FUSE_ORIG_HEAD').target)
     git_repo.reset(git_repo.head.peel().hex, pygit2.GIT_RESET_HARD)
 
     self._state_cleanup()
-    restore_fn = fuse_cb.restore_ok if fuse_cb else None
+    restore_fn = op_cb.restore_ok if op_cb else None
     self._safe_restore(_stash_msg_fuse, restore_fn=restore_fn)
 
   def _state_cleanup(self):
@@ -1044,9 +1064,6 @@ def update():
         msg, get_tree_and_update_index(),  # the commit tree
         parents)
 
-    if self.merge_in_progress:
-      self.gl_repo.git_repo.state_cleanup()
-
     return self.gl_repo.git_repo[ci_oid]
 
   def publish(self, branch):
@@ -1109,11 +1126,14 @@ def _stash_msg(name):
 def _stash_msg_fuse(name):
   return _stash_msg('fuse-{0}'.format(name))
 
+def _stash_msg_merge(name):
+  return _stash_msg('merge-{0}'.format(name))
+
 
 # Misc
 
-FuseCb = collections.namedtuple(
-    'FuseCb', ['apply_ok', 'apply_err', 'save', 'restore_ok'])
+OpCb = collections.namedtuple(
+    'OpCb', ['apply_ok', 'apply_err', 'save', 'restore_ok'])
 
 def stdout(p):
   return p.stdout.decode(ENCODING)

gitless/tests/test_e2e.py

@@ -353,15 +353,15 @@ def test_diff_non_ascii(self):
     self.assertEqual(out1, out2)
 
 
-class TestFuse(TestEndToEnd):
+class TestOp(TestEndToEnd):
 
   COMMITS_NUMBER = 4
   OTHER = 'other'
   MASTER_FILE = 'master_file'
   OTHER_FILE = 'other_file'
 
   def setUp(self):
-    super(TestFuse, self).setUp()
+    super(TestOp, self).setUp()
 
     self.commits = {}
     def create_commits(branch_name, fp):
@@ -382,6 +382,9 @@ def create_commits(branch_name, fp):
     create_commits(self.OTHER, self.OTHER_FILE)
     gl.switch('master')
 
+
+class TestFuse(TestOp):
+
   def __assert_history(self, expected):
     out = utils.stdout(gl.history(_tty_out=False))
     cids = list(reversed(re.findall(r'ci (.*) in (.*)', out, re.UNICODE)))
@@ -592,6 +595,16 @@ def test_uncommitted_tracked_changes_that_conflict_append(self):
 #      self.assertTrue('failed to apply' in utils.stderr(e))
 
 
+class TestMerge(TestOp):
+
+  def test_uncommitted_changes(self):
+    utils.write_file(self.MASTER_FILE, contents='uncommitted')
+    utils.write_file('master_untracked', contents='uncommitted')
+    gl.merge(self.OTHER)
+    self.assertEqual('uncommitted', utils.read_file(self.MASTER_FILE))
+    self.assertEqual('uncommitted', utils.read_file('master_untracked'))
+
+
 class TestPerformance(TestEndToEnd):
 
   FPS_QTY = 10000