Commitad715a0

committed

Merge pull requestgitpython-developers#159 from maxyz/master

Fix for untracked_files no longer detectedgitpython-developers#138

2 parents2976561 +5d4a9c2 commitad715a0Copy full SHA for ad715a0

File tree

+14

-15

lines changed

+14

-15

lines changed

Lines changed: 14 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -662,26 +662,25 @@ def is_dirty(self, index=True, working_tree=True, untracked_files=False):`
`662`	`662`	`returnTrue`
`663`	`663`	`# END untracked files`
`664`	`664`	`returnFalse`
`665`		`-`
	`665`	`+`
`666`	`666`	`@property`
`667`	`667`	`defuntracked_files(self):`
`668`	`668`	`# make sure we get all files, no only untracked directores`
`669`		`-proc=self.git.status(untracked_files=True,as_process=True)`
`670`		`-stream=iter(proc.stdout)`
	`669`	`+proc=self.git.status(porcelain=True,`
	`670`	`+untracked_files=True,`
	`671`	`+as_process=True)`
	`672`	`+# Untracked files preffix in porcelain mode`
	`673`	`+prefix="?? "`
	`674`	`+`
`671`	`675`	`untracked_files=list()`
`672`		`-forlineinstream:`
`673`		`-ifnotline.startswith("# Untracked files:"):`
	`676`	`+forlineinproc.stdout:`
	`677`	`+ifnotline.startswith(prefix):`
`674`	`678`	`continue`
`675`		`-# skip two lines`
`676`		`-stream.next()`
`677`		`-stream.next()`
`678`		`-`
`679`		`-foruntracked_infoinstream:`
`680`		`-ifnotuntracked_info.startswith("#\t"):`
`681`		`-break`
`682`		`-untracked_files.append(untracked_info.replace("#\t","").rstrip())`
`683`		`-# END for each utracked info line`
`684`		`-# END for each line`
	`679`	`+filename=line[len(prefix):].rstrip('\n')`
	`680`	`+# Special characters are escaped`
	`681`	`+iffilename[0]==filename[-1]=='"':`
	`682`	`+filename=filename[1:-1].decode('string_escape')`
	`683`	`+untracked_files.append(filename)`
`685`	`684`	`returnuntracked_files`
`686`	`685`
`687`	`686`	`defblame(self,rev,file):`

Comments

(0)