Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 46029:b86608e97fa8
pull: flush stdin after the `pull from` message
That message can end up being flushed after some stderr message in some case,
leading to confusing output.
Differential Revision: https://phab.mercurial-scm.org/D9506
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 02 Dec 2020 23:15:11 +0100 |
| parents | c3d0b3c29ec4 |
| children | 9c0db3671008 |
comparison
equal
deleted
inserted
replaced
| 46028:7a79548954b3 | 46029:b86608e97fa8 |
|---|---|
| 5335 hint = _(b'use hg pull followed by hg update DEST') | 5335 hint = _(b'use hg pull followed by hg update DEST') |
| 5336 raise error.InputError(msg, hint=hint) | 5336 raise error.InputError(msg, hint=hint) |
| 5337 | 5337 |
| 5338 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch')) | 5338 source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch')) |
| 5339 ui.status(_(b'pulling from %s\n') % util.hidepassword(source)) | 5339 ui.status(_(b'pulling from %s\n') % util.hidepassword(source)) |
| 5340 ui.flush() | |
| 5340 other = hg.peer(repo, opts, source) | 5341 other = hg.peer(repo, opts, source) |
| 5341 try: | 5342 try: |
| 5342 revs, checkout = hg.addbranchrevs( | 5343 revs, checkout = hg.addbranchrevs( |
| 5343 repo, other, branches, opts.get(b'rev') | 5344 repo, other, branches, opts.get(b'rev') |
| 5344 ) | 5345 ) |