Commit33819a2

committed

Addiitonal win32 fixes related to, guess it, backslashes in paths

1 parent17a1729 commit33819a2Copy full SHA for 33819a2

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@`
`56`	`56`	`LockedFD,`
`57`	`57`	`join_path_native,`
`58`	`58`	`file_contents_ro,`
	`59`	`+to_native_path_linux,`
	`60`	`+to_native_path`
`59`	`61`	`)`
`60`	`62`
`61`	`63`	`fromfunimport (`
`@@ -672,7 +674,7 @@ def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=Non`
`672`	`674`	`gitrelative_path=abspath[len(self.repo.working_tree_dir)+1:]`
`673`	`675`	`blob=Blob(self.repo,Blob.NULL_BIN_SHA,`
`674`	`676`	`self._stat_mode_to_index_mode(os.stat(abspath).st_mode),`
`675`		`-gitrelative_path)`
	`677`	`+to_native_path_linux(gitrelative_path))`
`676`	`678`	`entries.append(BaseIndexEntry.from_blob(blob))`
`677`	`679`	`# END for each path`
`678`	`680`	`del(paths[:])`
`@@ -692,7 +694,7 @@ def store_path(filepath):`
`692`	`694`	`istream=self.repo.odb.store(IStream(Blob.type,st.st_size,stream))`
`693`	`695`	`fprogress(filepath,True,filepath)`
`694`	`696`	`returnBaseIndexEntry((self._stat_mode_to_index_mode(st.st_mode),`
`695`		`-istream.binsha,0,filepath))`
	`697`	`+istream.binsha,0,to_native_path_linux(filepath)))`
`696`	`698`	`# END utility method`
`697`	`699`
`698`	`700`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`TagReference`
`22`	`22`	`)`
`23`	`23`
`24`		`-fromgitdb.utilimport(`
`25`		`-join,`
`26`		`-)`
	`24`	`+fromgit.utilimportjoin_path`
	`25`	`+fromgitdb.utilimportjoin`
	`26`	`+`
`27`	`27`	`importre`
`28`	`28`	`importos`
`29`	`29`
`@@ -366,7 +366,7 @@ def _from_line(cls, repo, line, fetch_line):`
`366`	`366`	`ifref_typeisSymbolicReference:`
`367`	`367`	`remote_local_ref=ref_type(repo,"FETCH_HEAD")`
`368`	`368`	`else:`
`369`		`-remote_local_ref=Reference.from_path(repo,join(ref_type._common_path_default,remote_local_ref.strip()))`
	`369`	`+remote_local_ref=Reference.from_path(repo,join_path(ref_type._common_path_default,remote_local_ref.strip()))`
`370`	`370`	`# END create ref instance`
`371`	`371`
`372`	`372`	`note= (noteandnote.strip() )or''`

Comments

(0)