| durin42 | |
| martinvonz |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowbundle2.py (2 lines) | |||
| M | hgext/narrow/narrowcommands.py (4 lines) | |||
| M | mercurial/repair.py (2 lines) | |||
| M | mercurial/ui.py (6 lines) | |||
| M | mercurial/utils/procutil.py (2 lines) | |||
| M | tests/test-nointerrupt.t (2 lines) |
| op._bookmarksbackup = repo._bookmarks | op._bookmarksbackup = repo._bookmarks | ||||
| class dummybmstore(dict): | class dummybmstore(dict): | ||||
| def applychanges(self, repo, tr, changes): | def applychanges(self, repo, tr, changes): | ||||
| pass | pass | ||||
| localrepo.localrepository._bookmarks.set(repo, dummybmstore()) | localrepo.localrepository._bookmarks.set(repo, dummybmstore()) | ||||
| chgrpfile = repair.strip(op.ui, repo, list(clkills), backup=True, | chgrpfile = repair.strip(op.ui, repo, list(clkills), backup=True, | ||||
| topic='widen') | topic='widen') | ||||
| if chgrpfile: | if chgrpfile: | ||||
| op._widen_uninterr = repo.ui.uninterruptable() | op._widen_uninterr = repo.ui.uninterruptible() | ||||
| op._widen_uninterr.__enter__() | op._widen_uninterr.__enter__() | ||||
| # presence of _widen_bundle attribute activates widen handler later | # presence of _widen_bundle attribute activates widen handler later | ||||
| op._widen_bundle = chgrpfile | op._widen_bundle = chgrpfile | ||||
| # Set the new narrowspec if we're widening. The setnewnarrowpats() method | # Set the new narrowspec if we're widening. The setnewnarrowpats() method | ||||
| # will currently always be there when using the core+narrowhg server, but | # will currently always be there when using the core+narrowhg server, but | ||||
| # other servers may include a changespec part even when not widening (e.g. | # other servers may include a changespec part even when not widening (e.g. | ||||
| # because we're deepening a shallow repo). | # because we're deepening a shallow repo). | ||||
| if util.safehasattr(repo, 'setnewnarrowpats'): | if util.safehasattr(repo, 'setnewnarrowpats'): | ||||
| ui.status('%s\n' % node.short(n)) | ui.status('%s\n' % node.short(n)) | ||||
| ui.status(_('...and %d more, use --verbose to list all\n') % | ui.status(_('...and %d more, use --verbose to list all\n') % | ||||
| (len(visibletostrip) - maxnodes)) | (len(visibletostrip) - maxnodes)) | ||||
| if not force: | if not force: | ||||
| raise error.Abort(_('local changes found'), | raise error.Abort(_('local changes found'), | ||||
| hint=_('use --force-delete-local-changes to ' | hint=_('use --force-delete-local-changes to ' | ||||
| 'ignore')) | 'ignore')) | ||||
| with ui.uninterruptable(): | with ui.uninterruptible(): | ||||
| if revstostrip: | if revstostrip: | ||||
| tostrip = [unfi.changelog.node(r) for r in revstostrip] | tostrip = [unfi.changelog.node(r) for r in revstostrip] | ||||
| if repo['.'].node() in tostrip: | if repo['.'].node() in tostrip: | ||||
| # stripping working copy, so move to a different commit first | # stripping working copy, so move to a different commit first | ||||
| urev = max(repo.revs('(::%n) - %ln + null', | urev = max(repo.revs('(::%n) - %ln + null', | ||||
| repo['.'].node(), visibletostrip)) | repo['.'].node(), visibletostrip)) | ||||
| hg.clean(repo, urev) | hg.clean(repo, urev) | ||||
| overrides = {('devel', 'strip-obsmarkers'): False} | overrides = {('devel', 'strip-obsmarkers'): False} | ||||
| # define a function that narrowbundle2 can call after creating the | # define a function that narrowbundle2 can call after creating the | ||||
| # backup bundle, but before applying the bundle from the server | # backup bundle, but before applying the bundle from the server | ||||
| def setnewnarrowpats(): | def setnewnarrowpats(): | ||||
| repo.setnarrowpats(newincludes, newexcludes) | repo.setnarrowpats(newincludes, newexcludes) | ||||
| repo.setnewnarrowpats = setnewnarrowpats | repo.setnewnarrowpats = setnewnarrowpats | ||||
| # silence the devel-warning of applying an empty changegroup | # silence the devel-warning of applying an empty changegroup | ||||
| overrides = {('devel', 'all-warnings'): False} | overrides = {('devel', 'all-warnings'): False} | ||||
| with ui.uninterruptable(): | with ui.uninterruptible(): | ||||
| common = commoninc[0] | common = commoninc[0] | ||||
| if ellipsesremote: | if ellipsesremote: | ||||
| ds = repo.dirstate | ds = repo.dirstate | ||||
| p1, p2 = ds.p1(), ds.p2() | p1, p2 = ds.p1(), ds.p2() | ||||
| with ds.parentchange(): | with ds.parentchange(): | ||||
| ds.setparents(node.nullid, node.nullid) | ds.setparents(node.nullid, node.nullid) | ||||
| with wrappedextraprepare,\ | with wrappedextraprepare,\ | ||||
| repo.ui.configoverride(overrides, 'widen'): | repo.ui.configoverride(overrides, 'widen'): | ||||
| # | # | ||||
| # We do not include obsolescence, it might re-introduce prune markers | # We do not include obsolescence, it might re-introduce prune markers | ||||
| # we are trying to strip. This is harmless since the stripped markers | # we are trying to strip. This is harmless since the stripped markers | ||||
| # are already backed up and we did not touched the markers for the | # are already backed up and we did not touched the markers for the | ||||
| # saved changesets. | # saved changesets. | ||||
| tmpbundlefile = backupbundle(repo, savebases, saveheads, node, 'temp', | tmpbundlefile = backupbundle(repo, savebases, saveheads, node, 'temp', | ||||
| compress=False, obsolescence=False) | compress=False, obsolescence=False) | ||||
| with ui.uninterruptable(): | with ui.uninterruptible(): | ||||
| try: | try: | ||||
| with repo.transaction("strip") as tr: | with repo.transaction("strip") as tr: | ||||
| # TODO this code violates the interface abstraction of the | # TODO this code violates the interface abstraction of the | ||||
| # transaction and makes assumptions that file storage is | # transaction and makes assumptions that file storage is | ||||
| # using append-only files. We'll need some kind of storage | # using append-only files. We'll need some kind of storage | ||||
| # API to handle stripping for us. | # API to handle stripping for us. | ||||
| offset = len(tr._entries) | offset = len(tr._entries) | ||||
| starttime = util.timer() | starttime = util.timer() | ||||
| try: | try: | ||||
| yield | yield | ||||
| finally: | finally: | ||||
| self._blockedtimes[key + '_blocked'] += \ | self._blockedtimes[key + '_blocked'] += \ | ||||
| (util.timer() - starttime) * 1000 | (util.timer() - starttime) * 1000 | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| def uninterruptable(self): | def uninterruptible(self): | ||||
| """Mark an operation as unsafe. | """Mark an operation as unsafe. | ||||
| Most operations on a repository are safe to interrupt, but a | Most operations on a repository are safe to interrupt, but a | ||||
| few are risky (for example repair.strip). This context manager | few are risky (for example repair.strip). This context manager | ||||
| lets you advise Mercurial that something risky is happening so | lets you advise Mercurial that something risky is happening so | ||||
| that control-C etc can be blocked if desired. | that control-C etc can be blocked if desired. | ||||
| """ | """ | ||||
| enabled = self.configbool('experimental', 'nointerrupt') | enabled = self.configbool('experimental', 'nointerrupt') | ||||
| if (enabled and | if (enabled and | ||||
| self.configbool('experimental', 'nointerrupt-interactiveonly')): | self.configbool('experimental', 'nointerrupt-interactiveonly')): | ||||
| enabled = self.interactive() | enabled = self.interactive() | ||||
| if self._uninterruptible or not enabled: | if self._uninterruptible or not enabled: | ||||
| # if nointerrupt support is turned off, the process isn't | # if nointerrupt support is turned off, the process isn't | ||||
| # interactive, or we're already in an uninterruptable | # interactive, or we're already in an uninterruptible | ||||
| # block, do nothing. | # block, do nothing. | ||||
| yield | yield | ||||
| return | return | ||||
| def warn(): | def warn(): | ||||
| self.warn(_("shutting down cleanly\n")) | self.warn(_("shutting down cleanly\n")) | ||||
| self.warn( | self.warn( | ||||
| _("press ^C again to terminate immediately (dangerous)\n")) | _("press ^C again to terminate immediately (dangerous)\n")) | ||||
| return True | return True | ||||
| with procutil.uninterruptable(warn): | with procutil.uninterruptible(warn): | ||||
| try: | try: | ||||
| self._uninterruptible = True | self._uninterruptible = True | ||||
| yield | yield | ||||
| finally: | finally: | ||||
| self._uninterruptible = False | self._uninterruptible = False | ||||
| def formatter(self, topic, opts): | def formatter(self, topic, opts): | ||||
| return formatter.formatter(self, self, topic, opts) | return formatter.formatter(self, self, topic, opts) | ||||
| return -1 | return -1 | ||||
| time.sleep(0.1) | time.sleep(0.1) | ||||
| return pid | return pid | ||||
| finally: | finally: | ||||
| if prevhandler is not None: | if prevhandler is not None: | ||||
| signal.signal(signal.SIGCHLD, prevhandler) | signal.signal(signal.SIGCHLD, prevhandler) | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| def uninterruptable(warn): | def uninterruptible(warn): | ||||
| """Inhibit SIGINT handling on a region of code. | """Inhibit SIGINT handling on a region of code. | ||||
| Note that if this is called in a non-main thread, it turns into a no-op. | Note that if this is called in a non-main thread, it turns into a no-op. | ||||
| Args: | Args: | ||||
| warn: A callable which takes no arguments, and returns True if the | warn: A callable which takes no arguments, and returns True if the | ||||
| previous signal handling should be restored. | previous signal handling should be restored. | ||||
| """ | """ | ||||
| #require no-windows | #require no-windows | ||||
| Dummy extension simulating unsafe long running command | Dummy extension simulating unsafe long running command | ||||
| $ cat > sleepext.py <<EOF | $ cat > sleepext.py <<EOF | ||||
| > import itertools | > import itertools | ||||
| > import time | > import time | ||||
| > | > | ||||
| > from mercurial.i18n import _ | > from mercurial.i18n import _ | ||||
| > from mercurial import registrar | > from mercurial import registrar | ||||
| > | > | ||||
| > cmdtable = {} | > cmdtable = {} | ||||
| > command = registrar.command(cmdtable) | > command = registrar.command(cmdtable) | ||||
| > | > | ||||
| > @command(b'sleep', [], _(b'TIME'), norepo=True) | > @command(b'sleep', [], _(b'TIME'), norepo=True) | ||||
| > def sleep(ui, sleeptime=b"1", **opts): | > def sleep(ui, sleeptime=b"1", **opts): | ||||
| > with ui.uninterruptable(): | > with ui.uninterruptible(): | ||||
| > for _i in itertools.repeat(None, int(sleeptime)): | > for _i in itertools.repeat(None, int(sleeptime)): | ||||
| > time.sleep(1) | > time.sleep(1) | ||||
| > ui.warn(b"end of unsafe operation\n") | > ui.warn(b"end of unsafe operation\n") | ||||
| > ui.warn(b"%s second(s) passed\n" % sleeptime) | > ui.warn(b"%s second(s) passed\n" % sleeptime) | ||||
| > EOF | > EOF | ||||
| Kludge to emulate timeout(1) which is not generally available. | Kludge to emulate timeout(1) which is not generally available. | ||||
| $ cat > timeout.py <<EOF | $ cat > timeout.py <<EOF | ||||