Page MenuHomePhabricator
Files F15478053

D15748.id37950.diff
No OneTemporary
Actions

D15748.id37950.diff
View Options

diff --git a/resources/sql/autopatches/20160418.repoversion.1.sql b/resources/sql/autopatches/20160418.repoversion.1.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20160418.repoversion.1.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_workingcopyversion
+ ADD writeProperties LONGTEXT COLLATE {$COLLATE_TEXT};
diff --git a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
@@ -26,7 +26,8 @@
$command = csprintf('git-receive-pack %s', $repository->getLocalPath());
$did_synchronize = true;
- $repository->synchronizeWorkingCopyBeforeWrite();
+ $viewer = $this->getUser();
+ $repository->synchronizeWorkingCopyBeforeWrite($viewer);
}
$caught = null;
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -2482,7 +2482,8 @@
/**
* @task sync
*/
- public function synchronizeWorkingCopyBeforeWrite() {
+ public function synchronizeWorkingCopyBeforeWrite(
+ PhabricatorUser $actor) {
if (!$this->shouldEnableSynchronization()) {
return;
}
@@ -2516,7 +2517,12 @@
PhabricatorRepositoryWorkingCopyVersion::willWrite(
$repository_phid,
- $device_phid);
+ $device_phid,
+ array(
+ 'userPHID' => $actor->getPHID(),
+ 'epoch' => PhabricatorTime::getNow(),
+ 'devicePHID' => $device_phid,
+ ));
$this->clusterWriteVersion = $max_version;
$this->clusterWriteLock = $write_lock;
diff --git a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
--- a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
@@ -7,6 +7,7 @@
protected $devicePHID;
protected $repositoryVersion;
protected $isWriting;
+ protected $writeProperties;
protected function getConfiguration() {
return array(
@@ -14,6 +15,7 @@
self::CONFIG_COLUMN_SCHEMA => array(
'repositoryVersion' => 'uint32',
'isWriting' => 'bool',
+ 'writeProperties' => 'text?',
),
self::CONFIG_KEY_SCHEMA => array(
'key_workingcopy' => array(
@@ -66,7 +68,10 @@
* lock is released by default. This is a durable lock which stays locked
* by default.
*/
- public static function willWrite($repository_phid, $device_phid) {
+ public static function willWrite(
+ $repository_phid,
+ $device_phid,
+ array $write_properties) {
$version = new self();
$conn_w = $version->establishConnection('w');
$table = $version->getTableName();
@@ -74,16 +79,19 @@
queryfx(
$conn_w,
'INSERT INTO %T
- (repositoryPHID, devicePHID, repositoryVersion, isWriting)
+ (repositoryPHID, devicePHID, repositoryVersion, isWriting,
+ writeProperties)
VALUES
- (%s, %s, %d, %d)
+ (%s, %s, %d, %d, %s)
ON DUPLICATE KEY UPDATE
- isWriting = VALUES(isWriting)',
+ isWriting = VALUES(isWriting),
+ writeProperties = VALUES(writeProperties)',
$table,
$repository_phid,
$device_phid,
0,
- 1);
+ 1,
+ phutil_json_encode($write_properties));
}
@@ -101,7 +109,10 @@
queryfx(
$conn_w,
- 'UPDATE %T SET repositoryVersion = %d, isWriting = 0
+ 'UPDATE %T SET
+ repositoryVersion = %d,
+ isWriting = 0,
+ writeProperties = null
WHERE
repositoryPHID = %s AND
devicePHID = %s AND

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 8, 8:12 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7309962
Default Alt Text
D15748.id37950.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility