Commit7379091

committed

Merge branch 'commit_by_actor' ofhttps://github.com/firm1/GitPython into firm1-commit_by_actor

2 parents45eb728 +b6ed8d4 commit7379091Copy full SHA for 7379091

File tree

+29

-6

lines changed

+29

-6

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,10 @@ Access objects and add/remove entries. Commit the changes::`
`297`	`297`	`# Access the entries directly`
`298`	`298`	`index.add(['my_new_file']) # add a new file to the index`
`299`	`299`	`index.remove(['dir/existing_file'])`
`300`		`- new_commit = index.commit("my commit message")`
	`300`	`+ new_commit = index.commit("my commit message") # commit by commit message first`
	`301`	`+ my_author = Actor("An author", "author@example.com")`
	`302`	`+ my_committer = Actor("A committer", "committer@example.com")`
	`303`	`+ next_commit = index.commit("my commit message", author=my_author, commiter=my_committer) # commit by commit message and author and committer`
`301`	`304`
`302`	`305`	`Create new indices from other trees or as result of a merge. Write that result to a new index file::`
`303`	`306`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False,`
`358`	`358`	`# as well ...`
`359`	`359`	`importgit.refs`
`360`	`360`	`try:`
`361`		`-repo.head.set_commit(new_commit,logmsg="commit: %s"%message)`
	`361`	`+repo.head.set_commit(new_commit,logmsg=message)`
`362`	`362`	`exceptValueError:`
`363`	`363`	`# head is not yet set to the ref our HEAD points to`
`364`	`364`	`# Happens on first commit`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,20 @@`
`32`	`32`	`classRefLogEntry(tuple):`
`33`	`33`
`34`	`34`	`"""Named tuple allowing easy access to the revlog data fields"""`
`35`		`-_fmt="%s %s %s <%s> %i %s\t%s\n"`
`36`	`35`	`_re_hexsha_only=re.compile('^[0-9A-Fa-f]{40}$')`
`37`	`36`	`__slots__=tuple()`
`38`	`37`
`39`	`38`	`def__repr__(self):`
`40`	`39`	`"""Representation of ourselves in git reflog format"""`
`41`	`40`	`act=self.actor`
`42`	`41`	`time=self.time`
`43`		`-returnself._fmt% (self.oldhexsha,self.newhexsha,act.name,act.email,`
`44`		`-time[0],altz_to_utctz_str(time[1]),self.message)`
	`42`	`+returnu"{0} {1} {2} <{3}> {4!s} {5}\t{6}\n".format(self.oldhexsha,`
	`43`	`+self.newhexsha,`
	`44`	`+act.name,`
	`45`	`+act.email,`
	`46`	`+time[0],`
	`47`	`+altz_to_utctz_str(time[1]),`
	`48`	`+self.message).encode("utf-8")`
`45`	`49`
`46`	`50`	`@property`
`47`	`51`	`defoldhexsha(self):`
`@@ -267,7 +271,6 @@ def append_entry(cls, config_reader, filepath, oldbinsha, newbinsha, message):`
`267`	`271`
`268`	`272`	`lf=LockFile(filepath)`
`269`	`273`	`lf._obtain_lock_or_raise()`
`270`		`-`
`271`	`274`	`fd=open(filepath,'ab')`
`272`	`275`	`try:`
`273`	`276`	`fd.write(repr(entry).encode(defenc))`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`fixture,`
`11`	`11`	`with_rw_repo`
`12`	`12`	`)`
	`13`	`+fromgit.utilimportActor`
`13`	`14`	`fromgitimport (`
`14`	`15`	`IndexFile,`
`15`	`16`	`BlobFilter,`
`@@ -445,6 +446,22 @@ def mixed_iterator():`
`445`	`446`	`assertlen(new_commit.parents)==1`
`446`	`447`	`assertcur_head.commit==cur_commit`
`447`	`448`
	`449`	`+# commit with other actor`
	`450`	`+cur_commit=cur_head.commit`
	`451`	`+`
	`452`	`+my_author=Actor("An author","author@example.com")`
	`453`	`+my_committer=Actor("An committer","committer@example.com")`
	`454`	`+commit_actor=index.commit(commit_message,author=my_author,committer=my_committer)`
	`455`	`+assertcur_commit!=commit_actor`
	`456`	`+assertcommit_actor.author.name=="An author"`
	`457`	`+assertcommit_actor.author.email=="author@example.com"`
	`458`	`+assertcommit_actor.committer.name=="An committer"`
	`459`	`+assertcommit_actor.committer.email=="committer@example.com"`
	`460`	`+assertcommit_actor.message==commit_message`
	`461`	`+assertcommit_actor.parents[0]==cur_commit`
	`462`	`+assertlen(new_commit.parents)==1`
	`463`	`+assertcur_head.commit==cur_commit`
	`464`	`+`
`448`	`465`	`# same index, no parents`
`449`	`466`	`commit_message="index without parents"`
`450`	`467`	`commit_no_parents=index.commit(commit_message,parent_commits=list(),head=True)`

Comments

(0)