Mercurial > hg
comparison mercurial/util.py @ 43735:7eb701e355bd
merge with stable
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 22 Nov 2019 21:42:04 +0900 |
parents | 5be909dbe385 5be128f669d4 |
children | 02ededbef627 |
comparison
equal
deleted
inserted
replaced
43733:8ca92bcb3083 | 43735:7eb701e355bd |
---|---|
1904 advanced = ( | 1904 advanced = ( |
1905 oldstat.stat[stat.ST_MTIME] + 1 | 1905 oldstat.stat[stat.ST_MTIME] + 1 |
1906 ) & 0x7FFFFFFF | 1906 ) & 0x7FFFFFFF |
1907 os.utime(dest, (advanced, advanced)) | 1907 os.utime(dest, (advanced, advanced)) |
1908 except shutil.Error as inst: | 1908 except shutil.Error as inst: |
1909 raise error.Abort(str(inst)) | 1909 raise error.Abort(stringutil.forcebytestr(inst)) |
1910 | 1910 |
1911 | 1911 |
1912 def copyfiles(src, dst, hardlink=None, progress=None): | 1912 def copyfiles(src, dst, hardlink=None, progress=None): |
1913 """Copy a directory tree using hardlinks if possible.""" | 1913 """Copy a directory tree using hardlinks if possible.""" |
1914 num = 0 | 1914 num = 0 |