{ "info": { "author": "Marica Odagaki", "author_email": "marica@noredink.com", "bugtrack_url": null, "classifiers": [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", "Operating System :: POSIX", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Topic :: Software Development" ], "description": "# git-whatsup\n\nList up remote branches that conflict with the current working copy.\n\nRequires Python 3.5+ and pygit2.\n\n```\n$ brew install libgit2\n$ pip install git-whatsup\n$ git-whatsup\nconflicts with me\n------------------------------------------------------------\norigin/find-the-leaks (M!)\n spec/spec_helper.rb C\n app/assets/cactus.png deleted by us\n```\n\nHow it works:\n\n- Create a commit on top of the current index with all unstaged changes\n- Tag the commit with `whatsup-with-me`\n- For each remote branch,\n - Try merging with `whatsup-with-me`\n - If it conflicts, try merging with `origin/master`\n - Based on the results, classify into roughly these categories:\n no conflicts, conflicts with my changes, or conflicts with just master\n- Output those that conflict with my changes\n - Output conflicting diffs too if requested\n\n\n## Usage\n\n```\n$ git-whatsup --help\nusage: git-whatsup [-h] [--remote REMOTE_NAME] [--master BRANCH_NAME]\n [--branch BRANCH_NAME] [--all] [--diff]\n [--format {plain,json}]\n [repo_path]\n\nList up remote branches that conflict with the current working copy.\n\npositional arguments:\n repo_path target Git repository\n\noptional arguments:\n -h, --help show this help message and exit\n --remote REMOTE_NAME compare against branches in this remote\n --master BRANCH_NAME master branch name\n --branch BRANCH_NAME, -b BRANCH_NAME\n branches to check. by default, all branches are\n checked\n --all, -a output all statuses if output format is `plain`\n --diff, -d output diffs if output format is `plain`\n --format {plain,json}, -f {plain,json}\n json always includes diffs\n```\n\n## Assumptions and caveats\n\n- Remote branches in your local clone are assumed to be up-to-date (`git fetch` has been run)\n- Consider this alpha software\n\n\n", "description_content_type": null, "docs_url": null, "download_url": "", "downloads": { "last_day": -1, "last_month": -1, "last_week": -1 }, "home_page": "https://github.com/NoRedInk/git-whatsup", "keywords": "git development", "license": "MIT", "maintainer": "", "maintainer_email": "", "name": "git-whatsup", "package_url": "https://pypi.org/project/git-whatsup/", "platform": "", "project_url": "https://pypi.org/project/git-whatsup/", "project_urls": { "Homepage": "https://github.com/NoRedInk/git-whatsup" }, "release_url": "https://pypi.org/project/git-whatsup/0.1.0/", "requires_dist": [ "pygit2" ], "requires_python": "", "summary": "Tool to list up remote branches that conflict with the current working copy.", "version": "0.1.0" }, "last_serial": 2383296, "releases": { "0.1.0": [ { "comment_text": "", "digests": { "md5": "60504b014987d93e38a8e71a1e9f4854", "sha256": "9c14fe94557bcf4bca11cb936a8c1ace74ca6b8c12be46e00e498682def973a5" }, "downloads": -1, "filename": "git_whatsup-0.1.0-py3-none-any.whl", "has_sig": true, "md5_digest": "60504b014987d93e38a8e71a1e9f4854", "packagetype": "bdist_wheel", "python_version": "py3", "requires_python": null, "size": 10519, "upload_time": "2016-10-06T02:12:07", "url": "https://files.pythonhosted.org/packages/1c/51/61ec9aced914c99a031885259fc41583a6f435b4dad74e129dd9f682110d/git_whatsup-0.1.0-py3-none-any.whl" }, { "comment_text": "", "digests": { "md5": "0385664754d5b6b98ca230a75521e46e", "sha256": "0c267ced7e81594fa6e91174320c3ac92724f733f5a67f87af60c89d8675d32d" }, "downloads": -1, "filename": "git-whatsup-0.1.0.tar.gz", "has_sig": true, "md5_digest": "0385664754d5b6b98ca230a75521e46e", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8379, "upload_time": "2016-10-06T02:12:09", "url": "https://files.pythonhosted.org/packages/64/e6/fa7cfd18b95e58899143def467555c2d63f063f4dba39c350eb05500c94e/git-whatsup-0.1.0.tar.gz" } ] }, "urls": [ { "comment_text": "", "digests": { "md5": "60504b014987d93e38a8e71a1e9f4854", "sha256": "9c14fe94557bcf4bca11cb936a8c1ace74ca6b8c12be46e00e498682def973a5" }, "downloads": -1, "filename": "git_whatsup-0.1.0-py3-none-any.whl", "has_sig": true, "md5_digest": "60504b014987d93e38a8e71a1e9f4854", "packagetype": "bdist_wheel", "python_version": "py3", "requires_python": null, "size": 10519, "upload_time": "2016-10-06T02:12:07", "url": "https://files.pythonhosted.org/packages/1c/51/61ec9aced914c99a031885259fc41583a6f435b4dad74e129dd9f682110d/git_whatsup-0.1.0-py3-none-any.whl" }, { "comment_text": "", "digests": { "md5": "0385664754d5b6b98ca230a75521e46e", "sha256": "0c267ced7e81594fa6e91174320c3ac92724f733f5a67f87af60c89d8675d32d" }, "downloads": -1, "filename": "git-whatsup-0.1.0.tar.gz", "has_sig": true, "md5_digest": "0385664754d5b6b98ca230a75521e46e", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8379, "upload_time": "2016-10-06T02:12:09", "url": "https://files.pythonhosted.org/packages/64/e6/fa7cfd18b95e58899143def467555c2d63f063f4dba39c350eb05500c94e/git-whatsup-0.1.0.tar.gz" } ] }