Patchwork [evolve-ext] help: fix typo in help for 'obsolete' option added to import command

login
register
mail settings
Submitter adgar@google.com
Date Nov. 19, 2014, 1:28 a.m.
Message ID <c658a95c1276444b08b2.1416360509@adgar.nyc.corp.google.com>
Download mbox | patch
Permalink /patch/6785/
State Not Applicable
Headers show

Comments

adgar@google.com - Nov. 19, 2014, 1:28 a.m.
# HG changeset patch
# User Mike Edgar <adgar@google.com>
# Date 1416360473 18000
#      Tue Nov 18 20:27:53 2014 -0500
# Node ID c658a95c1276444b08b27e00719d2765bb0eab03
# Parent  04bd66779a1f0e7385e58be9239d7a5fcb5f85d5
help: fix typo in help for 'obsolete' option added to import command
Pierre-Yves David - Nov. 20, 2014, 3:34 a.m.
On 11/18/2014 05:28 PM, Mike Edgar wrote:
> # HG changeset patch
> # User Mike Edgar <adgar@google.com>
> # Date 1416360473 18000
> #      Tue Nov 18 20:27:53 2014 -0500
> # Node ID c658a95c1276444b08b27e00719d2765bb0eab03
> # Parent  04bd66779a1f0e7385e58be9239d7a5fcb5f85d5
> help: fix typo in help for 'obsolete' option added to import command

pushed to main, thanks!
Pierre-Yves David - Nov. 20, 2014, 8:55 p.m.
On 11/18/2014 05:28 PM, Mike Edgar wrote:
> # HG changeset patch
> # User Mike Edgar <adgar@google.com>
> # Date 1416360473 18000
> #      Tue Nov 18 20:27:53 2014 -0500
> # Node ID c658a95c1276444b08b27e00719d2765bb0eab03
> # Parent  04bd66779a1f0e7385e58be9239d7a5fcb5f85d5
> help: fix typo in help for 'obsolete' option added to import command

Quick feedback (summary of IRC discussion): discovery need upgrade and I 
agree with your diagnostic of the problem with the current algorithm. 
However, I think there is smaller step we can take without changing the 
protocol or the storage:

1) restrict common discovery to pushed subset,
2) use phases information.

Patch

diff -r 04bd66779a1f -r c658a95c1276 hgext/evolve.py
--- a/hgext/evolve.py	Mon Oct 20 22:16:24 2014 -0400
+++ b/hgext/evolve.py	Tue Nov 18 20:27:53 2014 -0500
@@ -884,7 +884,7 @@ 
 def _installimportobsolete(ui):
     entry = cmdutil.findcmd('import', commands.table)[1]
     entry[1].append(('', 'obsolete', False,
-                    _('mark the old node as obsoleted by'
+                    _('mark the old node as obsoleted by '
                       'the created commit')))
 
 @eh.wrapfunction(mercurial.cmdutil, 'tryimportone')