Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5d6c86a

Browse files
test: ✅ Added test for external diff engine and removed comment
1 parent6074f47 commit5d6c86a

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

‎git/diff.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ def diff(
155155

156156
ifcreate_patch:
157157
args.append("-p")
158-
# we expect the default diff driver
159158
args.append("--no-ext-diff")
160159
else:
161160
args.append("--raw")

‎test/test_diff.py

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,3 +473,45 @@ def test_rename_override(self, rw_dir):
473473
self.assertEqual(True,diff.renamed_file)
474474
self.assertEqual("file_a.txt",diff.rename_from)
475475
self.assertEqual("file_b.txt",diff.rename_to)
476+
477+
@with_rw_directory
478+
deftest_diff_patch_with_external_engine(self,rw_dir):
479+
repo=Repo.init(rw_dir)
480+
gitignore=osp.join(rw_dir,".gitignore")
481+
482+
# First commit
483+
withopen(gitignore,"w")asf:
484+
f.write("first_line\n")
485+
repo.git.add(".gitignore")
486+
repo.index.commit("first commit")
487+
488+
# Adding second line and committing
489+
withopen(gitignore,"a")asf:
490+
f.write("second_line\n")
491+
repo.git.add(".gitignore")
492+
repo.index.commit("second commit")
493+
494+
# Adding third line and staging
495+
withopen(gitignore,"a")asf:
496+
f.write("third_line\n")
497+
repo.git.add(".gitignore")
498+
499+
# Adding fourth line
500+
withopen(gitignore,"a")asf:
501+
f.write("fourth_line\n")
502+
503+
# Set the external diff engine
504+
withrepo.config_writer(config_level="repository")aswriter:
505+
writer.set_value("diff","external","bogus_diff_engine")
506+
507+
head_against_head=repo.head.commit.diff("HEAD^",create_patch=True)
508+
self.assertEqual(len(head_against_head),1)
509+
head_against_index=repo.head.commit.diff(create_patch=True)
510+
self.assertEqual(len(head_against_index),1)
511+
head_against_working_tree=repo.head.commit.diff(None,create_patch=True)
512+
self.assertEqual(len(head_against_working_tree),1)
513+
514+
index_against_head=repo.index.diff("HEAD",create_patch=True)
515+
self.assertEqual(len(index_against_head),1)
516+
index_against_working_tree=repo.index.diff(None,create_patch=True)
517+
self.assertEqual(len(index_against_working_tree),1)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp