Mercurial > hg-stable
changeset 19949:29f12a7a03ee stable
largefiles: don't add extra \n when displaying remote messages in putlfile
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 24 Oct 2013 01:49:56 +0800 |
| parents | 72214af683a2 |
| children | cce7ab960312 |
| files | hgext/largefiles/proto.py tests/test-largefiles.t |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/proto.py Mon Oct 21 11:22:54 2013 +0800 +++ b/hgext/largefiles/proto.py Thu Oct 24 01:49:56 2013 +0800 @@ -93,7 +93,7 @@ headers={'content-type':'application/mercurial-0.1'}) d, output = res.split('\n', 1) for l in output.splitlines(True): - self.ui.warn(_('remote: '), l, '\n') + self.ui.warn(_('remote: '), l) # assume l ends with \n return int(d) except (ValueError, urllib2.HTTPError): self.ui.warn(_('unexpected putlfile response: %r\n') % res)
--- a/tests/test-largefiles.t Mon Oct 21 11:22:54 2013 +0800 +++ b/tests/test-largefiles.t Thu Oct 24 01:49:56 2013 +0800 @@ -1678,7 +1678,6 @@ pushing to http://localhost:$HGPORT1/ searching for changes remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash - abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob) [255] $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8