Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/util.py @ 6836:c016dc1a8e91
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 23 Jul 2008 16:14:45 +0200 |
parents | f67d1468ac50 08d9e0f974d9 |
children | 01db3e101362 |
comparison
equal
deleted
inserted
replaced
6834:cbdfd08eabc9 | 6836:c016dc1a8e91 |
---|---|
1498 | 1498 |
1499 if not text and "b" not in mode: | 1499 if not text and "b" not in mode: |
1500 mode += "b" # for that other OS | 1500 mode += "b" # for that other OS |
1501 | 1501 |
1502 nlink = -1 | 1502 nlink = -1 |
1503 if mode[0] != "r": | 1503 if mode not in ("r", "rb"): |
1504 try: | 1504 try: |
1505 nlink = nlinks(f) | 1505 nlink = nlinks(f) |
1506 except OSError: | 1506 except OSError: |
1507 nlink = 0 | 1507 nlink = 0 |
1508 d = os.path.dirname(f) | 1508 d = os.path.dirname(f) |