Patchwork [2,of,3] patchbomb: avoid -r and -B options at the same time

login
register
mail settings
Submitter David Demelier
Date June 6, 2017, 1:05 p.m.
Message ID <421ba4fa3337f4bc9714.1496754304@localhost.localdomain>
Download mbox | patch
Permalink /patch/21215/
State Accepted
Headers show

Comments

David Demelier - June 6, 2017, 1:05 p.m.
# HG changeset patch
# User David Demelier <demelier.david@gmail.com>
# Date 1496731971 -7200
#      Tue Jun 06 08:52:51 2017 +0200
# Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
# Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
patchbomb: avoid -r and -B options at the same time
Augie Fackler - June 6, 2017, 2:18 p.m.
On Tue, Jun 06, 2017 at 03:05:04PM +0200, David Demelier wrote:
> # HG changeset patch
> # User David Demelier <demelier.david@gmail.com>
> # Date 1496731971 -7200
> #      Tue Jun 06 08:52:51 2017 +0200
> # Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
> # Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
> patchbomb: avoid -r and -B options at the same time

I've queued this one, but the other two patches both do not apply and
I can't find the parent listed in the header of patch 1 to try
applying there and then rebasing.

>
> diff -r d32b943335c7 -r 421ba4fa3337 hgext/patchbomb.py
> --- a/hgext/patchbomb.py	Tue Jun 06 08:50:30 2017 +0200
> +++ b/hgext/patchbomb.py	Tue Jun 06 08:52:51 2017 +0200
> @@ -559,6 +559,8 @@
>      if outgoing and bundle:
>          raise error.Abort(_("--outgoing mode always on with --bundle;"
>                             " do not re-specify --outgoing"))
> +    if rev and bookmark:
> +        raise error.Abort(_("-r and -B are mutually exclusive"))
>
>      if outgoing or bundle:
>          if len(revs) > 1:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
David Demelier - June 6, 2017, 2:50 p.m.
Le 06/06/2017 à 16:18, Augie Fackler a écrit :
> On Tue, Jun 06, 2017 at 03:05:04PM +0200, David Demelier wrote:
>> # HG changeset patch
>> # User David Demelier <demelier.david@gmail.com>
>> # Date 1496731971 -7200
>> #      Tue Jun 06 08:52:51 2017 +0200
>> # Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
>> # Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
>> patchbomb: avoid -r and -B options at the same time
> 
> I've queued this one, but the other two patches both do not apply and
> I can't find the parent listed in the header of patch 1 to try
> applying there and then rebasing.

Hi Augie,

The two other patches apply to the mistakes that Yuya requested me to 
write to fix my v2 patchbomb patch.

Regards,
Augie Fackler - June 6, 2017, 3:03 p.m.
On Tue, Jun 06, 2017 at 04:50:52PM +0200, David Demelier wrote:
> Le 06/06/2017 à 16:18, Augie Fackler a écrit :
> > On Tue, Jun 06, 2017 at 03:05:04PM +0200, David Demelier wrote:
> > > # HG changeset patch
> > > # User David Demelier <demelier.david@gmail.com>
> > > # Date 1496731971 -7200
> > > #      Tue Jun 06 08:52:51 2017 +0200
> > > # Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
> > > # Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
> > > patchbomb: avoid -r and -B options at the same time
> >
> > I've queued this one, but the other two patches both do not apply and
> > I can't find the parent listed in the header of patch 1 to try
> > applying there and then rebasing.
>
> Hi Augie,
>
> The two other patches apply to the mistakes that Yuya requested me to write
> to fix my v2 patchbomb patch.

Right, I get that, but they don't apply. Please rebase and resend them.

>
> Regards,
>
> --
> David
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Yuya Nishihara - June 7, 2017, 12:53 p.m.
On Tue, 06 Jun 2017 15:05:04 +0200, David Demelier wrote:
> # HG changeset patch
> # User David Demelier <demelier.david@gmail.com>
> # Date 1496731971 -7200
> #      Tue Jun 06 08:52:51 2017 +0200
> # Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
> # Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
> patchbomb: avoid -r and -B options at the same time
> 
> diff -r d32b943335c7 -r 421ba4fa3337 hgext/patchbomb.py
> --- a/hgext/patchbomb.py	Tue Jun 06 08:50:30 2017 +0200
> +++ b/hgext/patchbomb.py	Tue Jun 06 08:52:51 2017 +0200
> @@ -559,6 +559,8 @@
>      if outgoing and bundle:
>          raise error.Abort(_("--outgoing mode always on with --bundle;"
>                             " do not re-specify --outgoing"))
> +    if rev and bookmark:
> +        raise error.Abort(_("-r and -B are mutually exclusive"))

Perhaps (rev or revs) and bookmark ?
Yuya Nishihara - June 7, 2017, 12:54 p.m.
On Tue, 6 Jun 2017 11:03:31 -0400, Augie Fackler wrote:
> On Tue, Jun 06, 2017 at 04:50:52PM +0200, David Demelier wrote:
> > Le 06/06/2017 à 16:18, Augie Fackler a écrit :
> > > On Tue, Jun 06, 2017 at 03:05:04PM +0200, David Demelier wrote:
> > > > # HG changeset patch
> > > > # User David Demelier <demelier.david@gmail.com>
> > > > # Date 1496731971 -7200
> > > > #      Tue Jun 06 08:52:51 2017 +0200
> > > > # Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
> > > > # Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
> > > > patchbomb: avoid -r and -B options at the same time
> > >
> > > I've queued this one, but the other two patches both do not apply and
> > > I can't find the parent listed in the header of patch 1 to try
> > > applying there and then rebasing.
> >
> > Hi Augie,
> >
> > The two other patches apply to the mistakes that Yuya requested me to write
> > to fix my v2 patchbomb patch.
> 
> Right, I get that, but they don't apply. Please rebase and resend them.

These patches aren't necessary. I've fixed them in flight.

Patch

diff -r d32b943335c7 -r 421ba4fa3337 hgext/patchbomb.py
--- a/hgext/patchbomb.py	Tue Jun 06 08:50:30 2017 +0200
+++ b/hgext/patchbomb.py	Tue Jun 06 08:52:51 2017 +0200
@@ -559,6 +559,8 @@ 
     if outgoing and bundle:
         raise error.Abort(_("--outgoing mode always on with --bundle;"
                            " do not re-specify --outgoing"))
+    if rev and bookmark:
+        raise error.Abort(_("-r and -B are mutually exclusive"))
 
     if outgoing or bundle:
         if len(revs) > 1: