mercurial-crew-with-dirclash: comparison mercurial/util.py

equal deleted inserted replaced

-:3044a3fdae76
+:6886bc0b77af
 def rename(src, dst):
 """forcibly rename a file"""
 try:
 os.rename(src, dst)
-except:
+except OSError, err:
-os.unlink(dst)
+# on windows, rename to existing file is not allowed, so we
+# must delete destination first. but if file is open, unlink
+# schedules it for delete but does not delete it. rename
+# happens immediately even for open files, so we create
+# temporary file, delete it, rename destination to that name,
+# then delete that. then rename is safe to do.
+fd, temp = tempfile.mkstemp(dir=os.path.dirname(dst) or '.')
+os.close(fd)
+os.unlink(temp)
+os.rename(dst, temp)
+os.unlink(temp)
 os.rename(src, dst)
 def unlink(f):
 """unlink and remove the directory if it is empty"""
 os.unlink(f)
 parts = os.path.normcase(path).split(os.sep)
 if (os.path.splitdrive(path)[0] or parts[0] in ('.hg', '')
 or os.pardir in parts):
 raise Abort(_("path contains illegal component: %s\n") % path)
+def _makelock_file(info, pathname):
+ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
+os.write(ld, info)
+os.close(ld)
+def _readlock_file(pathname):
+return posixfile(pathname).read()
+def nlinks(pathname):
+"""Return number of hardlinks for the given file."""
+return os.stat(pathname).st_nlink
+if hasattr(os, 'link'):
+os_link = os.link
+else:
+def os_link(src, dst):
+raise OSError(0, _("Hardlinks not supported"))
+def fstat(fp):
+'''stat file object that may not have fileno method.'''
+try:
+return os.fstat(fp.fileno())
+except AttributeError:
+return os.stat(fp.name)
+posixfile = file
+# Platform specific variants
+if os.name == 'nt':
+demandload(globals(), "msvcrt")
+nulldev = 'NUL:'
+class winstdout:
+'''stdout on windows misbehaves if sent through a pipe'''
+def __init__(self, fp):
+self.fp = fp
+def __getattr__(self, key):
+return getattr(self.fp, key)
+def close(self):
+try:
+self.fp.close()
+except: pass
+def write(self, s):
+try:
+return self.fp.write(s)
+except IOError, inst:
+if inst.errno != 0: raise
+self.close()
+raise IOError(errno.EPIPE, 'Broken pipe')
+sys.stdout = winstdout(sys.stdout)
+def system_rcpath():
+try:
+return system_rcpath_win32()
+except:
+return [r'c:\mercurial\mercurial.ini']
+def os_rcpath():
+'''return default os-specific hgrc search path'''
+return system_rcpath() + [os.path.join(os.path.expanduser('~'),
+'mercurial.ini')]
+def parse_patch_output(output_line):
+"""parses the output produced by patch and returns the file name"""
+pf = output_line[14:]
+if pf[0] == '`':
+pf = pf[1:-1] # Remove the quotes
+return pf
+def testpid(pid):
+'''return False if pid dead, True if running or not known'''
+return True
+def is_exec(f, last):
+return last
+def set_exec(f, mode):
+pass
+def set_binary(fd):
+msvcrt.setmode(fd.fileno(), os.O_BINARY)
+def pconvert(path):
+return path.replace("\\", "/")
+def localpath(path):
+return path.replace('/', '\\')
+def normpath(path):
+return pconvert(os.path.normpath(path))
+makelock = _makelock_file
+readlock = _readlock_file
+def explain_exit(code):
+return _("exited with status %d") % code, code
+try:
+# override functions with win32 versions if possible
+from util_win32 import *
+except ImportError:
+pass
+else:
+nulldev = '/dev/null'
+def rcfiles(path):
+rcs = [os.path.join(path, 'hgrc')]
+rcdir = os.path.join(path, 'hgrc.d')
+try:
+rcs.extend([os.path.join(rcdir, f) for f in os.listdir(rcdir)
+if f.endswith(".rc")])
+except OSError, inst: pass
+return rcs
+def os_rcpath():
+'''return default os-specific hgrc search path'''
+path = []
+if len(sys.argv) > 0:
+path.extend(rcfiles(os.path.dirname(sys.argv[0]) +
+'/../etc/mercurial'))
+path.extend(rcfiles('/etc/mercurial'))
+path.append(os.path.expanduser('~/.hgrc'))
+path = [os.path.normpath(f) for f in path]
+return path
+def parse_patch_output(output_line):
+"""parses the output produced by patch and returns the file name"""
+pf = output_line[14:]
+if pf.startswith("'") and pf.endswith("'") and pf.find(" ") >= 0:
+pf = pf[1:-1] # Remove the quotes
+return pf
+def is_exec(f, last):
+"""check whether a file is executable"""
+return (os.stat(f).st_mode & 0100 != 0)
+def set_exec(f, mode):
+s = os.stat(f).st_mode
+if (s & 0100 != 0) == mode:
+return
+if mode:
+# Turn on +x for every +r bit when making a file executable
+# and obey umask.
+umask = os.umask(0)
+os.umask(umask)
+os.chmod(f, s | (s & 0444) >> 2 & ~umask)
+else:
+os.chmod(f, s & 0666)
+def set_binary(fd):
+pass
+def pconvert(path):
+return path
+def localpath(path):
+return path
+normpath = os.path.normpath
+def makelock(info, pathname):
+try:
+os.symlink(info, pathname)
+except OSError, why:
+if why.errno == errno.EEXIST:
+raise
+else:
+_makelock_file(info, pathname)
+def readlock(pathname):
+try:
+return os.readlink(pathname)
+except OSError, why:
+if why.errno == errno.EINVAL:
+return _readlock_file(pathname)
+else:
+raise
+def testpid(pid):
+'''return False if pid dead, True if running or not sure'''
+try:
+os.kill(pid, 0)
+return True
+except OSError, inst:
+return inst.errno != errno.ESRCH
+def explain_exit(code):
+"""return a 2-tuple (desc, code) describing a process's status"""
+if os.WIFEXITED(code):
+val = os.WEXITSTATUS(code)
+return _("exited with status %d") % val, val
+elif os.WIFSIGNALED(code):
+val = os.WTERMSIG(code)
+return _("killed by signal %d") % val, val
+elif os.WIFSTOPPED(code):
+val = os.WSTOPSIG(code)
+return _("stopped by signal %d") % val, val
+raise ValueError(_("invalid exit code"))
 def opener(base, audit=True):
 """
 return a function that opens files relative to base
 this function is used to hide the details of COW semantics and
 p = base
 audit_p = audit
 def mktempcopy(name):
 d, fn = os.path.split(name)
-fd, temp = tempfile.mkstemp(prefix=".%s-" % fn, dir=d)
+fd, temp = tempfile.mkstemp(prefix='.%s-' % fn, dir=d)
-fp = os.fdopen(fd, "wb")
+os.close(fd)
+fp = posixfile(temp, "wb")
 try:
-fp.write(file(name, "rb").read())
+fp.write(posixfile(name, "rb").read())
 except:
 try: os.unlink(temp)
 except: pass
 raise
 fp.close()
 st = os.lstat(name)
 os.chmod(temp, st.st_mode)
 return temp
-class atomictempfile(file):
+class atomictempfile(posixfile):
 """the file will only be copied when rename is called"""
 def __init__(self, name, mode):
 self.__name = name
 self.temp = mktempcopy(name)
-file.__init__(self, self.temp, mode)
+posixfile.__init__(self, self.temp, mode)
 def rename(self):
 if not self.closed:
-file.close(self)
+posixfile.close(self)
 rename(self.temp, self.__name)
 def __del__(self):
 if not self.closed:
 try:
 os.unlink(self.temp)
 except: pass
-file.close(self)
+posixfile.close(self)
 class atomicfile(atomictempfile):
 """the file will only be copied on close"""
 def __init__(self, name, mode):
 atomictempfile.__init__(self, name, mode)
 return atomicfile(f, mode)
 elif atomictemp:
 return atomictempfile(f, mode)
 if nlink > 1:
 rename(mktempcopy(f), f)
-return file(f, mode)
+return posixfile(f, mode)
 return o
-def _makelock_file(info, pathname):
-ld = os.open(pathname, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
-os.write(ld, info)
-os.close(ld)
-def _readlock_file(pathname):
-return file(pathname).read()
-def nlinks(pathname):
-"""Return number of hardlinks for the given file."""
-return os.stat(pathname).st_nlink
-if hasattr(os, 'link'):
-os_link = os.link
-else:
-def os_link(src, dst):
-raise OSError(0, _("Hardlinks not supported"))
-# Platform specific variants
-if os.name == 'nt':
-demandload(globals(), "msvcrt")
-nulldev = 'NUL:'
-class winstdout:
-'''stdout on windows misbehaves if sent through a pipe'''
-def __init__(self, fp):
-self.fp = fp
-def __getattr__(self, key):
-return getattr(self.fp, key)
-def close(self):
-try:
-self.fp.close()
-except: pass
-def write(self, s):
-try:
-return self.fp.write(s)
-except IOError, inst:
-if inst.errno != 0: raise
-self.close()
-raise IOError(errno.EPIPE, 'Broken pipe')
-sys.stdout = winstdout(sys.stdout)
-def system_rcpath():
-try:
-return system_rcpath_win32()
-except:
-return [r'c:\mercurial\mercurial.ini']
-def os_rcpath():
-'''return default os-specific hgrc search path'''
-return system_rcpath() + [os.path.join(os.path.expanduser('~'),
-'mercurial.ini')]
-def parse_patch_output(output_line):
-"""parses the output produced by patch and returns the file name"""
-pf = output_line[14:]
-if pf[0] == '`':
-pf = pf[1:-1] # Remove the quotes
-return pf
-def testpid(pid):
-'''return False if pid dead, True if running or not known'''
-return True
-def is_exec(f, last):
-return last
-def set_exec(f, mode):
-pass
-def set_binary(fd):
-msvcrt.setmode(fd.fileno(), os.O_BINARY)
-def pconvert(path):
-return path.replace("\\", "/")
-def localpath(path):
-return path.replace('/', '\\')
-def normpath(path):
-return pconvert(os.path.normpath(path))
-makelock = _makelock_file
-readlock = _readlock_file
-def explain_exit(code):
-return _("exited with status %d") % code, code
-try:
-# override functions with win32 versions if possible
-from util_win32 import *
-except ImportError:
-pass
-else:
-nulldev = '/dev/null'
-def rcfiles(path):
-rcs = [os.path.join(path, 'hgrc')]
-rcdir = os.path.join(path, 'hgrc.d')
-try:
-rcs.extend([os.path.join(rcdir, f) for f in os.listdir(rcdir)
-if f.endswith(".rc")])
-except OSError, inst: pass
-return rcs
-def os_rcpath():
-'''return default os-specific hgrc search path'''
-path = []
-if len(sys.argv) > 0:
-path.extend(rcfiles(os.path.dirname(sys.argv[0]) +
-'/../etc/mercurial'))
-path.extend(rcfiles('/etc/mercurial'))
-path.append(os.path.expanduser('~/.hgrc'))
-path = [os.path.normpath(f) for f in path]
-return path
-def parse_patch_output(output_line):
-"""parses the output produced by patch and returns the file name"""
-pf = output_line[14:]
-if pf.startswith("'") and pf.endswith("'") and pf.find(" ") >= 0:
-pf = pf[1:-1] # Remove the quotes
-return pf
-def is_exec(f, last):
-"""check whether a file is executable"""
-return (os.stat(f).st_mode & 0100 != 0)
-def set_exec(f, mode):
-s = os.stat(f).st_mode
-if (s & 0100 != 0) == mode:
-return
-if mode:
-# Turn on +x for every +r bit when making a file executable
-# and obey umask.
-umask = os.umask(0)
-os.umask(umask)
-os.chmod(f, s | (s & 0444) >> 2 & ~umask)
-else:
-os.chmod(f, s & 0666)
-def set_binary(fd):
-pass
-def pconvert(path):
-return path
-def localpath(path):
-return path
-normpath = os.path.normpath
-def makelock(info, pathname):
-try:
-os.symlink(info, pathname)
-except OSError, why:
-if why.errno == errno.EEXIST:
-raise
-else:
-_makelock_file(info, pathname)
-def readlock(pathname):
-try:
-return os.readlink(pathname)
-except OSError, why:
-if why.errno == errno.EINVAL:
-return _readlock_file(pathname)
-else:
-raise
-def testpid(pid):
-'''return False if pid dead, True if running or not sure'''
-try:
-os.kill(pid, 0)
-return True
-except OSError, inst:
-return inst.errno != errno.ESRCH
-def explain_exit(code):
-"""return a 2-tuple (desc, code) describing a process's status"""
-if os.WIFEXITED(code):
-val = os.WEXITSTATUS(code)
-return _("exited with status %d") % val, val
-elif os.WIFSIGNALED(code):
-val = os.WTERMSIG(code)
-return _("killed by signal %d") % val, val
-elif os.WIFSTOPPED(code):
-val = os.WSTOPSIG(code)
-return _("stopped by signal %d") % val, val
-raise ValueError(_("invalid exit code"))
 class chunkbuffer(object):
 """Allow arbitrary sized chunks of data to be efficiently read from an
 iterator over chunks of arbitrary size."""

changeset 2177	6886bc0b77af
parent 2165	d821918e3bee
parent 2176	9b42304d9896
child 2193	fb28ce04b349