This is an archive of the discontinued Mercurial Phabricator instance.

Differential D71

tests: fix 'if False' statements flagged by check-code
ClosedPublic

Authored by simpkins on Jul 12 2017, 11:18 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
quark
Group Reviewers
Restricted Project
Commits
rFBHGX6e4a284f4755: tests: fix 'if False' statements flagged by check-code
Summary

The check-code test in the upstream mercurial repository was recently updated
to start complaining about "if False" statements. Two locations in fb-hgext
had this issue.

These both look to be copy-and-pastes of the same function, unfortunately.
That should probably be cleaned up too, but I'll leave that for a separate diff
for now.

Test Plan

Confirmed the test-check-code test passes now.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

simpkins created this revision.Jul 12 2017, 11:18 PM
quark accepted this revision.Jul 13 2017, 12:19 AM
This revision is now accepted and ready to land.Jul 13 2017, 12:19 AM
Closed by commit rFBHGX6e4a284f4755: tests: fix 'if False' statements flagged by check-code (authored by simpkins). · Explain WhyJul 13 2017, 3:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/perftest.py (4 lines)
Mtests/treemanifest_correctness.py (4 lines)

Diff 102

tests/perftest.py

# perf-test.py - simple extension for perf testing manifest performance # perf-test.py - simple extension for perf testing manifest performance
# #
# Copyright 2016 Facebook, Inc. # Copyright 2016 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from mercurial import ( from mercurial import (
error, error,
manifest, manifest,
mdiff,
registrar, registrar,
vfs as vfsmod, vfs as vfsmod,
) )
from mercurial.node import nullid from mercurial.node import nullid
from remotefilelog import datapack, contentstore, shallowutil from remotefilelog import datapack, contentstore, shallowutil
import contextlib, hashlib, os, time import contextlib, hashlib, os, time
from fastmanifest.implementation import fastmanifestcache from fastmanifest.implementation import fastmanifestcache
from fastmanifest import cachemanager from fastmanifest import cachemanager
# Save nodeid so parent manifest can calculate its nodeid # Save nodeid so parent manifest can calculate its nodeid
if forcenode: if forcenode:
n = forcenode n = forcenode
try: try:
store.get(m._dir, n) store.get(m._dir, n)
except KeyError: except KeyError:
deltabase = nullid deltabase = nullid
delta = text delta = text
if False and m1.node() != nullid:
deltabase = m1.node()
delta = mdiff.textdiff(m1.dirtext(usemfv2), text)
pack.add(m._dir, n, deltabase, delta) pack.add(m._dir, n, deltabase, delta)
cache.add(m._dir, n, text) cache.add(m._dir, n, text)
m.setnode(n) m.setnode(n)
return n return n
def profiletreepack(repo, store, rev1, rev2, opts): def profiletreepack(repo, store, rev1, rev2, opts):
def exectest(name, count, prep, func): def exectest(name, count, prep, func):
elapsed = 0 elapsed = 0

tests/treemanifest_correctness.py

# treemanifest_correctness.py - simple extension for testing treemanifest # treemanifest_correctness.py - simple extension for testing treemanifest
# correctness # correctness
# #
# Copyright 2016 Facebook, Inc. # Copyright 2016 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from mercurial import ( from mercurial import (
manifest, manifest,
mdiff,
registrar, registrar,
) )
from mercurial.node import nullid from mercurial.node import nullid
from remotefilelog import datapack, contentstore, shallowutil from remotefilelog import datapack, contentstore, shallowutil
import difflib, hashlib, os, time import difflib, hashlib, os, time
from fastmanifest import cachemanager from fastmanifest import cachemanager
import cstore import cstore
# Save nodeid so parent manifest can calculate its nodeid # Save nodeid so parent manifest can calculate its nodeid
if forcenode: if forcenode:
n = forcenode n = forcenode
try: try:
store.get(m._dir, n) store.get(m._dir, n)
except KeyError: except KeyError:
deltabase = nullid deltabase = nullid
delta = text delta = text
if False and m1.node() != nullid:
deltabase = m1.node()
delta = mdiff.textdiff(m1.dirtext(usemfv2), text)
pack.add(m._dir, n, deltabase, delta) pack.add(m._dir, n, deltabase, delta)
cache.add(m._dir, n, text) cache.add(m._dir, n, text)
m.setnode(n) m.setnode(n)
return n return n
def profiletreepack(repo, store, rev1, rev2, opts): def profiletreepack(repo, store, rev1, rev2, opts):
def exectest(name, prep, func): def exectest(name, prep, func):
elapsed = 0 elapsed = 0