Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2165:d821918e3bee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use better names (hg-{usage}-{random}.{suffix}) for temporary files.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Apr 2006 21:11:22 +0200
parents 628bf85f07ee
children f5c2c6e69fd7
comparison
equal deleted inserted replaced
2164:cbd458228a96 2165:d821918e3bee
1822 def merge3(self, fn, my, other, p1, p2): 1822 def merge3(self, fn, my, other, p1, p2):
1823 """perform a 3-way merge in the working directory""" 1823 """perform a 3-way merge in the working directory"""
1824 1824
1825 def temp(prefix, node): 1825 def temp(prefix, node):
1826 pre = "%s~%s." % (os.path.basename(fn), prefix) 1826 pre = "%s~%s." % (os.path.basename(fn), prefix)
1827 (fd, name) = tempfile.mkstemp("", pre) 1827 (fd, name) = tempfile.mkstemp(prefix=pre)
1828 f = os.fdopen(fd, "wb") 1828 f = os.fdopen(fd, "wb")
1829 self.wwrite(fn, fl.read(node), f) 1829 self.wwrite(fn, fl.read(node), f)
1830 f.close() 1830 f.close()
1831 return name 1831 return name
1832 1832