Page MenuHomePhabricator

Clean up a ConduitException around Diffusion merges
ClosedPublic

Authored by epriestley on Feb 3 2015, 2:03 PM.
Tags
None
Referenced Files
F18763477: D11646.diff
Tue, Oct 7, 12:23 AM
F18594226: D11646.diff
Sep 12 2025, 5:29 PM
F18592437: D11646.diff
Sep 12 2025, 12:13 PM
F18580092: D11646.id.diff
Sep 11 2025, 2:19 AM
F18579832: D11646.id28037.diff
Sep 11 2025, 1:57 AM
F18579728: D11646.id28025.diff
Sep 11 2025, 1:51 AM
F18518844: D11646.diff
Sep 5 2025, 3:43 PM
F18092679: D11646.id28025.diff
Aug 7 2025, 12:26 PM
Subscribers

Details

Summary

Ref T7123. Two general issues:

For proxied repositories, we currently throw a ConduitClientException, vs ConduitException for local repositories. This is inconsistent and we should fix it, but I also want to examine the use of try-the-call-and-throw at these sites since it may be something we can update. In particular, trying a call that we know will always fail is now more expensive (in proxied repositories) than it used to be.

Here, we try-and-throw for merges, but they're never supported in Subversion. Just don't bother trying.

Test Plan

Browsed a SVN repository with proxying set up, got a clean commit page.

Diff Detail

Repository
rP Phabricator
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

epriestley retitled this revision from to Clean up a ConduitException around Diffusion merges.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: btrahan.
btrahan edited edge metadata.
This revision is now accepted and ready to land.Feb 3 2015, 5:51 PM
This revision was automatically updated to reflect the committed changes.