Commite767111

committed

Removed os.path.realpath invocations as they are not necessary if paths are used consistently.

This will save IOPs, and make the code easier to understand (I suppose).Related togitpython-developers#224

1 parentede325d commite767111Copy full SHA for e767111

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -579,8 +579,14 @@ def _entries_for_paths(self, paths, path_rewriter, fprogress, entries):`
`579`	`579`	`entries_added=list()`
`580`	`580`	`ifpath_rewriter:`
`581`	`581`	`forpathinpaths:`
`582`		`-abspath=os.path.abspath(path)`
`583`		`-gitrelative_path=abspath[len(self.repo.working_tree_dir)+1:]`
	`582`	`+ifos.path.isabs(path):`
	`583`	`+abspath=path`
	`584`	`+gitrelative_path=path[len(self.repo.working_tree_dir)+1:]`
	`585`	`+else:`
	`586`	`+gitrelative_path=path`
	`587`	`+abspath=os.path.join(self.repo.working_tree_dir,gitrelative_path)`
	`588`	`+# end obtain relative and absolute paths`
	`589`	`+`
`584`	`590`	`blob=Blob(self.repo,Blob.NULL_BIN_SHA,`
`585`	`591`	`stat_mode_to_index_mode(os.stat(abspath).st_mode),`
`586`	`592`	`to_native_path_linux(gitrelative_path))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ def wait(self):`
`63`	`63`
`64`	`64`	`def_mktemp(*args):`
`65`	`65`	`"""Wrapper around default tempfile.mktemp to fix an osx issue`
`66`		`- :note: the OSX special case was removed as it was unclear why that was needed in the first place. It seems`
	`66`	`+ :note: the OSX special case was removed as it was unclear why that was needed in the first place. It seems`
`67`	`67`	`to be just fine without it. However, if we leave this special case, and if TMPDIR is set to something custom,`
`68`	`68`	`prefixing /private/ will lead to incorrect paths on OSX."""`
`69`	`69`	`tdir=tempfile.mktemp(*args)`
`70`		`-# See :note: above to learn why this is comented out.`
	`70`	`+# See :note: above to learn why this is comented out.`
`71`	`71`	`# if sys.platform == 'darwin':`
`72`	`72`	`# tdir = '/private' + tdir`
`73`	`73`	`returntdir`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ def mixed_iterator():`
`501`	`501`
`502`	`502`	`# same file`
`503`	`503`	`entries=index.reset(new_commit).add(`
`504`		`- [os.path.abspath(os.path.join('lib','git','head.py'))]*2,fprogress=self._fprogress_add)`
	`504`	`+ [os.path.join(rw_repo.working_tree_dir,'lib','git','head.py')]*2,fprogress=self._fprogress_add)`
`505`	`505`	`self._assert_entries(entries)`
`506`	`506`	`assertentries[0].mode&0o644==0o644`
`507`	`507`	`# would fail, test is too primitive to handle this case`

Comments

(0)