mercurial-scm/python-hglib: hglib/client.py comparison

client: add missing options to import_() and don't read the file before calling hg, just pass it as one of the arguments

comparison

equal deleted inserted replaced

-:c2a9b716cd80
+:400cb1520834
 self.server.stdin.write('getencoding\n')
 self._encoding = self._readfromchannel('r')
 return self._encoding
-def import_(self, patch):
+def import_(self, patches, strip=None, force=False, nocommit=False,
-if isinstance(patch, str):
+bypass=False, exact=False, importbranch=False, message=None,
-fp = open(patch)
+date=None, user=None, similarity=None):
+"""
+patches can be a list of file names with patches to apply
+or a file-like object that contains a patch (needs read and readline)
+"""
+if hasattr(patches, 'read') and hasattr(patches, 'readline'):
+patch = patches
+def readline(size, output):
+return patch.readline(size)
+stdin = True
+patches = ()
+prompt = readline
+input = patch.read
 else:
-assert hasattr(patch, 'read')
+stdin = False
-assert hasattr(patch, 'readline')
+prompt = None
+input = None
-fp = patch
+args = cmdbuilder('import', *patches, strip=strip, force=force,
-try:
+nocommit=nocommit, bypass=bypass, exact=exact,
-def readline(size, output):
+importbranch=importbranch, message=message,
-return fp.readline(size)
+date=date, user=user, similarity=similarity, _=stdin)
-self.rawcommand(cmdbuilder('import', _=True),
+self.rawcommand(args, prompt=prompt, input=input)
-prompt=readline, input=fp.read)
-finally:
-if fp != patch:
-fp.close()
 def incoming(self, revrange=None, path=None):
 args = cmdbuilder('incoming',
 path,
 template=templates.changeset, rev=revrange)

Mercurial > public > mercurial-scm > python-hglib