Commita93eb7e

committed

Implemented reflog reading and writing

1 parent6e5aae2 commita93eb7eCopy full SHA for a93eb7e

File tree

9 files changed

+677

-23

lines changed

refs
- log.py
test
- fixtures
- test_reflog.py

9 files changed

+677

-23

lines changed

`‎refs/log.py`

Lines changed: 39 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,21 +7,22 @@`
`7`	`7`
`8`	`8`	`fromgit.objects.utilimport (`
`9`	`9`	`Actor,`
`10`		`-parse_actor_and_date,`
	`10`	`+parse_date,`
`11`	`11`	`Serializable,`
`12`	`12`	`utctz_to_altz,`
`13`	`13`	`altz_to_utctz_str,`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`importos`
`17`		`-`
	`17`	`+importre`
`18`	`18`
`19`	`19`	`__all__= ["RefLog","RefLogEntry"]`
`20`	`20`
`21`	`21`
`22`	`22`	`classRefLogEntry(tuple):`
`23`	`23`	`"""Named tuple allowing easy access to the revlog data fields"""`
`24`		`-_fmt="%s %s %s <%s> %i %s\t%s"`
	`24`	`+_fmt="%s %s %s <%s> %i %s\t%s\n"`
	`25`	`+_re_hexsha_only=re.compile('^[0-9A-Fa-f]{40}$')`
`25`	`26`	`__slots__=tuple()`
`26`	`27`
`27`	`28`	`def__repr__(self):`
`@@ -68,13 +69,34 @@ def new(self, oldhexsha, newhexsha, actor, time, tz_offset, message):`
`68`	`69`	`returnRefLogEntry((oldhexsha,newhexsha,actor, (time,tz_offset),message))`
`69`	`70`
`70`	`71`	`@classmethod`
`71`		`-deffrom_line(self,line):`
	`72`	`+deffrom_line(cls,line):`
`72`	`73`	`""":return: New RefLogEntry instance from the given revlog line.`
`73`	`74`	`:param line: line without trailing newline`
`74`	`75`	`:raise ValueError: If line could not be parsed"""`
`75`		`-raiseNotImplementedError("todo")`
	`76`	`+try:`
	`77`	`+info,msg=line.split('\t',2)`
	`78`	`+exceptValueError:`
	`79`	`+raiseValueError("line is missing tab separator")`
	`80`	`+#END handle first plit`
	`81`	`+oldhexsha=info[:40]`
	`82`	`+newhexsha=info[41:81]`
	`83`	`+forhexshain (oldhexsha,newhexsha):`
	`84`	`+ifnotcls._re_hexsha_only.match(hexsha):`
	`85`	`+raiseValueError("Invalid hexsha: %s"%hexsha)`
	`86`	`+# END if hexsha re doesn't match`
	`87`	`+#END for each hexsha`
	`88`	`+`
	`89`	`+email_end=info.find('>',82)`
	`90`	`+ifemail_end==-1:`
	`91`	`+raiseValueError("Missing token: >")`
	`92`	`+#END handle missing end brace`
	`93`	`+`
	`94`	`+actor=Actor._from_string(info[82:email_end+1])`
	`95`	`+time,tz_offset=parse_date(info[email_end+2:])`
	`96`	`+`
	`97`	`+returnRefLogEntry((oldhexsha,newhexsha,actor, (time,tz_offset),msg))`
	`98`	`+`
`76`	`99`
`77`		`-`
`78`	`100`	`classRefLog(list,Serializable):`
`79`	`101`	`"""A reflog contains reflog entries, each of which defines a certain state`
`80`	`102`	`of the head in question. Custom query methods allow to retrieve log entries`
`@@ -104,7 +126,7 @@ def from_file(cls, filepath):`
`104`	`126`	`returninst`
`105`	`127`
`106`	`128`	`@classmethod`
`107`		`-defreflog_path(cls,ref):`
	`129`	`+defpath(cls,ref):`
`108`	`130`	`"""`
`109`	`131`	`:return: string to absolute path at which the reflog of the given ref`
`110`	`132`	`instance would be found. The path is not guaranteed to point to a valid`
`@@ -123,7 +145,12 @@ def iter_entries(cls, stream):`
`123`	`145`	`ifisinstance(stream,basestring):`
`124`	`146`	`stream=file_contents_ro_filepath(stream)`
`125`	`147`	`#END handle stream type`
`126`		`-return (new_entry(line.strip())forlineinstream)`
	`148`	`+whileTrue:`
	`149`	`+line=stream.readline()`
	`150`	`+ifnotline:`
	`151`	`+return`
	`152`	`+yieldnew_entry(line.strip())`
	`153`	`+#END endless loop`
`127`	`154`
`128`	`155`	`defto_file(self,filepath):`
`129`	`156`	`"""Write the contents of the reflog instance to a file at the given filepath.`
`@@ -140,22 +167,13 @@ def to_file(self, filepath):`
`140`	`167`	`#{ Serializable Interface`
`141`	`168`	`def_serialize(self,stream):`
`142`	`169`	`lm1=len(self)-1`
`143`		`-write=stream.write()`
	`170`	`+write=stream.write`
`144`	`171`
`145`	`172`	`# write all entries`
`146`		`-fori,einself:`
`147`		`-s=repr(e)`
`148`		`-ifi!=lm1:`
`149`		`-s+="\n"`
`150`		`-#END handle line separator`
`151`		`-write(s)`
	`173`	`+fori,einenumerate(self):`
	`174`	`+write(repr(e))`
`152`	`175`	`#END for each entry`
`153`	`176`
`154`	`177`	`def_deserialize(self,stream):`
`155`		`-new_entry=RefLogEntry.from_line`
`156`		`-append=self.append`
`157`		`-# NOTE: should use iter_entries, but this way it will be more direct and faster`
`158`		`-forlineinstream:`
`159`		`-append(new_entry(line.strip()))`
`160`		`-#END handle deserializatoin`
	`178`	`+self.extend(self.iter_entries(stream))`
`161`	`179`	`#} END serializable interface`