Patchwork transplant: use Oxford comma

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 9, 2015, 6:15 a.m.
Message ID <c41cb6d2b7dbd62b1033.1449641717@waste.org>
Download mbox | patch
Permalink /patch/11947/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 9, 2015, 6:15 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1448911706 0
#      Mon Nov 30 19:28:26 2015 +0000
# Node ID c41cb6d2b7dbd62b1033727f8606b8c09fc4aa88
# Parent  42aa0e570eaa364a622bc4443b0bcb79b1100a58
transplant: use Oxford comma
Pierre-Yves David - Dec. 10, 2015, 9 p.m.
On 12/09/2015 06:15 AM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1448911706 0
> #      Mon Nov 30 19:28:26 2015 +0000
> # Node ID c41cb6d2b7dbd62b1033727f8606b8c09fc4aa88
> # Parent  42aa0e570eaa364a622bc4443b0bcb79b1100a58
> transplant: use Oxford comma

Pushed to the clowncopter, thanks.

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, or revision '
                                'list provided'))
         if opts.get('all'):
             if not opts.get('branch'):