Commit5149c80

committed

Merge branch 'win_mmap' ofhttps://github.com/ankostis/GitPython into ankostis-win_mmap

2 parents8c3a688 +9db2ff1 commit5149c80Copy full SHA for 5149c80

File tree

-23

lines changed

-23

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,6 @@`
`3`	`3`
`4`	`4`	`importsys`
`5`	`5`	`fromtimeimporttime`
`6`		`-fromunittest.caseimportskipIf`
`7`		`-`
`8`		`-fromgit.compatimportPY3`
`9`		`-fromgit.utilimportHIDE_WINDOWS_KNOWN_ERRORS`
`10`	`6`
`11`	`7`	`from .libimport (`
`12`	`8`	`TestBigRepoR`
`@@ -15,8 +11,6 @@`
`15`	`11`
`16`	`12`	`classTestObjDBPerformance(TestBigRepoR):`
`17`	`13`
`18`		`-@skipIf(HIDE_WINDOWS_KNOWN_ERRORSandPY3,`
`19`		`-"FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly")`
`20`	`14`	`deftest_random_access(self):`
`21`	`15`	`results= [["Iterate Commits"], ["Iterate Blobs"], ["Retrieve Blob Data"]]`
`22`	`16`	`forrepoin (self.gitrorepo,self.puregitrorepo):`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -808,8 +808,6 @@ def test_git_file(self, rwrepo):`
`808`	`808`	`git_file_repo=Repo(rwrepo.working_tree_dir)`
`809`	`809`	`self.assertEqual(osp.abspath(git_file_repo.git_dir),real_path_abs)`
`810`	`810`
`811`		`-@skipIf(HIDE_WINDOWS_KNOWN_ERRORSandPY3,`
`812`		`-"FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly")`
`813`	`811`	`deftest_file_handle_leaks(self):`
`814`	`812`	`deflast_commit(repo,rev,path):`
`815`	`813`	`commit=next(repo.iter_commits(rev,path,max_count=1))`

Lines changed: 1 addition & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`importgit`
`9`	`9`	`fromgit.cmdimportGit`
`10`		`-fromgit.compatimportstring_types,is_win`
	`10`	`+fromgit.compatimportstring_types`
`11`	`11`	`fromgit.excimport (`
`12`	`12`	`InvalidGitRepositoryError,`
`13`	`13`	`RepositoryDirtyError`
`@@ -28,20 +28,6 @@`
`28`	`28`	`importos.pathasosp`
`29`	`29`
`30`	`30`
`31`		`-# Change the configuration if possible to prevent the underlying memory manager`
`32`		`-# to keep file handles open. On windows we get problems as they are not properly`
`33`		`-# closed due to mmap bugs on windows (as it appears)`
`34`		`-ifis_win:`
`35`		`-try:`
`36`		`-importsmmap.util# @UnusedImport`
`37`		`-smmap.util.MapRegion._test_read_into_memory=True`
`38`		`-exceptImportError:`
`39`		`-sys.stderr.write("The submodule tests will fail as some files cannot be removed due to open file handles.\n")`
`40`		`-sys.stderr.write(`
`41`		`-"The latest version of gitdb uses a memory map manager which can be configured to work around this problem")`
`42`		`-# END handle windows platform`
`43`		`-`
`44`		`-`
`45`	`31`	`classTestRootProgress(RootUpdateProgress):`
`46`	`32`
`47`	`33`	`"""Just prints messages, for now without checking the correctness of the states"""`

Comments

(0)