Submitter | timeless@mozdev.org |
---|---|
Date | Dec. 7, 2015, 8:23 p.m. |
Message ID | <c6ffc4847ba2f260943c.1449519828@waste.org> |
Download | mbox | patch |
Permalink | /patch/11910/ |
State | Superseded |
Commit | 84e85f461b7972325877cbeac34a44544fef86ac |
Headers | show |
Comments
On Monday, 07 December 2015 at 14:23, timeless wrote: > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1448911706 0 > # Mon Nov 30 19:28:26 2015 +0000 > # Node ID c6ffc4847ba2f260943c0cd3a9dbd058a080f266 > # Parent 4eb33ce681a1ac1df40845145e336c5c39b7497a > transplant: use Oxford comma > > diff --git a/hgext/transplant.py b/hgext/transplant.py > --- a/hgext/transplant.py > +++ b/hgext/transplant.py > @@ -599,7 +599,7 @@ > return > if not (opts.get('source') or revs or > opts.get('merge') or opts.get('branch')): > - raise error.Abort(_('no source URL, branch revision or revision ' > + raise error.Abort(_('no source URL, branch revision, nor revision ' Are you sure "nor" is correct there? > 'list provided')) > if opts.get('all'): > if not opts.get('branch'): > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
On Mon, Dec 7, 2015 at 4:11 PM, Brendan Cully <brendan@kublai.com> wrote: >> - raise error.Abort(_('no source URL, branch revision or revision ' >> + raise error.Abort(_('no source URL, branch revision, nor revision ' > > Are you sure "nor" is correct there? No, I'm not sure :) http://english.stackexchange.com/questions/103148/neither-nor-nor-more-than-one-nor Kipling at least was ok with using a `nor` and not always including it between each item. Beyond that, I'm much more interested in the comma than the nor, so if someone wants to take the comma only, I'd be quite happy w/ that. We can figure out `nor` later...
I think it's better as "or" here, but I am all for the Oxford comma. On Monday, 07 December 2015 at 16:28, timeless wrote: > On Mon, Dec 7, 2015 at 4:11 PM, Brendan Cully <brendan@kublai.com> wrote: > >> - raise error.Abort(_('no source URL, branch revision or revision ' > >> + raise error.Abort(_('no source URL, branch revision, nor revision ' > > > > Are you sure "nor" is correct there? > > No, I'm not sure :) > > http://english.stackexchange.com/questions/103148/neither-nor-nor-more-than-one-nor > Kipling at least was ok with using a `nor` and not always including it > between each item. > > Beyond that, I'm much more interested in the comma than the nor, so if > someone wants to take the comma only, I'd be quite happy w/ that. We > can figure out `nor` later... > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -599,7 +599,7 @@ return if not (opts.get('source') or revs or opts.get('merge') or opts.get('branch')): - raise error.Abort(_('no source URL, branch revision or revision ' + raise error.Abort(_('no source URL, branch revision, nor revision ' 'list provided')) if opts.get('all'): if not opts.get('branch'):