obsexchange: make compatible with some unreleased 4.5 versions
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 19 Mar 2018 15:20:40 -0700
changeset 3576 89acae8f7e93
parent 3575 97530d6e340d
child 3577 279d8b610ac5
obsexchange: make compatible with some unreleased 4.5 versions We don't generally care to be compatible with unreleased versions of hg, but this is just a one-line change to be compatible with a range of commits before 158d4ecc03c8 (wireprotoserver: move all wire protocol handling logic out of hgweb, 2018-03-08), so hopefull it can be worth it.
hgext3rd/evolve/obsexchange.py
--- a/hgext3rd/evolve/obsexchange.py	Mon Mar 19 15:46:17 2018 -0700
+++ b/hgext3rd/evolve/obsexchange.py	Mon Mar 19 15:20:40 2018 -0700
@@ -30,7 +30,7 @@
 try:
     from mercurial import wireprotoserver
     wireprotoserver.handlewsgirequest
-except ImportError:
+except (ImportError, AttributeError):
     wireprotoserver = None
 
 from mercurial.hgweb import common as hgwebcommon