remove ambiguity between paths and treeishs

Paul Sowden · empty · commit 5bb812243dd1 · 2008-12-15T14:06:03.000-05:00
When calling commands that accept treeish and path arguments and there is a path with the same name as a treeish git cowardly refuses to pick one and asks for the command to use the unambiguous syntax where '--' seperates the treeish from the paths.  Add '--' to the git commands to indicate that the argument is a treeish and not a path.
(cherry picked from commit a9a57fa93a2b121ab9b17fcd6062b9a9c9740883)
diff --git a/lib/git/commit.py b/lib/git/commit.py
@@ -95,7 +95,7 @@ def count(cls, repo, ref):
         Returns
             int
         """
-        return len(repo.git.rev_list(ref).strip().splitlines())
+        return len(repo.git.rev_list(ref, '--').strip().splitlines())
 
     @classmethod
     def find_all(cls, repo, ref, **kwargs):
@@ -118,7 +118,7 @@ def find_all(cls, repo, ref, **kwargs):
         options = {'pretty': 'raw'}
         options.update(kwargs)
 
-        output = repo.git.rev_list(ref, **options)
+        output = repo.git.rev_list(ref, '--', **options)
         return cls.list_from_string(repo, output)
 
     @classmethod
@@ -214,14 +214,14 @@ def diffs(self):
     @property
     def stats(self):
         if not self.parents:
-            text = self.repo.git.diff(self.id, numstat=True)
+            text = self.repo.git.diff(self.id, '--', numstat=True)
             text2 = ""
             for line in text.splitlines():
                 (insertions, deletions, filename) = line.split("\t")
                 text2 += "%s\t%s\t%s\n" % (deletions, insertions, filename)
             text = text2
         else:
-            text = self.repo.git.diff(self.parents[0].id, self.id, numstat=True)
+            text = self.repo.git.diff(self.parents[0].id, self.id, '--', numstat=True)
         return stats.Stats.list_from_string(self.repo, text)
 
     def __str__(self):
diff --git a/lib/git/repo.py b/lib/git/repo.py
@@ -192,8 +192,8 @@ def commit_deltas_from(self, other_repo, ref = 'master', other_ref = 'master'):
         Returns 
             ``git.Commit[]``
         """
-        repo_refs = self.git.rev_list(ref).strip().splitlines()
-        other_repo_refs = other_repo.git.rev_list(other_ref).strip().splitlines()
+        repo_refs = self.git.rev_list(ref, '--').strip().splitlines()
+        other_repo_refs = other_repo.git.rev_list(other_ref, '--').strip().splitlines()
 
         diff_refs = list(set(other_repo_refs) - set(repo_refs))
         return map(lambda ref: Commit.find_all(other_repo, ref, max_count=1)[0], diff_refs)
@@ -236,10 +236,9 @@ def log(self, commit = 'master', path = None, **kwargs):
         """
         options = {'pretty': 'raw'}
         options.update(kwargs)
+        arg = [commit, '--']
         if path:
-            arg = [commit, '--', path]
-        else:
-            arg = [commit]
+            arg.append(path)
         commits = self.git.log(*arg, **options)
         return Commit.list_from_string(self, commits)
 
@@ -450,7 +449,7 @@ def is_dirty(self):
             # always consired to be clean.
             return False
 
-        return len(self.git.diff('HEAD').strip()) > 0
+        return len(self.git.diff('HEAD', '--').strip()) > 0
 
     @property
     def active_branch(self):
diff --git a/test/git/test_commit.py b/test/git/test_commit.py
@@ -22,7 +22,7 @@ def test_bake(self, git):
         assert_equal("tom@mojombo.com", commit.author.email)
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
+        assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1}))
 
     @patch_object(Git, '_call_process')
     def test_id_abbrev(self, git):
@@ -184,7 +184,7 @@ def test_stats(self, git):
         assert_equal(["a.txt", "b.txt"], keys)
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3'), {'numstat': True}))
+        assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3', '--'), {'numstat': True}))
 
     @patch_object(Git, '_call_process')
     def test_rev_list_bisect_all(self, git):
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
@@ -70,7 +70,7 @@ def test_commits(self, git):
         assert_equal("Merge branch 'site'", c.message)
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('rev_list', 'master'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
+        assert_equal(git.call_args, (('rev_list', 'master', '--'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
 
     @patch_object(Git, '_call_process')
     def test_commit_count(self, git):
@@ -79,7 +79,7 @@ def test_commit_count(self, git):
         assert_equal(655, self.repo.commit_count('master'))
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('rev_list', 'master'), {}))
+        assert_equal(git.call_args, (('rev_list', 'master', '--'), {}))
 
     @patch_object(Git, '_call_process')
     def test_commit(self, git):
@@ -90,7 +90,7 @@ def test_commit(self, git):
         assert_equal("4c8124ffcf4039d292442eeccabdeca5af5c5017", commit.id)
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
+        assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1}))
 
     @patch_object(Git, '_call_process')
     def test_tree(self, git):
@@ -269,7 +269,7 @@ def test_log(self, git):
         assert_equal('ab25fd8483882c3bda8a458ad2965d2248654335', self.repo.log()[-1].id)
         assert_true(git.called)
         assert_equal(git.call_count, 2)
-        assert_equal(git.call_args, (('log', 'master'), {'pretty': 'raw'}))
+        assert_equal(git.call_args, (('log', 'master', '--'), {'pretty': 'raw'}))
 
     @patch_object(Git, '_call_process')
     def test_log_with_path_and_options(self, git):
@@ -314,14 +314,14 @@ def test_is_dirty_with_clean_working_dir(self, git):
         self.repo.bare = False
         git.return_value = ''
         assert_false(self.repo.is_dirty)
-        assert_equal(git.call_args, (('diff', 'HEAD'), {}))
+        assert_equal(git.call_args, (('diff', 'HEAD', '--'), {}))
 
     @patch_object(Git, '_call_process')
     def test_is_dirty_with_dirty_working_dir(self, git):
         self.repo.bare = False
         git.return_value = '''-aaa\n+bbb'''
         assert_true(self.repo.is_dirty)
-        assert_equal(git.call_args, (('diff', 'HEAD'), {}))
+        assert_equal(git.call_args, (('diff', 'HEAD', '--'), {}))
 
     @patch_object(Git, '_call_process')
     def test_active_branch(self, git):
