From f795da9a7680eba5206ae0ac82e819269b156dbe 2018-11-11 13:12:05
From: Reuben Morais <reuben.morais@gmail.com>
Date: 2018-11-11 13:12:05
Subject: [PATCH] Add option to force silence %cd

---

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index 5ab6fcd..b6214c0 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -24,6 +24,7 @@ from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils.openpy import source_to_unicode
 from IPython.utils.process import abbrev_cwd
 from IPython.utils.terminal import set_term_title
+from traitlets import Bool
 
 
 @magics_class
@@ -31,6 +32,10 @@ class OSMagics(Magics):
     """Magics to interact with the underlying OS (shell-type functionality).
     """
 
+    cd_force_quiet = Bool(False,
+        help="Force %cd magic to be quiet even if -q is not passed."
+    ).tag(config=True)
+
     def __init__(self, shell=None, **kwargs):
 
         # Now define isexec in a cross platform manner.
@@ -414,7 +419,7 @@ class OSMagics(Magics):
             if oldcwd != cwd:
                 dhist.append(cwd)
                 self.shell.db['dhist'] = compress_dhist(dhist)[-100:]
-        if not 'q' in opts and self.shell.user_ns['_dh']:
+        if not 'q' in opts and not self.cd_force_quiet and self.shell.user_ns['_dh']:
             print(self.shell.user_ns['_dh'][-1])
 
     @line_magic
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 962dedd..fc7682c 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -23,7 +23,7 @@ from IPython.core.error import UsageError
 from IPython.core.magic import (Magics, magics_class, line_magic,
                                 cell_magic,
                                 register_line_magic, register_cell_magic)
-from IPython.core.magics import execution, script, code, logging
+from IPython.core.magics import execution, script, code, logging, osm
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 from IPython.utils.io import capture_output
@@ -433,7 +433,7 @@ def test_parse_options():
     nt.assert_equal(m.parse_options('foo', '')[1], 'foo')
     nt.assert_equal(m.parse_options(u'foo', '')[1], u'foo')
 
-    
+
 def test_dirops():
     """Test various directory handling operations."""
     # curpath = lambda :os.path.splitdrive(os.getcwd())[1].replace('\\','/')
@@ -453,6 +453,23 @@ def test_dirops():
         os.chdir(startdir)
 
 
+def test_cd_force_quiet():
+    """Test OSMagics.cd_force_quiet option"""
+    _ip.config.OSMagics.cd_force_quiet = True
+    osmagics = osm.OSMagics(shell=_ip)
+
+    startdir = os.getcwd()
+    ipdir = os.path.realpath(_ip.ipython_dir)
+
+    try:
+        with tt.AssertNotPrints(ipdir):
+            osmagics.cd('"%s"' % ipdir)
+        with tt.AssertNotPrints(startdir):
+            osmagics.cd('-')
+    finally:
+        os.chdir(startdir)
+
+
 def test_xmode():
     # Calling xmode three times should be a no-op
     xmode = _ip.InteractiveTB.mode
diff --git a/docs/source/whatsnew/pr/cd-force-quiet-config.rst b/docs/source/whatsnew/pr/cd-force-quiet-config.rst
new file mode 100644
index 0000000..16d0f1a
--- /dev/null
+++ b/docs/source/whatsnew/pr/cd-force-quiet-config.rst
@@ -0,0 +1,15 @@
+OSMagics.cd_force_quiet configuration option
+============================================
+
+You can set this option to force the %cd magic to behave as if ``-q`` was passed:
+::
+
+    In [1]: cd /
+    /
+    
+    In [2]: %config OSMagics.cd_force_quiet = True
+    
+    In [3]: cd /tmp
+    
+    In [4]:
+