@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Pass correct number of parameters to pht() when closing a branch in Mercurial
Summary: Ref T5050. This fixes the immediate error (bad pht()) but doesn't fix the other error (can't `--close-branch`) yet.
Test Plan: Pushed a `--close-branch` commit, got a first-level error instead of an error about an error.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T5050
Differential Revision: https://secure.phabricator.com/D9119
+6
-2
+6
-2
src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+6
-2
src/applications/diffusion/engine/DiffusionCommitHookEngine.php
···
737
737
738
738
if (!$new_heads) {
739
739
if ($old_heads) {
740
+
// TODO: This comment is wrong, and branches can be deleted with
741
+
// --close-branch. Fix it soon: see T5050.
740
742
// It looks like this push deletes a branch, but that isn't possible
741
743
// in Mercurial, so something is going wrong here. Bail out.
742
744
throw new Exception(
743
745
pht(
744
746
'Mercurial repository has no new head for branch "%s" after '.
745
-
'push. This is unexpected; rejecting change.'));
747
+
'push. This is unexpected; rejecting change.',
748
+
$ref));
746
749
} else {
747
750
// Obviously, this should never be possible either, as it makes
748
751
// no sense. Explode.
749
752
throw new Exception(
750
753
pht(
751
754
'Mercurial repository has no new or old heads for branch "%s" '.
752
-
'after push. This makes no sense; rejecting change.'));
755
+
'after push. This makes no sense; rejecting change.',
756
+
$ref));
753
757
}
754
758
}
755
759