mercurial-crew-with-dirclash: hgext/mq.py comparison

Add -f option to qdelete, to remove patch file.

author	Brendan Cully <brendan@kublai.com>
date	Tue, 01 Aug 2006 12:21:55 -0700
parents	7d1de4545728
children	787e18b84893

comparison

equal deleted inserted replaced

-:7d1de4545728
+:5dfeda163bb7
 err = 1
 break
 tr.close()
 return (err, n)
-def delete(self, repo, patch):
+def delete(self, repo, patch, force=False):
 patch = self.lookup(patch, strict=True)
 info = self.isapplied(patch)
 if info:
 raise util.Abort(_("cannot delete applied patch %s") % patch)
 if patch not in self.series:
 raise util.Abort(_("patch %s not in series file") % patch)
+if force:
+r = self.qrepo()
+if r:
+r.remove([patch], True)
+else:
+os.unlink(os.path.join(self.path, patch))
 i = self.find_series(patch)
 del self.full_series[i]
 self.read_series(self.full_series)
 self.series_dirty = 1
 qrepo = self.qrepo()
 if qrepo:
 qrepo.add(added)
 def delete(ui, repo, patch, **opts):
-"""remove a patch from the series file"""
+"""remove a patch from the series file
+The patch must not be applied.
+With -f, deletes the patch file as well as the series entry."""
 q = repo.mq
-q.delete(repo, patch)
+q.delete(repo, patch, force=opts.get('force'))
 q.save_dirty()
 return 0
 def applied(ui, repo, patch=None, **opts):
 """print the patches already applied"""
 "qcommit|qci":
 (commit,
 commands.table["^commit|ci"][1],
 'hg qcommit [OPTION]... [FILE]...'),
 "^qdiff": (diff, [], 'hg qdiff [FILE]...'),
-"qdelete": (delete, [], 'hg qdelete PATCH'),
+"qdelete":
+(delete,
+[('f', 'force', None, _('delete patch file'))],
+'hg qdelete [-f] PATCH'),
 'qfold': (fold, [], 'hg qfold PATCH...'),
 'qheader': (header, [],
 _('hg qheader [PATCH]')),
 "^qimport":
 (qimport,

Mercurial > hg > mercurial-crew-with-dirclash