##// END OF EJS Templates
narrow: mark the critical chunks of narrowing/widening as unsafe...
Augie Fackler -
r38547:a1d5951e default
parent child Browse files
Show More
@@ -203,6 +203,7 b' def _narrow(ui, repo, remote, commoninc,'
203 hint=_('use --force-delete-local-changes to '
203 hint=_('use --force-delete-local-changes to '
204 'ignore'))
204 'ignore'))
205
205
206 with ui.uninterruptable():
206 if revstostrip:
207 if revstostrip:
207 tostrip = [unfi.changelog.node(r) for r in revstostrip]
208 tostrip = [unfi.changelog.node(r) for r in revstostrip]
208 if repo['.'].node() in tostrip:
209 if repo['.'].node() in tostrip:
@@ -269,6 +270,7 b' def _widen(ui, repo, remote, commoninc, '
269 repo.setnarrowpats(newincludes, newexcludes)
270 repo.setnarrowpats(newincludes, newexcludes)
270 repo.setnewnarrowpats = setnewnarrowpats
271 repo.setnewnarrowpats = setnewnarrowpats
271
272
273 with ui.uninterruptable():
272 ds = repo.dirstate
274 ds = repo.dirstate
273 p1, p2 = ds.p1(), ds.p2()
275 p1, p2 = ds.p1(), ds.p2()
274 with ds.parentchange():
276 with ds.parentchange():
General Comments 0
You need to be logged in to leave comments. Login now