This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3561

dispatch: drop redundant setting of "ret" to -1
AbandonedPublic

Authored by martinvonz on May 15 2018, 1:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

It has already been set to -1 since 6f9ac3cb0987 (dispatch: unify
handling of None returned by a command function, 2018-05-12).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.May 15 2018, 1:33 PM
yuja added a subscriber: yuja.May 16 2018, 7:42 AM

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py

  • a/mercurial/dispatch.py

+++ b/mercurial/dispatch.py
@@ -230,7 +230,6 @@

except IOError as inst:
    if inst.errno != errno.EPIPE:
        raise
  • ret = -1 finally: duration = util.timer() - starttime req.ui.flush()

Let's hold this. I plan to change the ret to be initialized to 1.

martinvonz added a comment.May 16 2018, 12:26 PM
In D3561#56386, @yuja wrote:

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py

  • a/mercurial/dispatch.py

+++ b/mercurial/dispatch.py
@@ -230,7 +230,6 @@

except IOError as inst:
    if inst.errno != errno.EPIPE:
        raise
  • ret = -1 finally: duration = util.timer() - starttime req.ui.flush()

Let's hold this. I plan to change the ret to be initialized to 1.

Sounds good. I'll abandon this patch. I'll queue your patches in a minute when tests have finished running.

martinvonz abandoned this revision.May 16 2018, 12:26 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (1 line)

Diff 8699

mercurial/dispatch.py

req.ui.warn(msg) req.ui.warn(msg)
except error.SignalInterrupt: except error.SignalInterrupt:
# maybe pager would quit without consuming all the output, and # maybe pager would quit without consuming all the output, and
# SIGPIPE was raised. we cannot print anything in this case. # SIGPIPE was raised. we cannot print anything in this case.
pass pass
except IOError as inst: except IOError as inst:
if inst.errno != errno.EPIPE: if inst.errno != errno.EPIPE:
raise raise
ret = -1
finally: finally:
duration = util.timer() - starttime duration = util.timer() - starttime
req.ui.flush() req.ui.flush()
if req.ui.logblockedtimes: if req.ui.logblockedtimes:
req.ui._blockedtimes['command_duration'] = duration * 1000 req.ui._blockedtimes['command_duration'] = duration * 1000
req.ui.log('uiblocked', 'ui blocked ms', req.ui.log('uiblocked', 'ui blocked ms',
**pycompat.strkwargs(req.ui._blockedtimes)) **pycompat.strkwargs(req.ui._blockedtimes))
req.ui.log("commandfinish", "%s exited %d after %0.2f seconds\n", req.ui.log("commandfinish", "%s exited %d after %0.2f seconds\n",