# HG changeset patch # User Matt Harbison # Date 2018-09-27 02:21:25 # Node ID 9c8eff5cfa1bd2307803e74b261a626f1cfa4e6c # Parent 2209e72f9fcb268cde986a64a0447c56d612ca5c py3: mask out None type when printing in `debuglocks` Apparently, %b doesn't allow None. diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1436,10 +1436,10 @@ def debuglocks(ui, repo, **opts): if ":" in locker: host, pid = locker.split(':') if host == socket.gethostname(): - locker = 'user %s, process %s' % (user, pid) + locker = 'user %s, process %s' % (user or b'None', pid) else: locker = 'user %s, process %s, host %s' \ - % (user, pid, host) + % (user or b'None', pid, host) ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age)) return 1 except OSError as e: