This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7778

mq: avoid using `__file__` to compare modules
ClosedPublic

Authored by mharbison72 on Dec 30 2019, 1:36 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5bbd770d1324: mq: avoid using `__file__` to compare modules
Summary

This fixes ~70 tests when using an oxidized executable, bringing the current
failure count down to 92 (with 110 skips) when templates/ is copied next to the
executable.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Dec 30 2019, 1:36 PM
mharbison72 added a commit: rHG5bbd770d1324: mq: avoid using `__file__` to compare modules.Jan 8 2020, 2:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5bbd770d1324: mq: avoid using `__file__` to compare modules (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (4 lines)

Diff 19093

hgext/mq.py

''' '''
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import errno import errno
import os import os
import re import re
import shutil import shutil
import sys
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
bin, bin,
hex, hex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
func = entry[0] func = entry[0]
if func.norepo: if func.norepo:
continue continue
entry = extensions.wrapcommand(cmdtable, cmd, mqcommand) entry = extensions.wrapcommand(cmdtable, cmd, mqcommand)
entry[1].extend(mqopt) entry[1].extend(mqopt)
dotable(commands.table) dotable(commands.table)
thismodule = sys.modules["hgext.mq"]
for extname, extmodule in extensions.extensions(): for extname, extmodule in extensions.extensions():
if extmodule.__file__ != __file__: if extmodule != thismodule:
dotable(getattr(extmodule, 'cmdtable', {})) dotable(getattr(extmodule, 'cmdtable', {}))
colortable = { colortable = {
b'qguard.negative': b'red', b'qguard.negative': b'red',
b'qguard.positive': b'yellow', b'qguard.positive': b'yellow',
b'qguard.unguarded': b'green', b'qguard.unguarded': b'green',
b'qseries.applied': b'blue bold underline', b'qseries.applied': b'blue bold underline',
b'qseries.guarded': b'black bold', b'qseries.guarded': b'black bold',
b'qseries.missing': b'red bold', b'qseries.missing': b'red bold',
b'qseries.unapplied': b'black bold', b'qseries.unapplied': b'black bold',
} }