This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7938

py3: string normalization and I/O tweaks in test-lfs.t
ClosedPublic

Authored by indygreg on Jan 18 2020, 2:42 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2928d5af6281: py3: string normalization and I/O tweaks in test-lfs.t
Summary

The print was inserting b'' on Python 3. In addition, since we
weren't writing to the ui instance (which isn't readily available
in this function), output order could get mixed up.

We add some pycompat casts and a stdout flush to make the test
happy on all Python versions.

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

indygreg created this revision.Jan 18 2020, 2:42 AM
pulkit accepted this revision.Jan 20 2020, 7:37 AM
This revision is now accepted and ready to land.Jan 20 2020, 7:37 AM
indygreg added a commit: rHG2928d5af6281: py3: string normalization and I/O tweaks in test-lfs.t.Jan 20 2020, 9:20 AM
Closed by commit rHG2928d5af6281: py3: string normalization and I/O tweaks in test-lfs.t (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-lfs.t (8 lines)

Diff 19456

tests/test-lfs.t

$ test -f fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e $ test -f fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
[1] [1]
Verify will not try to download lfs blobs, if told not to process lfs content. Verify will not try to download lfs blobs, if told not to process lfs content.
The extension makes sure that the filelog.renamed() path is taken on a missing The extension makes sure that the filelog.renamed() path is taken on a missing
blob, and the output shows that it isn't fetched. blob, and the output shows that it isn't fetched.
$ cat > $TESTTMP/lfsrename.py <<EOF $ cat > $TESTTMP/lfsrename.py <<EOF
> import sys
>
> from mercurial import ( > from mercurial import (
> exthelper, > exthelper,
> pycompat,
> ) > )
> >
> from hgext.lfs import ( > from hgext.lfs import (
> pointer, > pointer,
> wrapper, > wrapper,
> ) > )
> >
> eh = exthelper.exthelper() > eh = exthelper.exthelper()
> uisetup = eh.finaluisetup > uisetup = eh.finaluisetup
> >
> @eh.wrapfunction(wrapper, b'filelogrenamed') > @eh.wrapfunction(wrapper, b'filelogrenamed')
> def filelogrenamed(orig, orig1, self, node): > def filelogrenamed(orig, orig1, self, node):
> ret = orig(orig1, self, node) > ret = orig(orig1, self, node)
> if wrapper._islfs(self._revlog, node) and ret: > if wrapper._islfs(self._revlog, node) and ret:
> rawtext = self._revlog.rawdata(node) > rawtext = self._revlog.rawdata(node)
> metadata = pointer.deserialize(rawtext) > metadata = pointer.deserialize(rawtext)
> print('lfs blob %s renamed %s -> %s' > print('lfs blob %s renamed %s -> %s'
> % (metadata[b'oid'], ret[0], self._revlog.filename)) > % (pycompat.sysstr(metadata[b'oid']),
> pycompat.sysstr(ret[0]),
> pycompat.fsdecode(self._revlog.filename)))
> sys.stdout.flush()
> return ret > return ret
> EOF > EOF
$ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v --no-lfs \ $ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v --no-lfs \
> --config extensions.x=$TESTTMP/lfsrename.py > --config extensions.x=$TESTTMP/lfsrename.py
repository uses revlog format 1 repository uses revlog format 1
checking changesets checking changesets
checking manifests checking manifests