2011-01-10 00:22:25 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright 2011 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.
|
|
|
|
*/
|
|
|
|
|
2011-02-19 20:36:08 +01:00
|
|
|
/**
|
|
|
|
* Interfaces with the VCS in the working copy.
|
|
|
|
*
|
|
|
|
* @group workingcopy
|
|
|
|
*/
|
2011-01-10 00:22:25 +01:00
|
|
|
abstract class ArcanistRepositoryAPI {
|
|
|
|
|
|
|
|
const FLAG_MODIFIED = 1;
|
|
|
|
const FLAG_ADDED = 2;
|
|
|
|
const FLAG_DELETED = 4;
|
|
|
|
const FLAG_UNTRACKED = 8;
|
|
|
|
const FLAG_CONFLICT = 16;
|
|
|
|
const FLAG_MISSING = 32;
|
|
|
|
const FLAG_UNSTAGED = 64;
|
|
|
|
const FLAG_UNCOMMITTED = 128;
|
|
|
|
const FLAG_EXTERNALS = 256;
|
|
|
|
|
2011-03-13 02:57:35 +01:00
|
|
|
// Occurs in SVN when you replace a file with a directory without telling
|
|
|
|
// SVN about it.
|
2011-01-10 00:22:25 +01:00
|
|
|
const FLAG_OBSTRUCTED = 512;
|
|
|
|
|
2011-03-13 02:57:35 +01:00
|
|
|
// Occurs in SVN when an update was interrupted or failed, e.g. you ^C'd it.
|
|
|
|
const FLAG_INCOMPLETE = 1024;
|
|
|
|
|
2011-01-10 00:22:25 +01:00
|
|
|
protected $path;
|
|
|
|
protected $diffLinesOfContext = 0x7FFF;
|
|
|
|
|
|
|
|
abstract public function getSourceControlSystemName();
|
|
|
|
|
|
|
|
public function getDiffLinesOfContext() {
|
|
|
|
return $this->diffLinesOfContext;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setDiffLinesOfContext($lines) {
|
|
|
|
$this->diffLinesOfContext = $lines;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static function newAPIFromWorkingCopyIdentity(
|
|
|
|
ArcanistWorkingCopyIdentity $working_copy) {
|
|
|
|
|
|
|
|
$root = $working_copy->getProjectRoot();
|
|
|
|
|
|
|
|
if (!$root) {
|
|
|
|
throw new ArcanistUsageException(
|
|
|
|
"There is no readable '.arcconfig' file in the working directory or ".
|
|
|
|
"any parent directory. Create an '.arcconfig' file to configure arc.");
|
|
|
|
}
|
|
|
|
|
Basic Mercurial support for Arcanist
Summary:
There's a lot of ground left to cover but this makes "arc diff" work (on one
trivial diff) in my sandbox, at least, and supports parsing of Mercurial native
diffs (which are unified + a custom header). Piles of missing features, still.
Some of this is blocked by me not understanding the mercurial model well yet.
This is also a really good opportunity for cleanup (especially, reducing the
level of "instanceof" in the diff workflow), I'll try to do a bunch of that in
followup diffs.
Test Plan: Ran "arc diff" in a mercurial repository, got a diff out of it.
Reviewed By: aran
Reviewers: Makinde, jungejason, tuomaspelkonen, aran, codeblock
CC: aran, epriestley, codeblock, fratrik
Differential Revision: 792
2011-08-09 18:00:29 +02:00
|
|
|
if (Filesystem::pathExists($root.'/.svn')) {
|
|
|
|
return newv('ArcanistSubversionAPI', array($root));
|
2011-01-10 00:22:25 +01:00
|
|
|
}
|
|
|
|
|
Basic Mercurial support for Arcanist
Summary:
There's a lot of ground left to cover but this makes "arc diff" work (on one
trivial diff) in my sandbox, at least, and supports parsing of Mercurial native
diffs (which are unified + a custom header). Piles of missing features, still.
Some of this is blocked by me not understanding the mercurial model well yet.
This is also a really good opportunity for cleanup (especially, reducing the
level of "instanceof" in the diff workflow), I'll try to do a bunch of that in
followup diffs.
Test Plan: Ran "arc diff" in a mercurial repository, got a diff out of it.
Reviewed By: aran
Reviewers: Makinde, jungejason, tuomaspelkonen, aran, codeblock
CC: aran, epriestley, codeblock, fratrik
Differential Revision: 792
2011-08-09 18:00:29 +02:00
|
|
|
if (Filesystem::pathExists($root.'/.hg')) {
|
|
|
|
// TODO: Stabilize and remove.
|
|
|
|
file_put_contents(
|
|
|
|
'php://stderr',
|
|
|
|
phutil_console_format(
|
|
|
|
"**WARNING:** Mercurial support is largely imaginary right now.\n"));
|
|
|
|
|
|
|
|
return newv('ArcanistMercurialAPI', array($root));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-10 00:22:25 +01:00
|
|
|
$git_root = self::discoverGitBaseDirectory($root);
|
|
|
|
if ($git_root) {
|
|
|
|
if (!Filesystem::pathsAreEquivalent($root, $git_root)) {
|
|
|
|
throw new ArcanistUsageException(
|
|
|
|
"'.arcconfig' file is located at '{$root}', but working copy root ".
|
|
|
|
"is '{$git_root}'. Move '.arcconfig' file to the working copy root.");
|
|
|
|
}
|
Basic Mercurial support for Arcanist
Summary:
There's a lot of ground left to cover but this makes "arc diff" work (on one
trivial diff) in my sandbox, at least, and supports parsing of Mercurial native
diffs (which are unified + a custom header). Piles of missing features, still.
Some of this is blocked by me not understanding the mercurial model well yet.
This is also a really good opportunity for cleanup (especially, reducing the
level of "instanceof" in the diff workflow), I'll try to do a bunch of that in
followup diffs.
Test Plan: Ran "arc diff" in a mercurial repository, got a diff out of it.
Reviewed By: aran
Reviewers: Makinde, jungejason, tuomaspelkonen, aran, codeblock
CC: aran, epriestley, codeblock, fratrik
Differential Revision: 792
2011-08-09 18:00:29 +02:00
|
|
|
|
|
|
|
return newv('ArcanistGitAPI', array($root));
|
2011-01-10 00:22:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
throw new ArcanistUsageException(
|
|
|
|
"The current working directory is not part of a working copy for a ".
|
Basic Mercurial support for Arcanist
Summary:
There's a lot of ground left to cover but this makes "arc diff" work (on one
trivial diff) in my sandbox, at least, and supports parsing of Mercurial native
diffs (which are unified + a custom header). Piles of missing features, still.
Some of this is blocked by me not understanding the mercurial model well yet.
This is also a really good opportunity for cleanup (especially, reducing the
level of "instanceof" in the diff workflow), I'll try to do a bunch of that in
followup diffs.
Test Plan: Ran "arc diff" in a mercurial repository, got a diff out of it.
Reviewed By: aran
Reviewers: Makinde, jungejason, tuomaspelkonen, aran, codeblock
CC: aran, epriestley, codeblock, fratrik
Differential Revision: 792
2011-08-09 18:00:29 +02:00
|
|
|
"supported version control system (svn, git or mercurial).");
|
2011-01-10 00:22:25 +01:00
|
|
|
}
|
|
|
|
|
Basic Mercurial support for Arcanist
Summary:
There's a lot of ground left to cover but this makes "arc diff" work (on one
trivial diff) in my sandbox, at least, and supports parsing of Mercurial native
diffs (which are unified + a custom header). Piles of missing features, still.
Some of this is blocked by me not understanding the mercurial model well yet.
This is also a really good opportunity for cleanup (especially, reducing the
level of "instanceof" in the diff workflow), I'll try to do a bunch of that in
followup diffs.
Test Plan: Ran "arc diff" in a mercurial repository, got a diff out of it.
Reviewed By: aran
Reviewers: Makinde, jungejason, tuomaspelkonen, aran, codeblock
CC: aran, epriestley, codeblock, fratrik
Differential Revision: 792
2011-08-09 18:00:29 +02:00
|
|
|
public function __construct($path) {
|
2011-01-10 00:22:25 +01:00
|
|
|
$this->path = $path;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getPath($to_file = null) {
|
|
|
|
if ($to_file !== null) {
|
|
|
|
return $this->path.'/'.ltrim($to_file, '/');
|
|
|
|
} else {
|
|
|
|
return $this->path.'/';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getUntrackedChanges() {
|
|
|
|
return $this->getWorkingCopyFilesWithMask(self::FLAG_UNTRACKED);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getUnstagedChanges() {
|
|
|
|
return $this->getWorkingCopyFilesWithMask(self::FLAG_UNSTAGED);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getUncommittedChanges() {
|
|
|
|
return $this->getWorkingCopyFilesWithMask(self::FLAG_UNCOMMITTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getMergeConflicts() {
|
|
|
|
return $this->getWorkingCopyFilesWithMask(self::FLAG_CONFLICT);
|
|
|
|
}
|
|
|
|
|
2011-03-13 02:57:35 +01:00
|
|
|
public function getIncompleteChanges() {
|
|
|
|
return $this->getWorkingCopyFilesWithMask(self::FLAG_INCOMPLETE);
|
|
|
|
}
|
|
|
|
|
2011-01-10 00:22:25 +01:00
|
|
|
private function getWorkingCopyFilesWithMask($mask) {
|
|
|
|
$match = array();
|
|
|
|
foreach ($this->getWorkingCopyStatus() as $file => $flags) {
|
|
|
|
if ($flags & $mask) {
|
|
|
|
$match[] = $file;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $match;
|
|
|
|
}
|
|
|
|
|
|
|
|
private static function discoverGitBaseDirectory($root) {
|
|
|
|
try {
|
|
|
|
list($stdout) = execx(
|
|
|
|
'(cd %s; git rev-parse --show-cdup)',
|
|
|
|
$root);
|
|
|
|
return Filesystem::resolvePath(rtrim($stdout, "\n"), $root);
|
|
|
|
} catch (CommandException $ex) {
|
|
|
|
if (preg_match('/^fatal: Not a git repository/', $ex->getStdErr())) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
throw $ex;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
abstract public function getBlame($path);
|
|
|
|
abstract public function getWorkingCopyStatus();
|
|
|
|
abstract public function getRawDiffText($path);
|
2011-01-11 22:02:38 +01:00
|
|
|
abstract public function getOriginalFileData($path);
|
|
|
|
abstract public function getCurrentFileData($path);
|
2011-08-24 03:48:55 +02:00
|
|
|
abstract public function getLocalCommitInformation();
|
2011-01-10 00:22:25 +01:00
|
|
|
|
2011-09-15 03:44:54 +02:00
|
|
|
|
|
|
|
abstract public function supportsRelativeLocalCommits();
|
|
|
|
|
|
|
|
public function parseRelativeLocalCommit(array $argv) {
|
|
|
|
throw new Exception("This VCS does not support relative local commits.");
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getAllLocalChanges() {
|
|
|
|
throw new Exception("This VCS does not support getting all local changes.");
|
|
|
|
}
|
|
|
|
|
2011-01-10 00:22:25 +01:00
|
|
|
}
|