This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9506

pull: flush stdin after the `pull from` message
ClosedPublic

Authored by marmoute on Dec 2 2020, 5:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb86608e97fa8: pull: flush stdin after the `pull from` message
Summary

That message can end up being flushed after some stderr message in some case,
leading to confusing output.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 2 2020, 5:19 PM
pulkit accepted this revision.Dec 3 2020, 3:13 AM
This revision is now accepted and ready to land.Dec 3 2020, 3:13 AM
marmoute added a commit: rHGb86608e97fa8: pull: flush stdin after the `pull from` message.Dec 3 2020, 4:38 AM
Closed by commit rHGb86608e97fa8: pull: flush stdin after the `pull from` message (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 23999.Dec 3 2020, 6:16 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (1 line)

Diff 23991

mercurial/commands.py

b'update' b'update'
): ):
msg = _(b'update destination required by configuration') msg = _(b'update destination required by configuration')
hint = _(b'use hg pull followed by hg update DEST') hint = _(b'use hg pull followed by hg update DEST')
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch')) source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch'))
ui.status(_(b'pulling from %s\n') % util.hidepassword(source)) ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
ui.flush()
other = hg.peer(repo, opts, source) other = hg.peer(repo, opts, source)
try: try:
revs, checkout = hg.addbranchrevs( revs, checkout = hg.addbranchrevs(
repo, other, branches, opts.get(b'rev') repo, other, branches, opts.get(b'rev')
) )
pullopargs = {} pullopargs = {}