equal
deleted
inserted
replaced
205 if not force: |
205 if not force: |
206 raise error.Abort(_('local changes found'), |
206 raise error.Abort(_('local changes found'), |
207 hint=_('use --force-delete-local-changes to ' |
207 hint=_('use --force-delete-local-changes to ' |
208 'ignore')) |
208 'ignore')) |
209 |
209 |
210 with ui.uninterruptable(): |
210 with ui.uninterruptible(): |
211 if revstostrip: |
211 if revstostrip: |
212 tostrip = [unfi.changelog.node(r) for r in revstostrip] |
212 tostrip = [unfi.changelog.node(r) for r in revstostrip] |
213 if repo['.'].node() in tostrip: |
213 if repo['.'].node() in tostrip: |
214 # stripping working copy, so move to a different commit first |
214 # stripping working copy, so move to a different commit first |
215 urev = max(repo.revs('(::%n) - %ln + null', |
215 urev = max(repo.revs('(::%n) - %ln + null', |
282 repo.setnarrowpats(newincludes, newexcludes) |
282 repo.setnarrowpats(newincludes, newexcludes) |
283 repo.setnewnarrowpats = setnewnarrowpats |
283 repo.setnewnarrowpats = setnewnarrowpats |
284 # silence the devel-warning of applying an empty changegroup |
284 # silence the devel-warning of applying an empty changegroup |
285 overrides = {('devel', 'all-warnings'): False} |
285 overrides = {('devel', 'all-warnings'): False} |
286 |
286 |
287 with ui.uninterruptable(): |
287 with ui.uninterruptible(): |
288 common = commoninc[0] |
288 common = commoninc[0] |
289 if ellipsesremote: |
289 if ellipsesremote: |
290 ds = repo.dirstate |
290 ds = repo.dirstate |
291 p1, p2 = ds.p1(), ds.p2() |
291 p1, p2 = ds.p1(), ds.p2() |
292 with ds.parentchange(): |
292 with ds.parentchange(): |