Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/util.py @ 1415:c6e6ca96a033
refactor some unlink/remove code and make sure we prune empty dir
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 19 Oct 2005 00:10:52 -0700 |
| parents | 1c64c628d15f |
| children | b32b3509c7ab |
comparison
equal
deleted
inserted
replaced
| 1414:32fde51910c0 | 1415:c6e6ca96a033 |
|---|---|
| 308 os.rename(src, dst) | 308 os.rename(src, dst) |
| 309 except: | 309 except: |
| 310 os.unlink(dst) | 310 os.unlink(dst) |
| 311 os.rename(src, dst) | 311 os.rename(src, dst) |
| 312 | 312 |
| 313 def unlink(f): | |
| 314 """unlink and remove the directory if it is empty""" | |
| 315 os.unlink(f) | |
| 316 # try removing directories that might now be empty | |
| 317 try: os.removedirs(os.path.dirname(f)) | |
| 318 except: pass | |
| 319 | |
| 313 def copyfiles(src, dst, hardlink=None): | 320 def copyfiles(src, dst, hardlink=None): |
| 314 """Copy a directory tree using hardlinks if possible""" | 321 """Copy a directory tree using hardlinks if possible""" |
| 315 | 322 |
| 316 if hardlink is None: | 323 if hardlink is None: |
| 317 hardlink = (os.stat(src).st_dev == | 324 hardlink = (os.stat(src).st_dev == |