# HG changeset patch
# User Yuya Nishihara <y...@tcha.org>
# Date 1520323525 21600
# Tue Mar 06 02:05:25 2018 -0600
# Node ID f7d9876d750e048b4c0e0ec0682928e86a8e8ecb
# Parent b434965f984eff168a7caaa239277b15729bd0b1
hgk: stop using util.bytesinput() to read a single line from stdin
Appears that the stdio here is an IPC channel between hg and hgk (tk)
processes, which shouldn't need a fancy readline support.
diff --git a/hgext/hgk.py b/hgext/hgk.py
--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -51,7 +51,6 @@ from mercurial import (
pycompat,
registrar,
scmutil,
- util,
)
cmdtable = {}
@@ -105,15 +104,15 @@ def difftree(ui, repo, node1=None, node2
while True:
if opts[r'stdin']:
- try:
- line = util.bytesinput(ui.fin, ui.fout).split(' ')
- node1 = line[0]
- if len(line) > 1:
- node2 = line[1]
- else:
- node2 = None
- except EOFError:
+ line = ui.fin.readline()
+ if not line:
break
+ line = line.rstrip(pycompat.oslinesep).split(b' ')
+ node1 = line[0]
+ if len(line) > 1:
+ node2 = line[1]
+ else:
+ node2 = None
node1 = repo.lookup(node1)
if node2:
node2 = repo.lookup(node2)
@@ -186,12 +185,11 @@ def catfile(ui, repo, type=None, r=None,
#
prefix = ""
if opts[r'stdin']:
- try:
- (type, r) = util.bytesinput(ui.fin, ui.fout).split(' ')
- prefix = " "
- except EOFError:
+ line = ui.fin.readline()
+ if not line:
return
-
+ (type, r) = line.rstrip(pycompat.oslinesep).split(b' ')
+ prefix = " "
else:
if not type or not r:
ui.warn(_("cat-file: type or revision not supplied\n"))
@@ -204,10 +202,10 @@ def catfile(ui, repo, type=None, r=None,
n = repo.lookup(r)
catcommit(ui, repo, n, prefix)
if opts[r'stdin']:
- try:
- (type, r) = util.bytesinput(ui.fin, ui.fout).split(' ')
- except EOFError:
+ line = ui.fin.readline()
+ if not line:
break
+ (type, r) = line.rstrip(pycompat.oslinesep).split(b' ')
else:
break
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
