Merge pull request #234 from Mooninaut/add-no-ignored-flag-to-gl-switch

spderosso · web-flow · commit 0ce14aa1ec1c · 2020-04-01T13:06:11.000-07:00
Add --move-ignored / -mi flag to "gl switch".
diff --git a/gitless/cli/gl_switch.py b/gitless/cli/gl_switch.py
@@ -21,6 +21,10 @@ def parser(subparsers, _):
       help='move uncomitted changes made in the current branch to the '
       'destination branch',
       action='store_true')
+  switch_parser.add_argument('-mi', '--move-ignored',
+      help='move ignored files to the destination branch, '
+      'has no effect if --move-over is also set',
+      action='store_true')
   switch_parser.set_defaults(func=main)
 
 
@@ -33,6 +37,6 @@ def main(args, repo):
     pprint.err_exp('to create a new branch do gl branch -c {0}'.format(args.branch))
     return False
 
-  repo.switch_current_branch(b, move_over=args.move_over)
+  repo.switch_current_branch(b, move_over=args.move_over, move_ignored=args.move_ignored)
   pprint.ok('Switched to branch {0}'.format(args.branch))
   return True
diff --git a/gitless/core.py b/gitless/core.py
@@ -256,13 +256,15 @@ def listall_branches(self):
     """
     return self.git_repo.listall_branches(pygit2.GIT_BRANCH_LOCAL)
 
-  def switch_current_branch(self, dst_b, move_over=False):
+  def switch_current_branch(self, dst_b, move_over=False, move_ignored=False):
     """Switches to the given branch.
 
     Args:
       dst_b: the destination branch.
       move_over: if True, then uncommitted changes made in the current branch are
         moved to the destination branch (defaults to False).
+      move_ignored: if True, and move_over is False, then ignored files are moved
+        to the destination branch, but uncommitted changes are not (defaults to False).
     """
     if dst_b.is_current:
       raise ValueError(
@@ -346,7 +348,10 @@ def save(b):
 
       if not move_over:
         # Stash
-        git.stash.save('--all', '--', msg)
+        if move_ignored:
+          git.stash.save('--include-untracked', '--', msg)
+        else:
+          git.stash.save('--all', '--', msg)
 
     def restore(b):
       s_id, msg = _stash(_stash_msg(b.branch_name))
