Mercurial > hg
view tests/list-tree.py @ 40472:da2e874fe582 stable
resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
Previously, with --config resolve.mark-check=abort, running `hg resolve -m foo`
would abort and emit a message saying to use --all. This command does not work,
though: `hg resolve -m foo --all`, and it's really weird for --all to be the
"--force" flag.
My original goal with the option was to make it so that `hg resolve -m` (no
filename arguments) was safer, which is why --all is used; in my mind, `hg
resolve -m foo` should always mark it as resolved, and `--all` is how you
specify "all the files", so that's why I chose `hg resolve -m --all` as the way
out of `hg resolve -m` aborting. This commit makes all of this work the way it
was meant to in my head :)
Differential Revision: https://phab.mercurial-scm.org/D5218
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Fri, 02 Nov 2018 11:57:45 -0700 |
parents | acff41957b34 |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import ( absolute_import, print_function, ) import argparse import os ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() def gather(): for p in opts.path: if not os.path.exists(p): return if os.path.isdir(p): yield p + os.path.sep for dirpath, dirs, files in os.walk(p): for d in dirs: yield os.path.join(dirpath, d) + os.path.sep for f in files: yield os.path.join(dirpath, f) else: yield p print('\n'.join(sorted(gather(), key=lambda x: x.replace(os.path.sep, '/'))))