mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
a487dacc4b
Summary: Previous code format attempt (D8173629) didn't cover all files due to `**/*.py` was not expanded recursively by bash. That makes certain changes larger than they should be (ex. D8675439). Now use zsh's `**/*.py` to format them. Also fix Python syntax so black can run on more files, and all lint issues. Reviewed By: phillco Differential Revision: D8696912 fbshipit-source-id: 95f07aa0c5eb1b63947b0f77f534957f4ab65364
104 lines
2.6 KiB
Python
104 lines
2.6 KiB
Python
# no-check-code -- see T24862348
|
|
|
|
import test_hgsubversion_util
|
|
from mercurial import commands, error, ui
|
|
|
|
|
|
try:
|
|
from mercurial import templatekw
|
|
|
|
templatekw.keywords
|
|
except ImportError:
|
|
templatekw = None
|
|
|
|
try:
|
|
from mercurial import revset
|
|
|
|
revset.methods
|
|
except ImportError:
|
|
revset = None
|
|
|
|
|
|
class CapturingUI(ui.ui):
|
|
def __init__(self, *args, **kwds):
|
|
super(CapturingUI, self).__init__(*args, **kwds)
|
|
self._output = ""
|
|
|
|
def write(self, msg, *args, **kwds):
|
|
self._output += msg
|
|
|
|
|
|
class TestLogKeywords(test_hgsubversion_util.TestBase):
|
|
@test_hgsubversion_util.requiresmodule(templatekw)
|
|
def test_svn_keywords(self):
|
|
defaults = {"date": None, "rev": None, "user": None, "graph": True}
|
|
repo = self._load_fixture_and_fetch("two_revs.svndump")
|
|
|
|
# we want one commit that isn't from Subversion
|
|
self.commitchanges([("foo", "foo", "frobnicate\n")])
|
|
|
|
ui = CapturingUI()
|
|
commands.log(ui, repo, template=(" rev: {rev} svnrev:{svnrev}\n"), **defaults)
|
|
print(ui._output)
|
|
self.assertEqual(
|
|
ui._output.strip(),
|
|
"""
|
|
rev: 2 svnrev:
|
|
@
|
|
|
|
|
rev: 1 svnrev:3
|
|
o
|
|
|
|
|
rev: 0 svnrev:2
|
|
o
|
|
""".strip(),
|
|
)
|
|
|
|
@test_hgsubversion_util.requiresmodule(revset)
|
|
@test_hgsubversion_util.requiresmodule(templatekw)
|
|
def test_svn_revsets(self):
|
|
repo = self._load_fixture_and_fetch("two_revs.svndump")
|
|
|
|
# we want one commit that isn't from Subversion
|
|
self.commitchanges([("foo", "foo", "frobnicate\n")])
|
|
|
|
defaults = {"date": None, "rev": ["fromsvn()"], "user": None}
|
|
|
|
ui = CapturingUI()
|
|
commands.log(ui, repo, template="{rev}:{svnrev} ", **defaults)
|
|
self.assertEqual(ui._output, "0:2 1:3 ")
|
|
|
|
defaults = {"date": None, "rev": ["svnrev(2)"], "user": None}
|
|
|
|
ui = CapturingUI()
|
|
commands.log(ui, repo, template="{rev}:{svnrev} ", **defaults)
|
|
self.assertEqual(ui._output, "0:2 ")
|
|
|
|
defaults = {"date": None, "rev": ["fromsvn(1)"], "user": None}
|
|
|
|
self.assertRaises(
|
|
error.ParseError,
|
|
commands.log,
|
|
self.ui(),
|
|
repo,
|
|
template="{rev}:{svnrev} ",
|
|
**defaults
|
|
)
|
|
|
|
defaults = {"date": None, "rev": ["svnrev(1, 2)"], "user": None}
|
|
|
|
self.assertRaises(
|
|
error.ParseError,
|
|
commands.log,
|
|
self.ui(),
|
|
repo,
|
|
template="{rev}:{svnrev} ",
|
|
**defaults
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import silenttestrunner
|
|
|
|
silenttestrunner.main(__name__)
|