##// END OF EJS Templates
cmdserver: recreate mq object on runcommand in case queue path was changed...
Yuya Nishihara -
r20629:277dc5f2 default
parent child Browse files
Show More
@@ -3272,7 +3272,8 b' def reposetup(ui, repo):'
3272 def invalidateall(self):
3272 def invalidateall(self):
3273 super(mqrepo, self).invalidateall()
3273 super(mqrepo, self).invalidateall()
3274 if localrepo.hasunfilteredcache(self, 'mq'):
3274 if localrepo.hasunfilteredcache(self, 'mq'):
3275 self.mq.invalidate()
3275 # recreate mq in case queue path was changed
3276 delattr(self.unfiltered(), 'mq')
3276
3277
3277 def abortifwdirpatched(self, errmsg, force=False):
3278 def abortifwdirpatched(self, errmsg, force=False):
3278 if self.mq.applied and self.mq.checkapplied and not force:
3279 if self.mq.applied and self.mq.checkapplied and not force:
@@ -283,6 +283,11 b' def mqoutsidechanges(server):'
283 # repo.mq should be invalidated
283 # repo.mq should be invalidated
284 runcommand(server, ['qapplied'])
284 runcommand(server, ['qapplied'])
285
285
286 runcommand(server, ['qpop', '--all'])
287 os.system('hg qqueue --create foo')
288 # repo.mq should be recreated to point to new queue
289 runcommand(server, ['qqueue', '--active'])
290
286 if __name__ == '__main__':
291 if __name__ == '__main__':
287 os.system('hg init')
292 os.system('hg init')
288
293
@@ -228,3 +228,8 b' testing mqoutsidechanges:'
228 runcommand qapplied
228 runcommand qapplied
229 runcommand qapplied
229 runcommand qapplied
230 0.diff
230 0.diff
231 runcommand qpop --all
232 popping 0.diff
233 patch queue now empty
234 runcommand qqueue --active
235 foo
General Comments 0
You need to be logged in to leave comments. Login now