This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5089

py3: fix test-status.t
ClosedPublic

Authored by mbthomas on Oct 13 2018, 11:32 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG125fc478719f: py3: fix test-status.t

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

mbthomas created this revision.Oct 13 2018, 11:32 AM
mbthomas updated this revision to Diff 12098.Oct 13 2018, 11:33 AM

Add to whitelist

pulkit added inline comments.Oct 13 2018, 11:35 AM
tests/test-status.t
540–543

are we hiding a b'' prefix here?

yuja added a subscriber: yuja.Oct 14 2018, 2:19 AM

test-status.t:540

status = [
  • {*'path': '1/2/3/4/5/b.txt'*}, (glob)

+ {*'path': *'1/2/3/4/5/b.txt'*}, (glob)

]

are we hiding a b'' prefix here?

Let's fix formatter.debugformatter.

mbthomas added inline comments.Oct 14 2018, 3:42 AM
tests/test-status.t
540–543

Yes - it's '...' on py2.7 and b'...' on py3. Is there a better way to check for these in debugoutput?

mbthomas added a comment.Oct 14 2018, 3:42 AM

Just saw yuya's comment, I will do that.

durin42 added a subscriber: durin42.Oct 14 2018, 4:06 AM
durin42 added inline comments.
tests/test-status.t
540–543

Queued with this hunk dropped. Thanks!

Closed by commit rHG125fc478719f: py3: fix test-status.t (authored by mbthomas). · Explain WhyOct 14 2018, 4:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-status.t (13 lines)

Diff 12101

contrib/python3-whitelist

test-ssh-repoerror.t test-ssh-repoerror.t
test-ssh.t test-ssh.t
test-sshserver.py test-sshserver.py
test-stack.t test-stack.t
test-status-color.t test-status-color.t
test-status-inprocess.py test-status-inprocess.py
test-status-rev.t test-status-rev.t
test-status-terse.t test-status-terse.t
test-status.t
test-storage.py test-storage.py
test-stream-bundle-v2.t test-stream-bundle-v2.t
test-strict.t test-strict.t
test-strip-cross.t test-strip-cross.t
test-strip.t test-strip.t
test-subrepo-deep-nested-change.t test-subrepo-deep-nested-change.t
test-subrepo-missing.t test-subrepo-missing.t
test-subrepo-paths.t test-subrepo-paths.t

tests/test-status.t

"path": "modified", "path": "modified",
"status": "C" "status": "C"
} }
] ]
$ hg status -A -Tpickle > pickle $ hg status -A -Tpickle > pickle
>>> from __future__ import print_function >>> from __future__ import print_function
>>> import pickle >>> import pickle
>>> print(sorted((x['status'], x['path']) for x in pickle.load(open("pickle")))) >>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb")))
[('!', 'deleted'), ('?', 'pickle'), ('?', 'unknown'), ('A', 'added'), ('A', 'copied'), ('C', '.hgignore'), ('C', 'modified'), ('I', 'ignored'), ('R', 'removed')] >>> for s, p in data: print("%s %s" % (s, p))
! deleted
? pickle
? unknown
A added
A copied
C .hgignore
C modified
I ignored
R removed
$ rm pickle $ rm pickle
$ echo "^ignoreddir$" > .hgignore $ echo "^ignoreddir$" > .hgignore
$ mkdir ignoreddir $ mkdir ignoreddir
$ touch ignoreddir/file $ touch ignoreddir/file
Test templater support: Test templater support:
R 1/2/3/4/5/b.txt R 1/2/3/4/5/b.txt
$ hg status -A --rev 1 1/2/3 $ hg status -A --rev 1 1/2/3
R 1/2/3/4/5/b.txt R 1/2/3/4/5/b.txt
$ hg status -A --rev 1 1 $ hg status -A --rev 1 1
R 1/2/3/4/5/b.txt R 1/2/3/4/5/b.txt
$ hg status --config ui.formatdebug=True --rev 1 1 $ hg status --config ui.formatdebug=True --rev 1 1
status = [ status = [
{ {
'path': '1/2/3/4/5/b.txt', 'path': '1/2/3/4/5/b.txt',
'status': 'R' 'status': 'R'
}, },
pulkitUnsubmitted
Not Done

are we hiding a b'' prefix here?

pulkit: are we hiding a b'' prefix here?
mbthomasAuthorUnsubmitted
Not Done

Yes - it's '...' on py2.7 and b'...' on py3. Is there a better way to check for these in debugoutput?

mbthomas: Yes - it's `'...'` on py2.7 and `b'...'` on py3. Is there a better way to check for these in…
durin42Unsubmitted
Not Done

Queued with this hunk dropped. Thanks!

durin42: Queued with this hunk dropped. Thanks!
] ]
#if windows #if windows
$ hg --config ui.slash=false status -A --rev 1 1 $ hg --config ui.slash=false status -A --rev 1 1
R 1\2\3\4\5\b.txt R 1\2\3\4\5\b.txt
#endif #endif
$ cd .. $ cd ..