Patchwork [cleanup] unbundle: gratuitous fix white spacing "issue"

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 7, 2015, 9:05 p.m.
Message ID <d8f8e392678c870492bc.1446930347@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/11321/
State Accepted
Headers show

Comments

Pierre-Yves David - Nov. 7, 2015, 9:05 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1446930189 18000
#      Sat Nov 07 16:03:09 2015 -0500
# Node ID d8f8e392678c870492bc3684001ecc338abe7f49
# Parent  f9984f76fd90e439221425d751e29bae17bec995
# EXP-Topic cleanup
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
#              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r d8f8e392678c
unbundle: gratuitous fix white spacing "issue"

We were missing on space on this block.
Yuya Nishihara - Nov. 8, 2015, 1:41 p.m.
On Sat, 07 Nov 2015 16:05:47 -0500, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1446930189 18000
> #      Sat Nov 07 16:03:09 2015 -0500
> # Node ID d8f8e392678c870492bc3684001ecc338abe7f49
> # Parent  f9984f76fd90e439221425d751e29bae17bec995
> # EXP-Topic cleanup
> # Available At http://hg.netv6.net/marmoute-wip/mercurial/
> #              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r d8f8e392678c
> unbundle: gratuitous fix white spacing "issue"
> 
> We were missing on space on this block.
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -6576,14 +6576,14 @@ def unbundle(ui, repo, fname1, *fnames, 
>                      op = bundle2.applybundle(repo, gen, tr, source='unbundle',
>                                               url='bundle:' + fname)
>                      tr.close()
>                  except error.BundleUnknownFeatureError as exc:
>                      raise error.Abort(_('%s: unknown bundle feature, %s')
> -                                     % (fname, exc),
> -                                     hint=_("see https://mercurial-scm.org/"
> -                                            "wiki/BundleFeature for more "
> -                                            "information"))
> +                                      % (fname, exc),
> +                                      hint=_("see https://mercurial-scm.org/"
> +                                             "wiki/BundleFeature for more "
> +                                             "information"))

LGTM. We're missing it after the kill of util.Abort. :-)
Yuya Nishihara - Nov. 9, 2015, 12:56 p.m.
On Sun, 8 Nov 2015 22:41:08 +0900, Yuya Nishihara wrote:
> On Sat, 07 Nov 2015 16:05:47 -0500, Pierre-Yves David wrote:
> > # HG changeset patch
> > # User Pierre-Yves David <pierre-yves.david@fb.com>
> > # Date 1446930189 18000
> > #      Sat Nov 07 16:03:09 2015 -0500
> > # Node ID d8f8e392678c870492bc3684001ecc338abe7f49
> > # Parent  f9984f76fd90e439221425d751e29bae17bec995
> > # EXP-Topic cleanup
> > # Available At http://hg.netv6.net/marmoute-wip/mercurial/
> > #              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r d8f8e392678c
> > unbundle: gratuitous fix white spacing "issue"
> > 
> > We were missing on space on this block.
> > 
> > diff --git a/mercurial/commands.py b/mercurial/commands.py
> > --- a/mercurial/commands.py
> > +++ b/mercurial/commands.py
> > @@ -6576,14 +6576,14 @@ def unbundle(ui, repo, fname1, *fnames, 
> >                      op = bundle2.applybundle(repo, gen, tr, source='unbundle',
> >                                               url='bundle:' + fname)
> >                      tr.close()
> >                  except error.BundleUnknownFeatureError as exc:
> >                      raise error.Abort(_('%s: unknown bundle feature, %s')
> > -                                     % (fname, exc),
> > -                                     hint=_("see https://mercurial-scm.org/"
> > -                                            "wiki/BundleFeature for more "
> > -                                            "information"))
> > +                                      % (fname, exc),
> > +                                      hint=_("see https://mercurial-scm.org/"
> > +                                             "wiki/BundleFeature for more "
> > +                                             "information"))
> 
> LGTM. We're missing it after the kill of util.Abort. :-)

and pushed to clowncopter. ;)

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6576,14 +6576,14 @@  def unbundle(ui, repo, fname1, *fnames, 
                     op = bundle2.applybundle(repo, gen, tr, source='unbundle',
                                              url='bundle:' + fname)
                     tr.close()
                 except error.BundleUnknownFeatureError as exc:
                     raise error.Abort(_('%s: unknown bundle feature, %s')
-                                     % (fname, exc),
-                                     hint=_("see https://mercurial-scm.org/"
-                                            "wiki/BundleFeature for more "
-                                            "information"))
+                                      % (fname, exc),
+                                      hint=_("see https://mercurial-scm.org/"
+                                             "wiki/BundleFeature for more "
+                                             "information"))
                 finally:
                     if tr:
                         tr.release()
                 changes = [r.get('return', 0)
                            for r in op.records['changegroup']]