This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3509

tests: port test-context.py to Python 3
ClosedPublic

Authored by durin42 on May 8 2018, 3:27 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0d95ad9fc5f4: tests: port test-context.py to Python 3
Summary

This is a weird "minimally invasive" port. I think there's room to do
better here, but I'm also not sure how often we'll touch this code...

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.May 8 2018, 3:27 PM
pulkit accepted this revision.May 9 2018, 6:46 PM
Closed by commit rHG0d95ad9fc5f4: tests: port test-context.py to Python 3 (authored by durin42). · Explain WhyMay 10 2018, 6:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-context.py (97 lines)

Diff 8577

contrib/python3-whitelist

test-commit-unresolved.t test-commit-unresolved.t
test-commit.t test-commit.t
test-committer.t test-committer.t
test-completion.t test-completion.t
test-config-env.py test-config-env.py
test-config.t test-config.t
test-conflict.t test-conflict.t
test-confused-revert.t test-confused-revert.t
test-context.py
test-contrib-check-code.t test-contrib-check-code.t
test-contrib-check-commit.t test-contrib-check-commit.t
test-convert-authormap.t test-convert-authormap.t
test-convert-clonebranches.t test-convert-clonebranches.t
test-convert-cvs-branch.t test-convert-cvs-branch.t
test-convert-cvs-detectmerge.t test-convert-cvs-detectmerge.t
test-convert-cvs.t test-convert-cvs.t
test-convert-datesort.t test-convert-datesort.t

