Skip to main content

A file conflict viewer for git

Project description

QGitc

PyPI version Python version License

A file conflict viewer for git

Features

  • <input type="checkbox" checked="" disabled="" /> Two branches view for easy comparing a conflict commit base on the file.
  • <input type="checkbox" checked="" disabled="" /> Visualize white spaces and carriage return for easy diff compare.
  • <input type="checkbox" checked="" disabled="" /> Syntax highlight for diff contents.
  • <input type="checkbox" checked="" disabled="" /> Filter logs by file path or commit pattern.
  • <input type="checkbox" checked="" disabled="" /> Copy commit summary as HTML format for pasting.
  • <input type="checkbox" checked="" disabled="" /> Custom pattern for creating links.
  • <input type="checkbox" checked="" disabled="" /> Collect conflict files for merging.
  • <input type="checkbox" checked="" disabled="" /> Launch specify merge tool for specify file suffix.
  • <input type="checkbox" checked="" disabled="" /> Builtin image diff tool for easy finding the difference.
  • <input type="checkbox" disabled="" /> Auto finding which commit cause conflicts.
  • <input type="checkbox" checked="" disabled="" /> File blame support

Requirements

  • PySide2 >= 5.2.0
  • git (command line)
  • chardet
  • pywin32
    • Optional for Windows if you want record the conflict log easily
  • pywpsrpc
    • Optional for Linux if you want record the conflict log easily
  • openpyxl
    • Optional if no pywin32/ pywpsrpc is available

Build & Run

  • Using source directly

    • Run qgitc.py under project root directory.
    • NOTE: If you want translation other than English or updated the UI files, run python setup.py build for the first time.
  • Build from source

    • Run pip install . under project root directory to install qgitc, and then run qgitc command.
  • Install from pypi

    • pip install qgitc

Shell Integration

qgitc shell register
# to unregister, run:
qgitc shell unregister

# to use the source directly:
python qgitc.py shell register

# for Linux user
# if your file manager isn't the default one comes with desktop
# say your desktop is Ubuntu, but use thunar as default one
# use --file-manager to specify reigster for
qgitch shell register --file-manager=thunar

Project details


Download files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

Files for qgitc, version 3.3.1
Filename, size File type Python version Upload date Hashes
Filename, size qgitc-3.3.1-py3-none-any.whl (129.5 kB) File type Wheel Python version py3 Upload date Hashes View

Supported by

AWS AWS Cloud computing Datadog Datadog Monitoring DigiCert DigiCert EV certificate Facebook / Instagram Facebook / Instagram PSF Sponsor Fastly Fastly CDN Google Google Object Storage and Download Analytics Pingdom Pingdom Monitoring Salesforce Salesforce PSF Sponsor Sentry Sentry Error logging StatusPage StatusPage Status page