##// END OF EJS Templates
contrib: add a partial-merge tool for sorted lists (such as Python imports)...
contrib: add a partial-merge tool for sorted lists (such as Python imports) This is a pretty naive tool that uses a regular expression for matching lines. It is based on a Google-internal tool that worked in a similar way. For now, the regular expression is hard-coded to attempt to match single-line Python imports. The only commit I've found in the hg core repo where the tool helped was commit 9cd6292abfdf. I think that's because we often use multiple imports per import statement. I think this tool is still a decent first step (especially once the regex is made configurable in the next patch). The merging should ideally use a proper Python parser and do the merge at the AST (or CST?) level, but that's significantly harder, especially if you want to preserve comments and whitespace. It's also less generic. Differential Revision: https://phab.mercurial-scm.org/D12380

File last commit:

r49730:6000f5b2 default
r49874:681b25ea default
Show More
debugshell.py
64 lines | 1.4 KiB | text/x-python | PythonLexer
Vishakh H
contrib: add debugshell extension
r11633 # debugshell extension
"""a python shell with repo, changelog & manifest objects"""
Pulkit Goyal
debugshell: use absolute_import
r28476 import code
Vishakh H
contrib: add debugshell extension
r11633 import mercurial
Pulkit Goyal
debugshell: use absolute_import
r28476 import sys
Gregory Szorc
debugshell: disable demand importer when importing debugger...
r27721 from mercurial import (
demandimport,
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 pycompat,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
Gregory Szorc
debugshell: disable demand importer when importing debugger...
r27721 )
Gregory Szorc
debugshell: declare command using decorator
r21243
cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Vishakh H
contrib: add debugshell extension
r11633
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
debugshell: abstract out pdb code.interact
r19771 def pdb(ui, repo, msg, **opts):
Vishakh H
contrib: add debugshell extension
r11633 objects = {
'mercurial': mercurial,
'repo': repo,
'cl': repo.changelog,
Durham Goode
manifest: remove last uses of repo.manifest...
r30375 'mf': repo.manifestlog,
Vishakh H
contrib: add debugshell extension
r11633 }
Sean Farley
debugshell: abstract out pdb code.interact
r19771
code.interact(msg, local=objects)
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
debugshell: add function to embed ipython
r19772 def ipdb(ui, repo, msg, **opts):
import IPython
cl = repo.changelog
Durham Goode
manifest: remove last uses of repo.manifest...
r30375 mf = repo.manifestlog
Augie Fackler
formatting: blacken the codebase...
r43346 cl, mf # use variables to appease pyflakes
Sean Farley
debugshell: add function to embed ipython
r19772
IPython.embed()
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 @command(b'debugshell|dbsh', [])
Sean Farley
debugshell: abstract out pdb code.interact
r19771 def debugshell(ui, repo, **opts):
Augie Fackler
formatting: blacken the codebase...
r43346 bannermsg = "loaded repo : %s\n" "using source: %s" % (
pycompat.sysstr(repo.root),
mercurial.__path__[0],
)
Sean Farley
debugshell: abstract out pdb code.interact
r19771
Augie Fackler
formatting: blacken the codebase...
r43346 pdbmap = {'pdb': 'code', 'ipdb': 'IPython'}
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 debugger = ui.config(b"ui", b"debugger")
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773 if not debugger:
debugger = 'pdb'
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 else:
debugger = pycompat.sysstr(debugger)
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773
# if IPython doesn't exist, fallback to code.interact
try:
Gregory Szorc
debugshell: disable demand importer when importing debugger...
r27721 with demandimport.deactivated():
__import__(pdbmap[debugger])
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773 except ImportError:
Augie Fackler
cleanup: mark some ui.(status|note|warn|write) calls as not needing i18n...
r43350 ui.warnnoi18n(
Augie Fackler
formatting: blacken the codebase...
r43346 b"%s debugger specified but %s module was not found\n"
% (debugger, pdbmap[debugger])
)
Pulkit Goyal
py3: make contrib/debugshell.py work with Python 3...
r41980 debugger = b'pdb'
Sean Farley
debugshell: check ui.debugger for which debugger to use
r19773
getattr(sys.modules[__name__], debugger)(ui, repo, bannermsg, **opts)