Merge pull request #122 from techtonik/oless

Remove -o option from diff and commit (fixes #54)

Author: spderosso

gitless/cli/helpers.py

@@ -151,8 +151,8 @@ def __call__(self, parser, namespace, revs, option_string=None):
 
 def oei_flags(subparsers, repo):
   subparsers.add_argument(
-      '-o', '--only', nargs='+',
-      help='use only files given (files must be tracked modified or untracked)',
+      'only', nargs='*',
+      help='use only files given (tracked modified or untracked)',
       action=PathProcessor, repo=repo, metavar='file')
   subparsers.add_argument(
       '-e', '--exclude', nargs='+',
@@ -204,7 +204,7 @@ def _oei_validate(only, exclude, include, curr_b):
   """
   if only and (exclude or include):
     pprint.err(
-        'You provided a list of filenames to be committed only (-o) but also '
+        'You provided a list of filenames to be committed but also '
         'provided a list of files to be excluded (-e) or included (-i)')
     return False
 

gitless/tests/test_e2e.py

@@ -181,39 +181,39 @@ def test_commit_relative(self):
     self.__assert_commit(self.TRACKED_FP, self.DIR_TRACKED_FP)
 
   def test_commit_only(self):
-    gl.commit(o=self.TRACKED_FP, m='msg')
+    gl.commit(self.TRACKED_FP, m="msg")
     self.__assert_commit(self.TRACKED_FP)
 
   def test_commit_only_relative(self):
     os.chdir(self.DIR)
-    self.assertRaises(ErrorReturnCode, gl.commit, o=self.TRACKED_FP, m='msg')
-    gl.commit(o='../' + self.TRACKED_FP, m='msg')
+    self.assertRaises(ErrorReturnCode, gl.commit, self.TRACKED_FP, "-m='msg'")
+    gl.commit('../' + self.TRACKED_FP, m='msg')
     self.__assert_commit(self.TRACKED_FP)
 
   def test_commit_only_untrack(self):
-    gl.commit(o=self.UNTRACKED_FP, m='msg')
+    gl.commit("-m='msg'", self.UNTRACKED_FP)
     self.__assert_commit(self.UNTRACKED_FP)
 
   def test_commit_only_untrack_relative(self):
     os.chdir(self.DIR)
-    self.assertRaises(ErrorReturnCode, gl.commit, o=self.UNTRACKED_FP, m='msg')
-    gl.commit(o='../' + self.UNTRACKED_FP, m='msg')
+    self.assertRaises(ErrorReturnCode, gl.commit, self.UNTRACKED_FP, m='msg')
+    gl.commit('../' + self.UNTRACKED_FP, m='msg')
     self.__assert_commit(self.UNTRACKED_FP)
 
   def test_commit_include(self):
-    gl.commit(m='msg', include=self.UNTRACKED_FP)
+    gl.commit("-m='msg'", include=self.UNTRACKED_FP)
     self.__assert_commit(
         self.TRACKED_FP, self.DIR_TRACKED_FP, self.UNTRACKED_FP)
 
   def test_commit_exclude_include(self):
-    gl.commit(m='msg', include=self.UNTRACKED_FP, exclude=self.TRACKED_FP)
+    gl.commit("-m='msg'", include=self.UNTRACKED_FP, exclude=self.TRACKED_FP)
     self.__assert_commit(self.UNTRACKED_FP, self.DIR_TRACKED_FP)
 
   def test_commit_no_files(self):
     self.assertRaises(
         ErrorReturnCode, gl.commit, '--exclude',
         self.TRACKED_FP, self.DIR_TRACKED_FP, m='msg')
-    self.assertRaises(ErrorReturnCode, gl.commit, o='non-existent', m='msg')
+    self.assertRaises(ErrorReturnCode, gl.commit, 'non-existent', m='msg')
     self.assertRaises(
         ErrorReturnCode, gl.commit, m='msg', exclude='non-existent')
     self.assertRaises(
@@ -222,7 +222,7 @@ def test_commit_no_files(self):
   def test_commit_dir(self):
     fp = 'dir/f'
     utils.write_file(fp)
-    gl.commit(o=fp, m='msg')
+    gl.commit(fp, m='msg')
     self.__assert_commit('dir/f')
 
   def __assert_commit(self, *expected_committed):
@@ -247,7 +247,7 @@ def setUp(self):
     super(TestStatus, self).setUp()
     utils.write_file(self.TRACKED_DIR_FP)
     utils.write_file(self.UNTRACKED_DIR_FP)
-    gl.commit(o=self.TRACKED_DIR_FP, m='commit')
+    gl.commit(self.TRACKED_DIR_FP, m='commit')
 
   def test_status_relative(self):
     utils.write_file(self.TRACKED_DIR_FP, contents='some modifications')
@@ -276,7 +276,7 @@ class TestBranch(TestEndToEnd):
   def setUp(self):
     super(TestBranch, self).setUp()
     utils.write_file('f')
-    gl.commit(o='f', m='commit')
+    gl.commit('f', m='commit')
 
   def test_create(self):
     gl.branch(c=self.BRANCH_1)
@@ -318,7 +318,7 @@ class TestTag(TestEndToEnd):
   def setUp(self):
     super(TestTag, self).setUp()
     utils.write_file('f')
-    gl.commit(o='f', m='commit')
+    gl.commit('f', m='commit')
 
   def test_create(self):
     gl.tag(c=self.TAG_1)
@@ -353,15 +353,15 @@ def setUp(self):
     super(TestDiffFile, self).setUp()
     utils.write_file(self.TRACKED_FP)
     utils.write_file(self.DIR_TRACKED_FP)
-    gl.commit('-o', self.TRACKED_FP, self.DIR_TRACKED_FP, m='commit')
+    gl.commit(self.TRACKED_FP, self.DIR_TRACKED_FP, m='commit')
     utils.write_file(self.UNTRACKED_FP)
 
   def test_empty_diff(self):
     if 'No files to diff' not in utils.stdout(gl.diff()):
       self.fail()
 
   def test_diff_nonexistent_fp(self):
-    err = utils.stderr(gl.diff(o='file', _ok_code=[1]))
+    err = utils.stderr(gl.diff('file', _ok_code=[1]))
     if 'doesn\'t exist' not in err:
       self.fail()
 
@@ -370,7 +370,7 @@ def test_basic_diff(self):
     out1 = utils.stdout(gl.diff())
     if '+contents' not in out1:
       self.fail()
-    out2 = utils.stdout(gl.diff(o=self.TRACKED_FP))
+    out2 = utils.stdout(gl.diff(self.TRACKED_FP))
     if '+contents' not in out2:
       self.fail()
     self.assertEqual(out1, out2)
@@ -385,14 +385,14 @@ def test_basic_diff_relative(self):
     if '+contents_dir_tracked' not in out1:
       self.fail()
     rel_dir_tracked_fp = os.path.relpath(self.DIR_TRACKED_FP, self.DIR)
-    out2 = utils.stdout(gl.diff(o=rel_dir_tracked_fp))
+    out2 = utils.stdout(gl.diff(rel_dir_tracked_fp))
     if '+contents_dir_tracked' not in out2:
       self.fail()
 
   def test_diff_dir(self):
     fp = 'dir/dir/f'
     utils.write_file(fp, contents='contents')
-    out = utils.stdout(gl.diff(o=fp))
+    out = utils.stdout(gl.diff(fp))
     if '+contents' not in out:
       self.fail()
 
@@ -405,7 +405,7 @@ def test_diff_non_ascii(self):
     out1 = utils.stdout(gl.diff())
     if '+' + contents not in out1:
       self.fail('out is ' + out1)
-    out2 = utils.stdout(gl.diff(o=self.TRACKED_FP))
+    out2 = utils.stdout(gl.diff(self.TRACKED_FP))
     if '+' + contents not in out2:
       self.fail('out is ' + out2)
     self.assertEqual(out1, out2)
@@ -722,7 +722,7 @@ def assert_status_performance():
   def test_branch_switch_performance(self):
     MAX_TOLERANCE = 100
 
-    gl.commit(o='f1', m='commit')
+    gl.commit('f1', m='commit')
 
     t = time.time()
     gl.branch(c='develop')