Mercurial > evolve
changeset 6306:075f365a53cf
topic: remove validator safeguard that wasn't safeguarding anything
The else block was simply setting origvalidator to None, but it's not used
unless hg is version <= 5.3, but in that case origvalidator is set to
tr._validator. So the block wasn't necessary, but also we can't call None as a
function, so it didn't make a lot of sense either way.
Also adding return to return the original validator return value. Mostly for
consistence, because validators either raise an exception or they don't, return
value currently doesn't seem to be used.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 15 Aug 2022 18:50:24 +0400 |
| parents | 77ce98287dc2 |
| children | 554edfc7c55a |
| files | hgext3rd/topic/__init__.py |
| diffstat | 1 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Thu Aug 11 11:32:30 2022 +0400 +++ b/hgext3rd/topic/__init__.py Mon Aug 15 18:50:24 2022 +0400 @@ -640,8 +640,6 @@ if util.safehasattr(tr, '_validator'): # hg <= 5.3 (36f08ae87ef6) origvalidator = tr._validator - else: - origvalidator = None def _validate(tr2): repo = reporef() @@ -649,7 +647,7 @@ def validator(tr2): _validate(tr2) - origvalidator(tr2) + return origvalidator(tr2) if util.safehasattr(tr, '_validator'): # hg <= 5.3 (36f08ae87ef6) @@ -666,8 +664,6 @@ if util.safehasattr(tr, '_validator'): # hg <= 5.3 (36f08ae87ef6) origvalidator = tr._validator - else: - origvalidator = None def _validate(tr2): repo = reporef() @@ -700,8 +696,6 @@ if util.safehasattr(tr, '_validator'): # hg <= 5.3 (36f08ae87ef6) origvalidator = tr._validator - else: - origvalidator = None def _validate(tr2): repo = reporef()