revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-21 21:10:56 +01:00
Code Issues Releases Wiki Activity

Fix two minor bugs with recent patches:

Browse source 
- Use the computed remote URI (which may have an explicit 'ssh://' under Git in some cases).
  - Use '$id' correctly rather than casting the URI to an int in the message parser.
This commit is contained in:
epriestley 2011-12-22 06:57:04 -08:00
parent fd8303aa75
commit 3b65864ee1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/repository/daemon/commitdiscovery/git/PhabricatorRepositoryGitCommitDiscoveryDaemon.php
View file

@ -40,7 +40,7 @@ class PhabricatorRepositoryGitCommitDiscoveryDaemon
} }
$remote = $matches[1]; $remote = $matches[1];
$expect = $repository->getDetail('remote-uri'); $expect = $repository->getRemoteURI();
if ($remote != $expect) { if ($remote != $expect) {
$local_path = $repository->getLocalPath(); $local_path = $repository->getLocalPath();
throw new Exception( throw new Exception(

2
src/applications/repository/parser/default/PhabricatorRepositoryDefaultCommitMessageDetailParser.php
View file

@ -47,7 +47,7 @@ class PhabricatorRepositoryDefaultCommitMessageDetailParser
$id = DifferentialRevisionIDFieldSpecification::parseRevisionIDFromURI( $id = DifferentialRevisionIDFieldSpecification::parseRevisionIDFromURI(
$match[1]); $match[1]);
if ($id) { if ($id) {
$details['differential.revisionID'] = (int)$match[1]; $details['differential.revisionID'] = $id;
$revision = id(new DifferentialRevision())->load($id); $revision = id(new DifferentialRevision())->load($id);
if ($revision) { if ($revision) {
$details['differential.revisionPHID'] = $revision->getPHID(); $details['differential.revisionPHID'] = $revision->getPHID();