mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
Merge with crew-stable
This commit is contained in:
commit
90a7d714cf
@ -46,14 +46,13 @@ class convert_cvs(converter_source):
|
||||
cmd = '%s -d "1970/01/01 00:00:01" -d "%s"' % (cmd, self.rev)
|
||||
except util.Abort:
|
||||
raise util.Abort('revision %s is not a patchset number or date' % self.rev)
|
||||
cmd += " 2>&1"
|
||||
|
||||
d = os.getcwd()
|
||||
try:
|
||||
os.chdir(self.path)
|
||||
id = None
|
||||
state = 0
|
||||
for l in os.popen(cmd):
|
||||
for l in util.popen(cmd):
|
||||
if state == 0: # header
|
||||
if l.startswith("PatchSet"):
|
||||
id = l[9:-2]
|
||||
|
@ -67,9 +67,9 @@ class darcs_source(converter_source):
|
||||
cmdline += args
|
||||
cmdline = [util.shellquote(arg) for arg in cmdline]
|
||||
cmdline += ['<', util.nulldev]
|
||||
cmdline = util.quotecommand(' '.join(cmdline))
|
||||
cmdline = ' '.join(cmdline)
|
||||
self.ui.debug(cmdline, '\n')
|
||||
return os.popen(cmdline, 'r')
|
||||
return util.popen(cmdline)
|
||||
|
||||
def run(self, cmd, *args, **kwargs):
|
||||
fp = self._run(cmd, *args, **kwargs)
|
||||
|
@ -14,7 +14,7 @@ class convert_git(converter_source):
|
||||
prevgitdir = os.environ.get('GIT_DIR')
|
||||
os.environ['GIT_DIR'] = self.path
|
||||
try:
|
||||
return os.popen(s)
|
||||
return util.popen(s)
|
||||
finally:
|
||||
if prevgitdir is None:
|
||||
del os.environ['GIT_DIR']
|
||||
@ -22,7 +22,7 @@ class convert_git(converter_source):
|
||||
os.environ['GIT_DIR'] = prevgitdir
|
||||
else:
|
||||
def gitcmd(self, s):
|
||||
return os.popen('GIT_DIR=%s %s' % (self.path, s))
|
||||
return util.popen('GIT_DIR=%s %s' % (self.path, s))
|
||||
|
||||
def __init__(self, ui, path, rev=None):
|
||||
super(convert_git, self).__init__(ui, path, rev=rev)
|
||||
@ -45,8 +45,7 @@ class convert_git(converter_source):
|
||||
|
||||
def catfile(self, rev, type):
|
||||
if rev == "0" * 40: raise IOError()
|
||||
fh = self.gitcmd("git-cat-file %s %s 2>%s" % (type, rev,
|
||||
util.nulldev))
|
||||
fh = self.gitcmd("git-cat-file %s %s" % (type, rev))
|
||||
return fh.read()
|
||||
|
||||
def getfile(self, name, rev):
|
||||
@ -111,8 +110,7 @@ class convert_git(converter_source):
|
||||
|
||||
def gettags(self):
|
||||
tags = {}
|
||||
fh = self.gitcmd('git-ls-remote --tags "%s" 2>%s' % (self.path,
|
||||
util.nulldev))
|
||||
fh = self.gitcmd('git-ls-remote --tags "%s"' % self.path)
|
||||
prefix = 'refs/tags/'
|
||||
for line in fh:
|
||||
line = line.strip()
|
||||
|
@ -256,7 +256,7 @@ class httprepository(remoterepository):
|
||||
if user:
|
||||
ui.debug(_('http auth: user %s, password %s\n') %
|
||||
(user, passwd and '*' * len(passwd) or 'not set'))
|
||||
passmgr.add_password(None, self._url, user, passwd or '')
|
||||
passmgr.add_password(None, host, user, passwd or '')
|
||||
|
||||
handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
|
||||
httpdigestauthhandler(passmgr)))
|
||||
|
@ -249,7 +249,7 @@ def externalpatch(patcher, args, patchname, ui, strip, cwd, files):
|
||||
fuzz = False
|
||||
if cwd:
|
||||
args.append('-d %s' % util.shellquote(cwd))
|
||||
fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
|
||||
fp = util.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
|
||||
util.shellquote(patchname)))
|
||||
|
||||
for line in fp:
|
||||
|
@ -1011,6 +1011,13 @@ if os.name == 'nt':
|
||||
# through the current COMSPEC. cmd.exe suppress enclosing quotes.
|
||||
return '"' + cmd + '"'
|
||||
|
||||
def popen(command):
|
||||
# Work around "popen spawned process may not write to stdout
|
||||
# under windows"
|
||||
# http://bugs.python.org/issue1366
|
||||
command += " 2> %s" % nulldev
|
||||
return os.popen(quotecommand(command))
|
||||
|
||||
def explain_exit(code):
|
||||
return _("exited with status %d") % code, code
|
||||
|
||||
@ -1168,6 +1175,9 @@ else:
|
||||
def quotecommand(cmd):
|
||||
return cmd
|
||||
|
||||
def popen(command):
|
||||
return os.popen(command)
|
||||
|
||||
def testpid(pid):
|
||||
'''return False if pid dead, True if running or not sure'''
|
||||
if os.sys.platform == 'OpenVMS':
|
||||
|
@ -50,7 +50,7 @@ def remember_version(version=None):
|
||||
"""Store version information."""
|
||||
global remembered_version
|
||||
if not version and os.path.isdir(".hg"):
|
||||
f = os.popen("hg identify 2> %s" % util.nulldev) # use real hg installation
|
||||
f = util.popen("hg identify") # use real hg installation
|
||||
ident = f.read()[:-1]
|
||||
if not f.close() and ident:
|
||||
ids = ident.split(' ', 1)
|
||||
|
Loading…
Reference in New Issue
Block a user