Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 1398:3f76ac60130d
make update quieter when nothing is wrong
sometimes when i am going around in my history, i get long lists of
errors from the update command. this patch will fix that. i tried to
make the code style the same like the rest of the code.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Tue, 18 Oct 2005 17:56:50 -0700 |
| parents | d729850d52fa |
| children | cf9a1233738a |
comparison
equal
deleted
inserted
replaced
| 1397:66fd3bc1cfcf | 1398:3f76ac60130d |
|---|---|
| 1263 for f in remove: | 1263 for f in remove: |
| 1264 self.ui.note("removing %s\n" % f) | 1264 self.ui.note("removing %s\n" % f) |
| 1265 try: | 1265 try: |
| 1266 os.unlink(self.wjoin(f)) | 1266 os.unlink(self.wjoin(f)) |
| 1267 except OSError, inst: | 1267 except OSError, inst: |
| 1268 self.ui.warn("update failed to remove %s: %s!\n" % (f, inst)) | 1268 if inst.errno != errno.ENOENT: |
| 1269 self.ui.warn("update failed to remove %s: %s!\n" % | |
| 1270 (f, inst.strerror)) | |
| 1269 # try removing directories that might now be empty | 1271 # try removing directories that might now be empty |
| 1270 try: os.removedirs(os.path.dirname(self.wjoin(f))) | 1272 try: os.removedirs(os.path.dirname(self.wjoin(f))) |
| 1271 except: pass | 1273 except: pass |
| 1272 if moddirstate: | 1274 if moddirstate: |
| 1273 if branch_merge: | 1275 if branch_merge: |