Merge pull request #711 from fcollonval/fix/apply-review-comments

Apply post-mortem review comments

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -98,7 +98,7 @@ jobs:
       wheel: ${{ steps.packaging.outputs.wheel }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -173,7 +173,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Install node

nbdime/args.py

@@ -472,12 +472,6 @@ def add_merge_args(parser):
         default=True,
         help="disallow deletion of transient data such as outputs and "
              "execution counts in order to resolve conflicts.")
-    parser.add_argument(
-        '--no-base',
-        dest='show_base',
-        action="store_false",
-        default=True,
-        help="Don't display the base version.")
 
 
 filename_help = {
@@ -545,7 +539,6 @@ def args_for_server(arguments):
                 workdirectory='cwd',
                 base_url='base_url',
                 hide_unchanged='hide_unchanged',
-                show_base='show_base',
                 identical_lines_margin='identical_lines_margin',
                 )
     ret = {kmap[k]: v for k, v in vars(arguments).items() if k in kmap}

nbdime/config.py

@@ -256,11 +256,6 @@ class Merge(_Diffing):
              "execution counts in order to resolve conflicts.",
     ).tag(config=True)
 
-    show_base = Bool(
-        True,
-        help="Whether to show the base version (4-panels) or not (3-panels).",
-    ).tag(config=True)
-
 
 class GitDiff(Diff):
     use_filter = Bool(
@@ -283,7 +278,11 @@ class NbMerge(Merge):
     pass
 
 class NbMergeWeb(Web, Merge):
-    pass
+
+    show_base = Bool(
+        True,
+        help="Whether to show the base version (4-panels) or not (3-panels).",
+    ).tag(config=True)
 
 class NbShow(Show):
     pass

nbdime/webapp/nbmergeweb.py

@@ -29,6 +29,13 @@ def build_arg_parser():
     add_diff_args(parser)
     add_merge_args(parser)
     add_web_args(parser, 0)
+    parser.add_argument(
+        "--no-base",
+        dest="show_base",
+        action="store_false",
+        default=True,
+        help="Don't display the base version."
+    )
     add_filename_args(parser, ["base", "local", "remote"])
     parser.add_argument(
         '--out',
@@ -55,7 +62,9 @@ def main(args=None):
             rel_url='merge',
             base=base, local=local, remote=remote,
             **args_for_browse(arguments)),
-        **args_for_server(arguments))
+        **args_for_server(arguments), 
+        show_base=arguments.show_base,
+    )
 
 
 if __name__ == "__main__":