# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 2016-02-16 19:11:45
# Node ID 75f586a1bf55682ae26d3490f8ccc1424b64ba66
# Parent  7f430b2ac7fddb4ad87fda7412dfe88767050735

commandserver: add _readstr and _readlist

Reading a string or a list are common operations for commandserver and
chgserver. This patch adds _readstr and _readlist to avoid duplication.

diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -190,6 +190,25 @@ class server(object):
 
         return data
 
+    def _readstr(self):
+        """read a string from the channel
+
+        format:
+        data length (uint32), data
+        """
+        length = struct.unpack('>I', self._read(4))[0]
+        if not length:
+            return ''
+        return self._read(length)
+
+    def _readlist(self):
+        """read a list of NULL separated strings from the channel"""
+        s = self._readstr()
+        if s:
+            return s.split('\0')
+        else:
+            return []
+
     def runcommand(self):
         """ reads a list of \0 terminated arguments, executes
         and writes the return code to the result channel """