facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity

test-hgsubversion-globalrevs: remove the capturing ui

Browse Source 
Summary:
The capturing UI is not required as we can use the much cleaner
`ui.pushbuffer`/`ui.popbuffer` for the intended purpose.

Reviewed By: quark-zju

Differential Revision: D12906912

fbshipit-source-id: ae93e6417135ca23b28a11af63745464344fa3cf
This commit is contained in:
Saurabh Singh 2018-11-06 16:39:35 -08:00 committed by Facebook Github Bot
parent 32b539a13a
commit ff98fdcc08
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tests/test-hgsubversion-globalrevs.py
View File

@ -1,5 +1,5 @@
import test_hgsubversion_util
from mercurial import commands, hg, ui
from mercurial import hg
class _DbCommand(object):
@ -77,24 +77,22 @@ class TestGlobalRev(test_hgsubversion_util.TestBase):
return repo, svn_repo_path
def _assert_globalrev(self, repo, expected_log, rev=None, showgraph=False):
class CapturingUI(ui.ui):
def __init__(self, *args, **kwds):
super(CapturingUI, self).__init__(*args, **kwds)
self._output = ""
cmd = ["log", "--quiet"]
def write(self, msg, *args, **kwds):
self._output += msg
if showgraph:
cmd.append("-G")
capturing_ui = CapturingUI()
defaults = {"date": None, "rev": rev, "user": None, "graph": showgraph}
commands.log(
capturing_ui,
repo,
template=(" svnrev:{svnrev} globalrev:{globalrev}\n"),
**defaults
)
if rev is not None:
cmd.append("-r")
cmd.append(rev)
self.assertEqual(capturing_ui._output.strip(), expected_log.strip())
cmd.append("-T")
cmd.append("svnrev:{svnrev} globalrev:{globalrev}\n")
ui = repo.ui
ui.pushbuffer()
test_hgsubversion_util.dispatch(cmd, ui, repo)
self.assertEqual(ui.popbuffer().strip(), expected_log.strip())
def test_nochanges(self):
repo, _ = self._loadupdate("single_rev.svndump")
@ -104,8 +102,8 @@ class TestGlobalRev(test_hgsubversion_util.TestBase):
self._assert_globalrev(
repo,
"""
svnrev:2 globalrev:
@
@ svnrev:2 globalrev:
""",
showgraph=True,
)
@ -121,14 +119,11 @@ class TestGlobalRev(test_hgsubversion_util.TestBase):
self._assert_globalrev(
repo,
"""
svnrev:4 globalrev:5001
o
o svnrev:4 globalrev:5001
|
svnrev:3 globalrev:5000
o
o svnrev:3 globalrev:5000
|
svnrev:2 globalrev:
@
@ svnrev:2 globalrev:
""",
showgraph=True,
)
@ -144,14 +139,11 @@ o
self._assert_globalrev(
repo,
"""
svnrev:4 globalrev:5001
@
@ svnrev:4 globalrev:5001
|
svnrev:3 globalrev:5000
o
o svnrev:3 globalrev:5000
|
svnrev:2 globalrev:
o
o svnrev:2 globalrev:
""",
showgraph=True,
)