tests/test-context.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import os import os
import stat import stat
import sys
from mercurial.node import hex from mercurial.node import hex
from mercurial import ( from mercurial import (
context, context,
encoding, encoding,
hg, hg,
scmutil, scmutil,
ui as uimod, ui as uimod,
) )
print_ = print
def print(*args, **kwargs):
"""print() wrapper that flushes stdout buffers to avoid py3 buffer issues
We could also just write directly to sys.stdout.buffer the way the
ui object will, but this was easier for porting the test.
"""
print_(*args, **kwargs)
sys.stdout.flush()
def printb(data, end=b'\n'):
out = getattr(sys.stdout, 'buffer', sys.stdout)
out.write(data + end)
out.flush()
u = uimod.ui.load() u = uimod.ui.load()
repo = hg.repository(u, 'test1', create=1) repo = hg.repository(u, b'test1', create=1)
os.chdir('test1') os.chdir('test1')
# create 'foo' with fixed time stamp # create 'foo' with fixed time stamp
f = open('foo', 'wb') f = open('foo', 'wb')
f.write(b'foo\n') f.write(b'foo\n')
f.close() f.close()
os.utime('foo', (1000, 1000)) os.utime('foo', (1000, 1000))
# add+commit 'foo' # add+commit 'foo'
repo[None].add(['foo']) repo[None].add([b'foo'])
repo.commit(text='commit1', date="0 0") repo.commit(text=b'commit1', date=b"0 0")
d = repo[None]['foo'].date() d = repo[None][b'foo'].date()
if os.name == 'nt': if os.name == 'nt':
d = d[:2] d = d[:2]
print("workingfilectx.date = (%d, %d)" % d) print("workingfilectx.date = (%d, %d)" % d)
# test memctx with non-ASCII commit message # test memctx with non-ASCII commit message
def filectxfn(repo, memctx, path): def filectxfn(repo, memctx, path):
return context.memfilectx(repo, memctx, "foo", "") return context.memfilectx(repo, memctx, b"foo", b"")
ctx = context.memctx(repo, ['tip', None], ctx = context.memctx(repo, [b'tip', None],
encoding.tolocal("Gr\xc3\xbcezi!"), encoding.tolocal(b"Gr\xc3\xbcezi!"),
["foo"], filectxfn) [b"foo"], filectxfn)
ctx.commit() ctx.commit()
for enc in "ASCII", "Latin-1", "UTF-8": for enc in "ASCII", "Latin-1", "UTF-8":
encoding.encoding = enc encoding.encoding = enc
print("%-8s: %s" % (enc, repo["tip"].description())) printb(b"%-8s: %s" % (enc.encode('ascii'), repo[b"tip"].description()))
# test performing a status # test performing a status
def getfilectx(repo, memctx, f): def getfilectx(repo, memctx, f):
fctx = memctx.parents()[0][f] fctx = memctx.parents()[0][f]
data, flags = fctx.data(), fctx.flags() data, flags = fctx.data(), fctx.flags()
if f == 'foo': if f == b'foo':
data += 'bar\n' data += b'bar\n'
return context.memfilectx(repo, memctx, f, data, 'l' in flags, 'x' in flags) return context.memfilectx(
repo, memctx, f, data, b'l' in flags, b'x' in flags)
ctxa = repo[0] ctxa = repo[0]
ctxb = context.memctx(repo, [ctxa.node(), None], "test diff", ["foo"], ctxb = context.memctx(repo, [ctxa.node(), None], b"test diff", [b"foo"],
getfilectx, ctxa.user(), ctxa.date()) getfilectx, ctxa.user(), ctxa.date())
print(ctxb.status(ctxa)) print(ctxb.status(ctxa))
# test performing a diff on a memctx # test performing a diff on a memctx
for d in ctxb.diff(ctxa, git=True): for d in ctxb.diff(ctxa, git=True):
print(d, end='') printb(d, end=b'')
# test safeness and correctness of "ctx.status()" # test safeness and correctness of "ctx.status()"
print('= checking context.status():') print('= checking context.status():')
# ancestor "wcctx ~ 2" # ancestor "wcctx ~ 2"
actx2 = repo['.'] actx2 = repo[b'.']
repo.wwrite('bar-m', 'bar-m\n', '') repo.wwrite(b'bar-m', b'bar-m\n', b'')
repo.wwrite('bar-r', 'bar-r\n', '') repo.wwrite(b'bar-r', b'bar-r\n', b'')
repo[None].add(['bar-m', 'bar-r']) repo[None].add([b'bar-m', b'bar-r'])
repo.commit(text='add bar-m, bar-r', date="0 0") repo.commit(text=b'add bar-m, bar-r', date=b"0 0")
# ancestor "wcctx ~ 1" # ancestor "wcctx ~ 1"
actx1 = repo['.'] actx1 = repo[b'.']
repo.wwrite('bar-m', 'bar-m bar-m\n', '') repo.wwrite(b'bar-m', b'bar-m bar-m\n', b'')
repo.wwrite('bar-a', 'bar-a\n', '') repo.wwrite(b'bar-a', b'bar-a\n', b'')
repo[None].add(['bar-a']) repo[None].add([b'bar-a'])
repo[None].forget(['bar-r']) repo[None].forget([b'bar-r'])
# status at this point: # status at this point:
# M bar-m # M bar-m
# A bar-a # A bar-a
# R bar-r # R bar-r
# C foo # C foo
from mercurial import scmutil from mercurial import scmutil
print('== checking workingctx.status:') print('== checking workingctx.status:')
wctx = repo[None] wctx = repo[None]
print('wctx._status=%s' % (str(wctx._status))) print('wctx._status=%s' % (str(wctx._status)))
print('=== with "pattern match":') print('=== with "pattern match":')
print(actx1.status(other=wctx, print(actx1.status(other=wctx,
match=scmutil.matchfiles(repo, ['bar-m', 'foo']))) match=scmutil.matchfiles(repo, [b'bar-m', b'foo'])))
print('wctx._status=%s' % (str(wctx._status))) print('wctx._status=%s' % (str(wctx._status)))
print(actx2.status(other=wctx, print(actx2.status(other=wctx,
match=scmutil.matchfiles(repo, ['bar-m', 'foo']))) match=scmutil.matchfiles(repo, [b'bar-m', b'foo'])))
print('wctx._status=%s' % (str(wctx._status))) print('wctx._status=%s' % (str(wctx._status)))
print('=== with "always match" and "listclean=True":') print('=== with "always match" and "listclean=True":')
print(actx1.status(other=wctx, listclean=True)) print(actx1.status(other=wctx, listclean=True))
print('wctx._status=%s' % (str(wctx._status))) print('wctx._status=%s' % (str(wctx._status)))
print(actx2.status(other=wctx, listclean=True)) print(actx2.status(other=wctx, listclean=True))
print('wctx._status=%s' % (str(wctx._status))) print('wctx._status=%s' % (str(wctx._status)))
print("== checking workingcommitctx.status:") print("== checking workingcommitctx.status:")
wcctx = context.workingcommitctx(repo, wcctx = context.workingcommitctx(repo,
scmutil.status(['bar-m'], scmutil.status([b'bar-m'],
['bar-a'], [b'bar-a'],
[], [],
[], [], [], []), [], [], [], []),
text='', date='0 0') text=b'', date=b'0 0')
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print('=== with "always match":') print('=== with "always match":')
print(actx1.status(other=wcctx)) print(actx1.status(other=wcctx))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print(actx2.status(other=wcctx)) print(actx2.status(other=wcctx))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print('=== with "always match" and "listclean=True":') print('=== with "always match" and "listclean=True":')
print(actx1.status(other=wcctx, listclean=True)) print(actx1.status(other=wcctx, listclean=True))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print(actx2.status(other=wcctx, listclean=True)) print(actx2.status(other=wcctx, listclean=True))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print('=== with "pattern match":') print('=== with "pattern match":')
print(actx1.status(other=wcctx, print(actx1.status(other=wcctx,
match=scmutil.matchfiles(repo, ['bar-m', 'foo']))) match=scmutil.matchfiles(repo, [b'bar-m', b'foo'])))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print(actx2.status(other=wcctx, print(actx2.status(other=wcctx,
match=scmutil.matchfiles(repo, ['bar-m', 'foo']))) match=scmutil.matchfiles(repo, [b'bar-m', b'foo'])))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print('=== with "pattern match" and "listclean=True":') print('=== with "pattern match" and "listclean=True":')
print(actx1.status(other=wcctx, print(actx1.status(other=wcctx,
match=scmutil.matchfiles(repo, ['bar-r', 'foo']), match=scmutil.matchfiles(repo, [b'bar-r', b'foo']),
listclean=True)) listclean=True))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
print(actx2.status(other=wcctx, print(actx2.status(other=wcctx,
match=scmutil.matchfiles(repo, ['bar-r', 'foo']), match=scmutil.matchfiles(repo, [b'bar-r', b'foo']),
listclean=True)) listclean=True))
print('wcctx._status=%s' % (str(wcctx._status))) print('wcctx._status=%s' % (str(wcctx._status)))
os.chdir('..') os.chdir('..')
# test manifestlog being changed # test manifestlog being changed
print('== commit with manifestlog invalidated') print('== commit with manifestlog invalidated')
repo = hg.repository(u, 'test2', create=1) repo = hg.repository(u, b'test2', create=1)
os.chdir('test2') os.chdir('test2')
# make some commits # make some commits
for i in [b'1', b'2', b'3']: for i in [b'1', b'2', b'3']:
with open(i, 'wb') as f: with open(i, 'wb') as f:
f.write(i) f.write(i)
status = scmutil.status([], [i], [], [], [], [], []) status = scmutil.status([], [i], [], [], [], [], [])
ctx = context.workingcommitctx(repo, status, text=i, user=b'test@test.com', ctx = context.workingcommitctx(repo, status, text=i, user=b'test@test.com',
date=(0, 0)) date=(0, 0))
ctx.p1().manifest() # side effect: cache manifestctx ctx.p1().manifest() # side effect: cache manifestctx
n = repo.commitctx(ctx) n = repo.commitctx(ctx)
print('commit %s: %s' % (i, hex(n))) printb(b'commit %s: %s' % (i, hex(n)))
# touch 00manifest.i mtime so storecache could expire. # touch 00manifest.i mtime so storecache could expire.
# repo.__dict__['manifestlog'] is deleted by transaction releasefn. # repo.__dict__['manifestlog'] is deleted by transaction releasefn.
st = repo.svfs.stat('00manifest.i') st = repo.svfs.stat(b'00manifest.i')
repo.svfs.utime('00manifest.i', repo.svfs.utime(b'00manifest.i',
(st[stat.ST_MTIME] + 1, st[stat.ST_MTIME] + 1)) (st[stat.ST_MTIME] + 1, st[stat.ST_MTIME] + 1))
# read the file just committed # read the file just committed
try: try:
if repo[n][i].data() != i: if repo[n][i].data() != i:
print('data mismatch') print('data mismatch')
except Exception as ex: except Exception as ex:
print('cannot read data: %r' % ex) print('cannot read data: %r' % ex)
with repo.wlock(), repo.lock(), repo.transaction('test'): with repo.wlock(), repo.lock(), repo.transaction(b'test'):
with open(b'4', 'wb') as f: with open(b'4', 'wb') as f:
f.write(b'4') f.write(b'4')
repo.dirstate.normal('4') repo.dirstate.normal(b'4')
repo.commit('4') repo.commit(b'4')
revsbefore = len(repo.changelog) revsbefore = len(repo.changelog)
repo.invalidate(clearfilecache=True) repo.invalidate(clearfilecache=True)
revsafter = len(repo.changelog) revsafter = len(repo.changelog)
if revsbefore != revsafter: if revsbefore != revsafter:
print('changeset lost by repo.invalidate()') print('changeset lost by repo.invalidate()')