mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:1bdbca0b6604
+:e59a7b8f521a
 # GNU General Public License version 2 or any later version.
 from node import hex, bin, nullid, nullrev, short
 from lock import release
 from i18n import _, gettext
-import os, re, sys, difflib, time, tempfile, errno
+import os, re, difflib, time, tempfile, errno
 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
 import patch, help, url, encoding, templatekw, discovery
 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
 import merge as mergemod
 import minirst, revset, fileset
 prefix = opts.get('prefix')
 if dest == '-':
 if kind == 'files':
 raise util.Abort(_('cannot archive plain files to stdout'))
-dest = sys.stdout
+dest = ui.fout
 if not prefix:
 prefix = os.path.basename(repo.root) + '-%h'
 prefix = cmdutil.makefilename(repo, prefix, node)
 matchfn = scmutil.match(repo, [], opts)
 be enclosed in double quotes ("..."), with "\\" as escape character.
 """
 if text is None:
 ui.status(_("reading DAG from stdin\n"))
-text = sys.stdin.read()
+text = ui.fin.read()
 cl = repo.changelog
 if len(cl) > 0:
 raise util.Abort(_('repository is not empty'))
 for p in patches:
 pf = os.path.join(d, p)
 if pf == '-':
 ui.status(_("applying patch from stdin\n"))
-pf = sys.stdin
+pf = ui.fin
 else:
 ui.status(_("applying %s\n") % p)
 pf = url.open(ui, pf)
 haspatch = False