Mercurial > hg
comparison hgext/mq.py @ 13235:6bf39d88c857
rename util.unlink to unlinkpath
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sun, 02 Jan 2011 19:34:41 +0100 |
| parents | f3058dd05281 |
| children | 996b95985c2f |
comparison
equal
deleted
inserted
replaced
| 13234:0935ff767285 | 13235:6bf39d88c857 |
|---|---|
| 1144 # only remove unknown files that we know we touched or | 1144 # only remove unknown files that we know we touched or |
| 1145 # created while patching | 1145 # created while patching |
| 1146 for f in all_files: | 1146 for f in all_files: |
| 1147 if f not in repo.dirstate: | 1147 if f not in repo.dirstate: |
| 1148 try: | 1148 try: |
| 1149 util.unlink(repo.wjoin(f)) | 1149 util.unlinkpath(repo.wjoin(f)) |
| 1150 except OSError, inst: | 1150 except OSError, inst: |
| 1151 if inst.errno != errno.ENOENT: | 1151 if inst.errno != errno.ENOENT: |
| 1152 raise | 1152 raise |
| 1153 self.ui.warn(_('done\n')) | 1153 self.ui.warn(_('done\n')) |
| 1154 raise | 1154 raise |
| 1238 m, a, r, d = repo.status(qp, top)[:4] | 1238 m, a, r, d = repo.status(qp, top)[:4] |
| 1239 if d: | 1239 if d: |
| 1240 raise util.Abort(_("deletions found between repo revs")) | 1240 raise util.Abort(_("deletions found between repo revs")) |
| 1241 for f in a: | 1241 for f in a: |
| 1242 try: | 1242 try: |
| 1243 util.unlink(repo.wjoin(f)) | 1243 util.unlinkpath(repo.wjoin(f)) |
| 1244 except OSError, e: | 1244 except OSError, e: |
| 1245 if e.errno != errno.ENOENT: | 1245 if e.errno != errno.ENOENT: |
| 1246 raise | 1246 raise |
| 1247 repo.dirstate.forget(f) | 1247 repo.dirstate.forget(f) |
| 1248 for f in m + r: | 1248 for f in m + r: |