##// END OF EJS Templates
Disallow commit over an applied mq patch.
Brendan Cully -
r2845:addd03c7 default
parent child Browse files
Show More
@@ -1832,6 +1832,18 b' def select(ui, repo, *args, **opts):'
1832
1832
1833 def reposetup(ui, repo):
1833 def reposetup(ui, repo):
1834 class mqrepo(repo.__class__):
1834 class mqrepo(repo.__class__):
1835 def commit(self, *args, **opts):
1836 if len(args) >= 6:
1837 force = args[5]
1838 else:
1839 force = opts.get('force')
1840 if self.mq.applied and not force:
1841 parent = revlog.hex(self.dirstate.parents()[0])
1842 if parent in [s.rev for s in self.mq.applied]:
1843 raise util.Abort(_('cannot commit over an applied mq patch'))
1844
1845 return super(mqrepo, self).commit(*args, **opts)
1846
1835 def tags(self):
1847 def tags(self):
1836 if self.tagscache:
1848 if self.tagscache:
1837 return self.tagscache
1849 return self.tagscache
General Comments 0
You need to be logged in to leave comments. Login now