Commit3c8a33e

committed

fix(encoding): inuntracked_files()

I have no idea why PY3 requires such a mess of encoding/decodingstatements, but let's just be happy it works.Also let's be sure I never ever write python code again ... EVER.

1 parent9c272ab commit3c8a33eCopy full SHA for 3c8a33e

File tree

1 file changed

-2

lines changed

git/repo
- base.py

1 file changed

-2

lines changed

`‎git/repo/base.py‎`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,9 @@`
`54`	`54`	`)`
`55`	`55`	`fromgit.compatimport (`
`56`	`56`	`text_type,`
`57`		`-defenc`
	`57`	`+force_text,`
	`58`	`+defenc,`
	`59`	`+PY3`
`58`	`60`	`)`
`59`	`61`
`60`	`62`	`importos`
`@@ -625,7 +627,12 @@ def _get_untracked_files(self, **kwargs):`
`625`	`627`	`filename=line[len(prefix):].rstrip('\n')`
`626`	`628`	`# Special characters are escaped`
`627`	`629`	`iffilename[0]==filename[-1]=='"':`
`628`		`-filename=filename[1:-1].decode('string_escape').decode(defenc)`
	`630`	`+filename=filename[1:-1]`
	`631`	`+ifPY3:`
	`632`	`+# WHATEVER ... it's a mess, but works for me`
	`633`	`+filename=filename.encode('ascii').decode('unicode_escape').encode('latin1').decode(defenc)`
	`634`	`+else:`
	`635`	`+filename=filename.decode('string_escape').decode(defenc)`
`629`	`636`	`untracked_files.append(filename)`
`630`	`637`	`finalize_process(proc)`
`631`	`638`	`returnuntracked_files`

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!

Commit3c8a33e

File tree

1 file changed

1 file changed

`‎git/repo/base.py‎`

0 commit comments