# QGitc
[](https://github.com/timxx/qgitc/actions)
[](https://pypi.org/project/qgitc)
[](https://pypi.org/project/qgitc)
[](LICENSE)
A file conflict viewer for git
## Features
- [x] Two branches view for easy comparing a conflict commit base on the file.
- [x] Visualize white spaces and carriage return for easy diff compare.
- [x] Syntax highlight for diff contents.
- [x] Filter logs by file path or commit pattern.
- [x] Copy commit summary as HTML format for pasting.
- [x] Custom pattern for creating links.
- [x] Collect conflict files for merging.
- [x] Launch specify merge tool for specify file suffix.
- [x] Builtin image diff tool for easy finding the difference.
- [ ] Auto finding which commit cause conflicts.
- [x] File blame support
## Requirements
- PySide6
- 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
``` sh
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
```
Raw data
{
"_id": null,
"home_page": "https://github.com/timxx/qgitc",
"name": "qgitc",
"maintainer": "",
"docs_url": null,
"requires_python": ">=3.0",
"maintainer_email": "",
"keywords": "git conflict viewer",
"author": "Weitian Leung",
"author_email": "weitianleung@gmail.com",
"download_url": "",
"platform": null,
"description": "# QGitc\n\n[](https://github.com/timxx/qgitc/actions)\n[](https://pypi.org/project/qgitc)\n[](https://pypi.org/project/qgitc)\n[](LICENSE)\n\nA file conflict viewer for git\n\n## Features\n\n- [x] Two branches view for easy comparing a conflict commit base on the file.\n- [x] Visualize white spaces and carriage return for easy diff compare.\n- [x] Syntax highlight for diff contents.\n- [x] Filter logs by file path or commit pattern.\n- [x] Copy commit summary as HTML format for pasting.\n- [x] Custom pattern for creating links.\n- [x] Collect conflict files for merging.\n- [x] Launch specify merge tool for specify file suffix.\n- [x] Builtin image diff tool for easy finding the difference.\n- [ ] Auto finding which commit cause conflicts.\n- [x] File blame support\n\n\n## Requirements\n\n- PySide6\n- git (command line)\n- chardet\n- pywin32\n - Optional for Windows if you want record the conflict log easily\n- pywpsrpc\n - Optional for Linux if you want record the conflict log easily\n- openpyxl\n - Optional if no pywin32/ pywpsrpc is available\n\n\n## Build & Run\n\n- Using source directly\n - Run **qgitc.py** under project root directory.\n - NOTE: If you want translation other than English or updated the UI files, run **python setup.py build** for the first time.\n\n- Build from source\n - Run *pip install .* under project root directory to install qgitc, and then run *qgitc* command.\n\n- Install from pypi\n - pip install qgitc\n\n\n## Shell Integration\n\n``` sh\nqgitc shell register\n# to unregister, run:\nqgitc shell unregister\n\n# to use the source directly:\npython qgitc.py shell register\n\n# for Linux user\n# if your file manager isn't the default one comes with desktop\n# say your desktop is Ubuntu, but use thunar as default one\n# use --file-manager to specify reigster for\nqgitch shell register --file-manager=thunar\n```\n",
"bugtrack_url": null,
"license": "Apache",
"summary": "A file conflict viewer for git",
"version": "3.8.1",
"project_urls": {
"Homepage": "https://github.com/timxx/qgitc"
},
"split_keywords": [
"git",
"conflict",
"viewer"
],
"urls": [
{
"comment_text": "",
"digests": {
"blake2b_256": "635d479a82c6c9330600f51bd84b060d93af5d92add96629bd0404cdb03a4a2d",
"md5": "f7342e1808bf4cbd8cbec6d3f53cfdb8",
"sha256": "46b00fbef9c0384a774b6d7797c709a2ad22d2e7c602875b8179b9200e9db2b9"
},
"downloads": -1,
"filename": "qgitc-3.8.1-py3-none-any.whl",
"has_sig": false,
"md5_digest": "f7342e1808bf4cbd8cbec6d3f53cfdb8",
"packagetype": "bdist_wheel",
"python_version": "py3",
"requires_python": ">=3.0",
"size": 139184,
"upload_time": "2023-07-09T10:35:08",
"upload_time_iso_8601": "2023-07-09T10:35:08.140614Z",
"url": "https://files.pythonhosted.org/packages/63/5d/479a82c6c9330600f51bd84b060d93af5d92add96629bd0404cdb03a4a2d/qgitc-3.8.1-py3-none-any.whl",
"yanked": false,
"yanked_reason": null
}
],
"upload_time": "2023-07-09 10:35:08",
"github": true,
"gitlab": false,
"bitbucket": false,
"codeberg": false,
"github_user": "timxx",
"github_project": "qgitc",
"travis_ci": false,
"coveralls": false,
"github_actions": true,
"lcname": "qgitc"
}
JSON
