Patchwork exchange: fix indentation level

login
register
mail settings
Submitter Pierre-Yves David
Date May 27, 2014, 12:20 a.m.
Message ID <c5346e482b1f7b33fcdd.1401150040@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/4866/
State Accepted
Commit 7bcf4adadd2d84923bceda515704a3396eccfc66
Headers show

Comments

Pierre-Yves David - May 27, 2014, 12:20 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1400791195 25200
#      Thu May 22 13:39:55 2014 -0700
# Node ID c5346e482b1f7b33fcddce131b8f44b3fe98a396
# Parent  41e1922963546136d647d9dd43d3a20730b5527d
exchange: fix indentation level
Augie Fackler - May 29, 2014, 5:55 p.m.
On May 26, 2014, at 8:20 PM, pierre-yves.david@ens-lyon.org wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1400791195 25200
> #      Thu May 22 13:39:55 2014 -0700
> # Node ID c5346e482b1f7b33fcddce131b8f44b3fe98a396
> # Parent  41e1922963546136d647d9dd43d3a20730b5527d
> exchange: fix indentation level

For patchbot: this is queued.

> 
> diff --git a/mercurial/exchange.py b/mercurial/exchange.py
> --- a/mercurial/exchange.py
> +++ b/mercurial/exchange.py
> @@ -622,12 +622,12 @@ def _pullchangeset(pullop):
>                                      heads=pullop.heads or pullop.rheads)
>     elif pullop.heads is None:
>         cg = pullop.remote.changegroup(pullop.fetch, 'pull')
>     elif not pullop.remote.capable('changegroupsubset'):
>         raise util.Abort(_("partial pull cannot be done because "
> -                                   "other repository doesn't support "
> -                                   "changegroupsubset."))
> +                           "other repository doesn't support "
> +                           "changegroupsubset."))
>     else:
>         cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull')
>     pullop.cgresult = changegroup.addchangegroup(pullop.repo, cg, 'pull',
>                                                  pullop.remote.url())
> 
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -622,12 +622,12 @@  def _pullchangeset(pullop):
                                      heads=pullop.heads or pullop.rheads)
     elif pullop.heads is None:
         cg = pullop.remote.changegroup(pullop.fetch, 'pull')
     elif not pullop.remote.capable('changegroupsubset'):
         raise util.Abort(_("partial pull cannot be done because "
-                                   "other repository doesn't support "
-                                   "changegroupsubset."))
+                           "other repository doesn't support "
+                           "changegroupsubset."))
     else:
         cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull')
     pullop.cgresult = changegroup.addchangegroup(pullop.repo, cg, 'pull',
                                                  pullop.remote.url())