Commit73bde1f

committed

Merge branch 'add-co-authors'

2 parents12d91c6 +72cf71c commit73bde1fCopy full SHA for 73bde1f

File tree

+46

-1

lines changed

+46

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,5 @@ Contributors are:`
`48`	`48`	`-Hiroki Tokunaga <tokusan441 _at_ gmail.com>`
`49`	`49`	`-Julien Mauroy <pro.julien.mauroy _at_ gmail.com>`
`50`	`50`	`-Patrick Gerard`
	`51`	`+-Luke Twist <itsluketwist@gmail.com>`
`51`	`52`	`Portions derived from other open source works and are clearly marked.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`CONDITIONAL_INCLUDE_REGEXP=re.compile(r"(?<=includeIf )\"(gitdir\|gitdir/i\|onbranch):(.+)\"")`
`85`	`85`
`86`	`86`
`87`		`-classMetaParserBuilder(abc.ABCMeta):`
	`87`	`+classMetaParserBuilder(abc.ABCMeta):# noqa: B024`
`88`	`88`	`"""Utility class wrapping base-class methods into decorators that assure read-only properties"""`
`89`	`89`
`90`	`90`	`def__new__(cls,name:str,bases:Tuple,clsdict:Dict[str,Any])->"MetaParserBuilder":`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`# This module is part of GitPython and is released under`
`5`	`5`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
`6`	`6`	`importdatetime`
	`7`	`+importre`
`7`	`8`	`fromsubprocessimportPopen,PIPE`
`8`	`9`	`fromgitdbimportIStream`
`9`	`10`	`fromgit.utilimporthex_to_bin,Actor,Stats,finalize_process`
`@@ -738,3 +739,24 @@ def _deserialize(self, stream: BytesIO) -> "Commit":`
`738`	`739`	`returnself`
`739`	`740`
`740`	`741`	`# } END serializable implementation`
	`742`	`+`
	`743`	`+@property`
	`744`	`+defco_authors(self)->List[Actor]:`
	`745`	`+"""`
	`746`	`+ Search the commit message for any co-authors of this commit.`
	`747`	`+ Details on co-authors: https://github.blog/2018-01-29-commit-together-with-co-authors/`
	`748`	`+`
	`749`	`+ :return: List of co-authors for this commit (as Actor objects).`
	`750`	`+ """`
	`751`	`+co_authors= []`
	`752`	`+`
	`753`	`+ifself.message:`
	`754`	`+results=re.findall(`
	`755`	`+r"^Co-authored-by: (.) <(.?)>$",`
	`756`	`+self.message,`
	`757`	`+re.MULTILINE,`
	`758`	`+ )`
	`759`	`+forauthorinresults:`
	`760`	`+co_authors.append(Actor(*author))`
	`761`	`+`
	`762`	`+returnco_authors`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -509,3 +509,18 @@ def test_trailers(self):`
`509`	`509`	`assertKEY_1notincommit.trailers.keys()`
`510`	`510`	`assertKEY_2incommit.trailers.keys()`
`511`	`511`	`assertcommit.trailers[KEY_2]==VALUE_2`
	`512`	`+`
	`513`	`+deftest_commit_co_authors(self):`
	`514`	`+commit=copy.copy(self.rorepo.commit("4251bd5"))`
	`515`	`+commit.message="""Commit message`
	`516`	`+`
	`517`	`+Co-authored-by: Test User 1 <602352+test@users.noreply.github.com>`
	`518`	`+Co-authored-by: test_user_2 <another_user-email@github.com>`
	`519`	`+Co_authored_by: test_user_x <test@github.com>`
	`520`	`+Co-authored-by: test_user_y <test@github.com> text`
	`521`	`+Co-authored-by: test_user_3 <test_user_3@github.com>"""`
	`522`	`+assertcommit.co_authors== [`
	`523`	`+Actor("Test User 1","602352+test@users.noreply.github.com"),`
	`524`	`+Actor("test_user_2","another_user-email@github.com"),`
	`525`	`+Actor("test_user_3","test_user_3@github.com"),`
	`526`	`+ ]`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,13 @@`
`6`	`6`
`7`	`7`	`importos`
`8`	`8`	`importpickle`
	`9`	`+importsys`
`9`	`10`	`importtempfile`
`10`	`11`	`importtime`
`11`	`12`	`fromunittestimportmock,skipIf`
`12`	`13`	`fromdatetimeimportdatetime`
`13`	`14`
	`15`	`+importpytest`
`14`	`16`	`importddt`
`15`	`17`
`16`	`18`	`fromgit.cmdimportdashify`
`@@ -154,6 +156,11 @@ def test_lock_file(self):`
`154`	`156`	`lock_file._obtain_lock_or_raise()`
`155`	`157`	`lock_file._release_lock()`
`156`	`158`
	`159`	`+@pytest.mark.xfail(`
	`160`	`+sys.platform=="cygwin",`
	`161`	`+reason="Cygwin fails here for some reason, always",`
	`162`	`+raises=AssertionError`
	`163`	`+ )`
`157`	`164`	`deftest_blocking_lock_file(self):`
`158`	`165`	`my_file=tempfile.mktemp()`
`159`	`166`	`lock_file=BlockingLockFile(my_file)`

Comments

(0)