Patchwork [STABLE] serve: correct meta variable of --daemon-pipefds option

login
register
mail settings
Submitter Yuya Nishihara
Date Nov. 2, 2014, 5:32 a.m.
Message ID <f2a1ba4710589b47b43b.1414906352@mimosa>
Download mbox | patch
Permalink /patch/6517/
State Accepted
Headers show

Comments

Yuya Nishihara - Nov. 2, 2014, 5:32 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1414902007 -32400
#      Sun Nov 02 13:20:07 2014 +0900
# Branch stable
# Node ID f2a1ba4710589b47b43bd60c2bda4ebf9aa56926
# Parent  c9458f88c411d38726ae8b715b7f942a40957fb4
serve: correct meta variable of --daemon-pipefds option

It was changed to lock path at e22695b4472f.
Matt Mackall - Nov. 3, 2014, 8:06 p.m.
On Sun, 2014-11-02 at 14:32 +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1414902007 -32400
> #      Sun Nov 02 13:20:07 2014 +0900
> # Branch stable
> # Node ID f2a1ba4710589b47b43bd60c2bda4ebf9aa56926
> # Parent  c9458f88c411d38726ae8b715b7f942a40957fb4
> serve: correct meta variable of --daemon-pipefds option

Queued for stable, thanks.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5477,7 +5477,7 @@  def root(ui, repo):
     [('A', 'accesslog', '', _('name of access log file to write to'),
      _('FILE')),
     ('d', 'daemon', None, _('run server in background')),
-    ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
+    ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
     ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
     # use string type, then we can check if something was passed
     ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),