Commit8942284

committed

index: Fixed bug which caused incorrect separators in output files of the return value

remote: fixed evil bug that was caused by some inconsistency of python when __getattr__ and __slots__ are invovled - namely it calles getattr before checking for a slot of the same name, in an alternating fashion

1 parent3d93100 commit8942284Copy full SHA for 8942284

File tree

2 files changed

+13

-6

lines changed

lib/git
- index
  - base.py
- remote.py

2 files changed

+13

-6

lines changed

`‎lib/git/index/base.py`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1021,14 +1021,14 @@ def handle_stderr(proc, iter_checked_out_files):`
`1021`	`1021`	`checked_out_files=list()`
`1022`	`1022`
`1023`	`1023`	`forpathinpaths:`
`1024`		`-path=self._to_relative_path(path)`
	`1024`	`+co_path=to_native_path_linux(self._to_relative_path(path))`
`1025`	`1025`	`# if the item is not in the index, it could be a directory`
`1026`	`1026`	`path_is_directory=False`
`1027`	`1027`
`1028`	`1028`	`try:`
`1029`		`-self.entries[(path,0)]`
	`1029`	`+self.entries[(co_path,0)]`
`1030`	`1030`	`exceptKeyError:`
`1031`		`-dir=path`
	`1031`	`+dir=co_path`
`1032`	`1032`	`ifnotdir.endswith('/'):`
`1033`	`1033`	`dir+='/'`
`1034`	`1034`	`forentryinself.entries.itervalues():`
`@@ -1043,9 +1043,9 @@ def handle_stderr(proc, iter_checked_out_files):`
`1043`	`1043`	`# END path exception handlnig`
`1044`	`1044`
`1045`	`1045`	`ifnotpath_is_directory:`
`1046`		`-self._write_path_to_stdin(proc,path,path,make_exc,`
	`1046`	`+self._write_path_to_stdin(proc,co_path,path,make_exc,`
`1047`	`1047`	`fprogress,read_from_stdout=False)`
`1048`		`-checked_out_files.append(path)`
	`1048`	`+checked_out_files.append(co_path)`
`1049`	`1049`	`# END path is a file`
`1050`	`1050`	`# END for each path`
`1051`	`1051`	`self._flush_stdin_and_wait(proc,ignore_stdout=True)`

`‎lib/git/remote.py`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`fromexcimportGitCommandError`
`9`	`9`	`fromobjectsimportCommit`
	`10`	`+fromConfigParserimportNoOptionError`
`10`	`11`
`11`	`12`	`fromgit.utilimport (`
`12`	`13`	`LazyMixin,`
`@@ -435,7 +436,13 @@ def __getattr__(self, attr):`
`435`	`436`	`ifattr=="_config_reader":`
`436`	`437`	`returnsuper(Remote,self).__getattr__(attr)`
`437`	`438`
`438`		`-returnself._config_reader.get(attr)`
	`439`	`+# sometimes, probably due to a bug in python itself, we are being called`
	`440`	`+# even though a slot of the same name exists`
	`441`	`+try:`
	`442`	`+returnself._config_reader.get(attr)`
	`443`	`+exceptNoOptionError:`
	`444`	`+returnsuper(Remote,self).__getattr__(attr)`
	`445`	`+# END handle exception`
`439`	`446`
`440`	`447`	`def_config_section_name(self):`
`441`	`448`	`return'remote "%s"'%self.name`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit8942284

File tree

2 files changed

2 files changed

`‎lib/git/index/base.py`

`‎lib/git/remote.py`

0 commit comments