Patchwork [2,of,5] cmdutil: limit uses of `or`

login
register
mail settings
Submitter timeless@mozdev.org
Date Oct. 15, 2015, 9:05 p.m.
Message ID <ea351d6956fc625aa471.1444943137@waste.org>
Download mbox | patch
Permalink /patch/11120/
State Deferred
Headers show

Comments

timeless@mozdev.org - Oct. 15, 2015, 9:05 p.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1444851503 14400
#      Wed Oct 14 15:38:23 2015 -0400
# Node ID ea351d6956fc625aa471724ca273615af8bcfafb
# Parent  89af3f59bdd54806cdd318fbd31cc7bf8485bda8
cmdutil: limit uses of `or`

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -492,7 +492,7 @@ 
         if file_:
             msg = _('cannot specify filename with --changelog or --manifest')
         elif not repo:
-            msg = _('cannot specify --changelog or --manifest or --dir '
+            msg = _('cannot specify --changelog, --manifest, or --dir '
                     'without a repository')
     if msg:
         raise error.Abort(msg)