Mercurial > hg > mercurial-crew-with-dirclash
changeset 3067:9b480509658c
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 08 Sep 2006 01:07:21 +0200 |
parents | c6bfe536a1f9 (current diff) 15526271eafb (diff) |
children | 547d1a4aa105 |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -8,7 +8,7 @@ from demandload import demandload from node import * from i18n import gettext as _ -demandload(globals(), "os re sys signal shutil imp urllib pdb") +demandload(globals(), "os re sys signal shutil imp urllib pdb shlex") demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") demandload(globals(), "fnmatch difflib patch random signal tempfile time") demandload(globals(), "traceback errno socket version struct atexit sets bz2") @@ -3223,7 +3223,7 @@ def parse(ui, args): cmd = aliases[0] defaults = ui.config("defaults", cmd) if defaults: - args = defaults.split() + args + args = shlex.split(defaults) + args c = list(i[1]) else: cmd = None