Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-17 11:10:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #563 from fauxpark/mailmap

Browse Source 
Use .mailmap when displaying committer/author names & emails
This commit is contained in:
Klaus Silveira
2015-03-06 10:31:16 -03:00
parent 9dd055ac3b a5110d597c
commit 0bcddf9f19
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/GitList/Git/Repository.php
View File

@@ -45,8 +45,8 @@ class Repository extends BaseRepository
$logs = $this->getClient()->run($this, $logs = $this->getClient()->run($this,
"show --pretty=format:\"<item><hash>%H</hash>" "show --pretty=format:\"<item><hash>%H</hash>"
. "<short_hash>%h</short_hash><tree>%T</tree><parents>%P</parents>" . "<short_hash>%h</short_hash><tree>%T</tree><parents>%P</parents>"
. "<author>%an</author><author_email>%ae</author_email>" . "<author>%aN</author><author_email>%aE</author_email>"
. "<date>%at</date><commiter>%cn</commiter><commiter_email>%ce</commiter_email>" . "<date>%at</date><commiter>%cN</commiter><commiter_email>%cE</commiter_email>"
. "<commiter_date>%ct</commiter_date>" . "<commiter_date>%ct</commiter_date>"
. "<message><![CDATA[%s]]></message>" . "<message><![CDATA[%s]]></message>"
. "<body><![CDATA[%b]]></body>" . "<body><![CDATA[%b]]></body>"
@@ -213,9 +213,9 @@ class Repository extends BaseRepository
$command = $command =
"log $pager --pretty=format:\"<item><hash>%H</hash>" "log $pager --pretty=format:\"<item><hash>%H</hash>"
. "<short_hash>%h</short_hash><tree>%T</tree><parents>%P</parents>" . "<short_hash>%h</short_hash><tree>%T</tree><parents>%P</parents>"
. "<author>%an</author><author_email>%ae</author_email>" . "<author>%aN</author><author_email>%aE</author_email>"
. "<date>%at</date><commiter>%cn</commiter>" . "<date>%at</date><commiter>%cN</commiter>"
. "<commiter_email>%ce</commiter_email>" . "<commiter_email>%cE</commiter_email>"
. "<commiter_date>%ct</commiter_date>" . "<commiter_date>%ct</commiter_date>"
. "<message><![CDATA[%s]]></message></item>\""; . "<message><![CDATA[%s]]></message></item>\"";
@@ -245,9 +245,9 @@ class Repository extends BaseRepository
$command = $command =
"log --grep={$query} -i --pretty=format:\"<item><hash>%H</hash>" "log --grep={$query} -i --pretty=format:\"<item><hash>%H</hash>"
. "<short_hash>%h</short_hash><tree>%T</tree><parents>%P</parents>" . "<short_hash>%h</short_hash><tree>%T</tree><parents>%P</parents>"
. "<author>%an</author><author_email>%ae</author_email>" . "<author>%aN</author><author_email>%aE</author_email>"
. "<date>%at</date><commiter>%cn</commiter>" . "<date>%at</date><commiter>%cN</commiter>"
. "<commiter_email>%ce</commiter_email>" . "<commiter_email>%cE</commiter_email>"
. "<commiter_date>%ct</commiter_date>" . "<commiter_date>%ct</commiter_date>"
. "<message><![CDATA[%s]]></message></item>\"" . "<message><![CDATA[%s]]></message></item>\""
. " $branch"; . " $branch";
@@ -299,7 +299,7 @@ class Repository extends BaseRepository
public function getAuthorStatistics($branch) public function getAuthorStatistics($branch)
{ {
$logs = $this->getClient()->run($this, 'log --pretty=format:"%an||%ae" ' . $branch); $logs = $this->getClient()->run($this, 'log --pretty=format:"%aN||%aE" ' . $branch);
if (empty($logs)) { if (empty($logs)) {
throw new \RuntimeException('No statistics available'); throw new \RuntimeException('No statistics available');

32
tests/InterfaceTest.php
View File

@@ -114,6 +114,16 @@ class InterfaceTest extends WebTestCase
$repository->addAll(); $repository->addAll();
$repository->commit("First commit"); $repository->commit("First commit");
$repository->checkout('HEAD'); $repository->checkout('HEAD');
// mailmap repository fixture
$git->createRepository(self::$tmpdir . 'mailmap');
$repository = $git->getRepository(self::$tmpdir . 'mailmap');
$repository->setConfig('user.name', 'Luke Skywalker');
$repository->setConfig('user.email', 'luke@rebel.org');
file_put_contents(self::$tmpdir . 'mailmap/README.md', "## mailmap\nmailmap is a *test* repository!");
file_put_contents(self::$tmpdir . 'mailmap/.mailmap', "Anakin Skywalker <darth@empire.com> Luke Skywalker <luke@rebel.org>");
$repository->addAll();
$repository->commit("First commit");
} }
public function createApplication() public function createApplication()
@@ -157,9 +167,13 @@ class InterfaceTest extends WebTestCase
$this->assertEquals('/GitTest/', $crawler->filter('.repository-header a')->eq(6)->attr('href')); $this->assertEquals('/GitTest/', $crawler->filter('.repository-header a')->eq(6)->attr('href'));
$this->assertEquals('/GitTest/master/rss/', $crawler->filter('.repository-header a')->eq(7)->attr('href')); $this->assertEquals('/GitTest/master/rss/', $crawler->filter('.repository-header a')->eq(7)->attr('href'));
$this->assertCount(1, $crawler->filter('div.repository-header a:contains("mailmap")'));
$this->assertEquals('/mailmap/', $crawler->filter('.repository-header a')->eq(8)->attr('href'));
$this->assertEquals('/mailmap/master/rss/', $crawler->filter('.repository-header a')->eq(9)->attr('href'));
$this->assertCount(1, $crawler->filter('div.repository-header a:contains("nested/NestedRepo")')); $this->assertCount(1, $crawler->filter('div.repository-header a:contains("nested/NestedRepo")'));
$this->assertEquals('/nested/NestedRepo/', $crawler->filter('.repository-header a')->eq(8)->attr('href')); $this->assertEquals('/nested/NestedRepo/', $crawler->filter('.repository-header a')->eq(10)->attr('href'));
$this->assertEquals('/nested/NestedRepo/master/rss/', $crawler->filter('.repository-header a')->eq(9)->attr('href')); $this->assertEquals('/nested/NestedRepo/master/rss/', $crawler->filter('.repository-header a')->eq(11)->attr('href'));
$this->assertCount(1, $crawler->filter('div.repository-body:contains("This is a NESTED test repo!")')); $this->assertCount(1, $crawler->filter('div.repository-body:contains("This is a NESTED test repo!")'));
} }
@@ -265,6 +279,11 @@ class InterfaceTest extends WebTestCase
$crawler = $client->request('GET', '/foobar/commits/master/bar.json'); $crawler = $client->request('GET', '/foobar/commits/master/bar.json');
$this->assertTrue($client->getResponse()->isOk()); $this->assertTrue($client->getResponse()->isOk());
$this->assertEquals('First commit', $crawler->filter('.table tbody tr td h4')->eq(0)->text()); $this->assertEquals('First commit', $crawler->filter('.table tbody tr td h4')->eq(0)->text());
$crawler = $client->request('GET', '/mailmap/commits/master/README.md');
$this->assertTrue($client->getResponse()->isOk());
$this->assertEquals('Anakin Skywalker', $crawler->filter('.table tbody tr td span a')->eq(1)->text());
$this->assertEquals('mailto:darth@empire.com', $crawler->filter('.table tbody tr td span a')->eq(1)->attr('href'));
} }
/** /**
@@ -281,6 +300,11 @@ class InterfaceTest extends WebTestCase
$crawler = $client->request('GET', '/foobar/commits'); $crawler = $client->request('GET', '/foobar/commits');
$this->assertTrue($client->getResponse()->isOk()); $this->assertTrue($client->getResponse()->isOk());
$this->assertEquals('First commit', $crawler->filter('.table tbody tr td h4')->eq(0)->text()); $this->assertEquals('First commit', $crawler->filter('.table tbody tr td h4')->eq(0)->text());
$crawler = $client->request('GET', '/mailmap/commits');
$this->assertTrue($client->getResponse()->isOk());
$this->assertEquals('Anakin Skywalker', $crawler->filter('.table tbody tr td span a')->eq(1)->text());
$this->assertEquals('mailto:darth@empire.com', $crawler->filter('.table tbody tr td span a')->eq(1)->attr('href'));
} }
/** /**
@@ -296,6 +320,10 @@ class InterfaceTest extends WebTestCase
$this->assertRegexp('/.md: 1 files/', $crawler->filter('.table tbody')->eq(0)->text()); $this->assertRegexp('/.md: 1 files/', $crawler->filter('.table tbody')->eq(0)->text());
$this->assertRegexp('/Total files: 2/', $crawler->filter('.table tbody')->eq(0)->text()); $this->assertRegexp('/Total files: 2/', $crawler->filter('.table tbody')->eq(0)->text());
$this->assertRegexp('/Luke Skywalker: 1 commits/', $crawler->filter('.table tbody')->eq(0)->text()); $this->assertRegexp('/Luke Skywalker: 1 commits/', $crawler->filter('.table tbody')->eq(0)->text());
$crawler = $client->request('GET', '/mailmap/stats');
$this->assertTrue($client->getResponse()->isOk());
$this->assertRegexp('/Anakin Skywalker: 1 commits/', $crawler->filter('.table tbody')->eq(0)->text());
} }
/** /**