##// 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
Martin von Zweigbergk -
r49874:681b25ea default
Show More
Name Size Modified Last Commit Author
/ contrib
automation
benchmarks
chg
docker
examples
fuzz
hgsh
merge-lists
packaging
perf-utils
plan9
python-zstandard
vagrant
vim
win32
Makefile.python Loading ...
all-revsets.txt Loading ...
asv.conf.json Loading ...
base-revsets.txt Loading ...
bash_completion Loading ...
bdiff-torture.py Loading ...
byteify-strings.py Loading ...
casesmash.py Loading ...
catapipe.py Loading ...
check-code.py Loading ...
check-commit Loading ...
check-config.py Loading ...
check-py3-compat.py Loading ...
clang-format-ignorelist Loading ...
debugcmdserver.py Loading ...
debugshell.py Loading ...
dumprevlog Loading ...
editmerge Loading ...
editmergeps.bat Loading ...
editmergeps.ps1 Loading ...
genosxversion.py Loading ...
heptapod-ci.yml Loading ...
hg-ssh Loading ...
hg-test-mode.el Loading ...
hgclient.py Loading ...
hgk Loading ...
hgperf Loading ...
hgweb.fcgi Loading ...
hgweb.wsgi Loading ...
import-checker.py Loading ...
install-windows-dependencies.ps1 Loading ...
logo-droplets.svg Loading ...
memory.py Loading ...
mercurial.el Loading ...
mq.el Loading ...
perf.py Loading ...
phab-clean.py Loading ...
phab-refresh-stack.sh Loading ...
pylintrc Loading ...
python-hook-examples.py Loading ...
python3-ratchet.py Loading ...
python3-whitelist Loading ...
relnotes Loading ...
revsetbenchmarks.py Loading ...
showstack.py Loading ...
simplemerge Loading ...
synthrepo.py Loading ...
tcsh_completion Loading ...
tcsh_completion_build.sh Loading ...
testparseutil.py Loading ...
undumprevlog Loading ...
xml.rnc Loading ...
zsh_completion Loading ...