Page MenuHomestyx hydra
Files F235561

No OneTemporary
Actions

View Options

diff --git a/src/applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php b/src/applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php
index e259bac12d..d46b264e82 100644
--- a/src/applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php
+++ b/src/applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php
@@ -1,73 +1,88 @@
<?php
/*
* Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
final class DiffusionGitRenameHistoryQuery
extends DiffusionRenameHistoryQuery {
protected function executeQuery() {
$drequest = $this->getRequest();
$repository = $drequest->getRepository();
list($err, $stdout) = $repository->execLocalCommand(
'log --format=%s --follow --find-copies-harder -M -C --summary '.
'%s..%s -- %s',
'%x20',
$this->getOldCommit(),
$drequest->getCommit(),
$drequest->getPath());
if ($err) {
return null;
}
$lines = explode("\n", $stdout);
$lines = array_map('trim', $lines);
$lines = array_filter($lines);
$name = null;
foreach ($lines as $line) {
list($action, $info) = explode(' ', $line, 2);
switch ($action) {
case 'rename':
- // rename path/to/file/{old.ext => new.ext} (86%)
+ // We support these cases:
+ // rename README => README.txt (100%)
+ // rename src/README => README (100%)
+ // rename src/{README => README.txt} (100%)
+ // rename {resources => rsrc}/README (100%)
+ // rename src/{aphront => }/README (100%)
+ // rename src/{ => aphront}/README (100%)
+ // rename src/{docs => ducks}/README (100%)
$matches = null;
$ok = preg_match(
- '/^(.*){(.*) => (.*)} \([0-9%]+\)$/',
+ '/^(.*){(.*) => (.*)}(.*) \([0-9%]+\)$/',
$info,
$matches);
- if (!$ok) {
- throw new Exception(
- "Unparseable git log --summary line: {$line}.");
+ if ($ok) {
+ $name = $matches[1].ltrim($matches[2].$matches[4], '/');
+ } else {
+ $ok = preg_match(
+ '/^(.*) => (.*) \([0-9%]+\)$/',
+ $info,
+ $matches);
+ if (!$ok) {
+ throw new Exception(
+ "Unparseable git log --summary line: {$line}.");
+ }
+ $name = $matches[1];
}
- $name = $matches[1].$matches[2];
break;
case 'create':
// create mode 100644 <filename>
$this->setWasCreated(true);
break;
default:
// Anything else we care about?
break;
}
}
return $name;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 29, 3:33 AM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
187935
Default Alt Text
(3 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)