Some minor formatting fixes.
authorJelmer Vernooij <jelmer@jelmer.uk>
Wed, 4 Jan 2017 00:21:35 +0000 (00:21 +0000)
committerJelmer Vernooij <jelmer@jelmer.uk>
Wed, 4 Jan 2017 00:21:35 +0000 (00:21 +0000)
dulwich/index.py
dulwich/repo.py
dulwich/tests/compat/test_repository.py

index 3a8c5209df8231811b1d5e4fb7532f7b9ce02d6e..15aa5483e9ce4de1e231f71ae79c1527750091a6 100644 (file)
@@ -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()
index 627e8aba7e3c4a130128687007fe6792bd0dae19..4b6180ab0f58297f1afaeb05d638b67b4cac5dc7 100644 (file)
@@ -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)
index f9fee63194a6f07c9d64c9491432b6648d7b8b91..81a321a99b194b8fb09a9d939b7587acef16dc3c 100644 (file)
@@ -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):