From 73c4240415e033571144e486ff67411f68dd2b19 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 8 Jul 2020 13:25:46 -0700 Subject: [PATCH] Add some additional patterns to the "filter Mercurial --debug output" list Summary: Modern Mercurial may emit some more patterns under "--debug". This whole list is gross and can likely now be eliminated by increasing the minimum required Mercurial version (as `arc` has), but just paper over it for now. Test Plan: Locally, saw some views return to functional behavior that weren't previously working on a modern version of Mercurial. The reproduction case is likely something in the vein of "repository is not writable by webserver, look at history view". Differential Revision: https://secure.phabricator.com/D21398 --- .../diffusion/protocol/DiffusionMercurialCommandEngine.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php b/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php index 39d89e3e4c..03705ad49d 100644 --- a/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php +++ b/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php @@ -68,10 +68,15 @@ final class DiffusionMercurialCommandEngine // http://selenic.com/pipermail/mercurial-devel/2011-February/028541.html // // After Jan 2015, it may also fail to write to a revision branch cache. + // + // Separately, it may fail to write to a different branch cache, and may + // encounter issues reading the branch cache. $ignore = array( 'ignoring untrusted configuration option', "couldn't write revision branch cache:", + "couldn't write branch cache:", + 'invalid branchheads cache', ); foreach ($ignore as $key => $pattern) { -- 2.11.4.GIT