Jelajahi Sumber

Some minor formatting fixes.

Jelmer Vernooij 8 tahun lalu
induk
melakukan
f1ab124de0
3 mengubah file dengan 9 tambahan dan 9 penghapusan
  1. 1 2
      dulwich/index.py
  2. 2 2
      dulwich/repo.py
  3. 6 5
      dulwich/tests/compat/test_repository.py

+ 1 - 2
dulwich/index.py

@@ -505,8 +505,7 @@ def build_index_from_tree(root_path, index_path, object_store, tree_id,
         # Add file to index
         st = os.lstat(full_path)
         if not honor_filemode:
-            st_tuple = (entry.mode, st.st_ino, st.st_dev, st.st_nlink, st.st_uid, st.st_gid, st.st_size, st.st_atime, st.st_mtime, st.st_ctime)
-            st = st.__class__(st_tuple)
+            st = st.__class__((entry.mode, ) + st[1:])
         index[entry.path] = index_entry_from_stat(st, entry.sha, 0)
 
     index.write()

+ 2 - 2
dulwich/repo.py

@@ -196,9 +196,9 @@ class BaseRepo(object):
         cf = ConfigFile()
         cf.set(b"core", b"repositoryformatversion", b"0")
         if self._determine_file_mode():
-            cf.set(b"core", b"filemode", b"true")
+            cf.set(b"core", b"filemode", True)
         else:
-            cf.set(b"core", b"filemode", b"false")
+            cf.set(b"core", b"filemode", False)
 
         cf.set(b"core", b"bare", bare)
         cf.set(b"core", b"logallrefupdates", True)

+ 6 - 5
dulwich/tests/compat/test_repository.py

@@ -181,15 +181,16 @@ class WorkingTreeTestCase(ObjectStoreTestCase):
         worktrees = self._parse_worktree_list(output)
         self.assertEqual(len(worktrees), self._number_of_working_tree)
         self.assertEqual(worktrees[0][1], '(bare)')
-        self.assertEqual(os.path.normcase(worktrees[0][0]).lower(),
-                         self._mainworktree_repo.path.lower())
+        self.assertEqual(os.path.normcase(worktrees[0][0]),
+                         os.path.normcase(self._mainworktree_repo.path))
 
-        output = run_git_or_fail(['worktree', 'list'], cwd=self._mainworktree_repo.path)
+        output = run_git_or_fail(['worktree', 'list'],
+            cwd=self._mainworktree_repo.path)
         worktrees = self._parse_worktree_list(output)
         self.assertEqual(len(worktrees), self._number_of_working_tree)
         self.assertEqual(worktrees[0][1], '(bare)')
-        self.assertEqual(os.path.normcase(worktrees[0][0]).lower(),
-                         self._mainworktree_repo.path.lower())
+        self.assertEqual(os.path.normcase(worktrees[0][0]),
+                         os.path.normcase(self._mainworktree_repo.path))
 
 
 class InitNewWorkingDirectoryTestCase(WorkingTreeTestCase):