hg-nbmergeweb - Man Page
A mercurial web-based merge tool for notebooks
Description
usage: hg-nbmergeweb [-h] [--version] [--config]
- [--log-level {DEBUG,INFO,WARN,ERROR,CRITICAL}] [-s] [-o]
[-a] [-m] [-i] [-d] [--merge-strategy {inline,use-base,use-local,use-remote}] [--input-strategy {inline,use-base,use-local,use-remote}] [--output-strategy {inline,use-base,use-local,use-remote,remove,clear-all}] [--no-ignore-transients] [-p PORT] [-b BROWSER] [--persist] [--ip IP] [-w WORKDIRECTORY] [--base-url BASE_URL] [--show-unchanged] [--identical-lines-margin IDENTICAL_LINES_MARGIN] base local remote merged
A mercurial web-based merge tool for notebooks.
Uses nbdime to merge notebooks instead of plain text merges of JSON. See the documentation for how to correctly configure mercurial to use this.
Use with:
hg merge [<commit> [<commit>]]
positional arguments
- base
The base notebook filename.
- local
The local modified notebook filename.
- remote
The remote modified notebook filename.
- merged
The merge result notebook filename.
options
- -h, --help
show this help message and exit
- --version
show program's version number and exit
- --config
list the valid config keys and their current effective values
- --log-level {DEBUG,INFO,WARN,ERROR,CRITICAL}
set the log level by name.
- --merge-strategy {inline,use-base,use-local,use-remote}
the merge strategy to use.
- --input-strategy {inline,use-base,use-local,use-remote}
the merge strategy to use for inputs (overrides 'merge-strategy' for inputs).
- --output-strategy {inline,use-base,use-local,use-remote,remove,clear-all}
the merge strategy to use for outputs (overrides 'merge-strategy' for outputs).
- --no-ignore-transients
disallow deletion of transient data such as outputs and execution counts in order to resolve conflicts.
- -p, --port PORT
specify the port you want the server to run on. Default is 0 (random).
- -b, --browser BROWSER
specify the browser to use, to override the system default.
- --persist
prevent server shutting down on remote close request (when these would normally be supported).
- --ip IP
specify the interface to listen to for the web server. NOTE: Setting this to anything other than 127.0.0.1/localhost might comprimise the security of your computer. Use with care!
- -w, --workdirectory WORKDIRECTORY
specify the working directory you want the server to run from. Default is the actual cwd at program start.
- --base-url BASE_URL
The base URL prefix under which to run the web app
- --show-unchanged
show unchanged cells by default
- --identical-lines-margin IDENTICAL_LINES_MARGIN
Margin for collapsing identical lines in editor; set to -1 to deactivate.
ignorables
Set which parts of the notebook (not) to process.
- -s, --sources, -S, --ignore-sources
process/ignore sources.
- -o, --outputs, -O, --ignore-outputs
process/ignore outputs.
- -a, --attachments, -A, --ignore-attachments
process/ignore attachments.
- -m, --metadata, -M, --ignore-metadata
process/ignore metadata.
- -i, --id, -I, --ignore-id
process/ignore identifiers.
- -d, --details, -D, --ignore-details
process/ignore details not covered by other options.