[PATCH 1 of 3] patchbomb: get rid of patches variable from merge error

David Demelier demelier.david at gmail.com
Tue Jun 6 09:05:03 EDT 2017


# HG changeset patch
# User David Demelier <demelier.david at gmail.com>
# Date 1496731830 -7200
#      Tue Jun 06 08:50:30 2017 +0200
# Node ID d32b943335c7e97fc6016063d5898b3b7a06519f
# Parent  78767485c1feff1593ca39c8986a29abd44cc567
patchbomb: get rid of patches variable from merge error

diff -r 78767485c1fe -r d32b943335c7 hgext/patchbomb.py
--- a/hgext/patchbomb.py	Fri Feb 03 15:02:27 2017 +0100
+++ b/hgext/patchbomb.py	Tue Jun 06 08:50:30 2017 +0200
@@ -548,14 +548,12 @@
     outgoing = opts.get('outgoing')
     rev = opts.get('rev')
     bookmark = opts.get('bookmark')
-    # internal option used by pbranches
-    patches = opts.get('patches')
 
     if not (opts.get('test') or mbox):
         # really sending
         mail.validateconfig(ui)
 
-    if not (revs or rev or outgoing or bundle or patches or bookmark):
+    if not (revs or rev or outgoing or bundle or bookmark):
         raise error.Abort(_('specify at least one changeset with -B, -r or -o'))
 
     if outgoing and bundle:


More information about the Mercurial-devel mailing list