PyGitUp is a Python port of
aanand/git-up. It not only
fully covers the abilities of git-up and should be a drop-in replacement,
but also extends it slightly.
Why use git up?
git pull has two problems:
It merges upstream changes by default, when it's really more polite to rebase
over them,
unless your collaborators enjoy a commit graph that looks like bedhead.
It only updates the branch you're currently on, which means git push will
shout at you for being behind on branches you don't particularly care about
right now.
I wasn't able to use the original git-up, because I didn't want to install
a whole Ruby suite just for git-up and even with Ruby installed, there were
some problems running on my Windows machine. So, my reasons for writing
and using this port are:
Homebrew users can also use brew: brew install pygitup
Note for Windows users:
See these instructions
for installing pip, if you haven't already installed it. And don't forget
to either:
make your Python/Scripts and Python/Lib/site-packages writable for
you,
run pip with admin privileges
or use pip install --user git-up and add %APPDATA%/Python/Scripts
to %PATH%.
Otherwise pip will refuse to install git-up due to Access denied errors.
Python version compatibility:
Python 3.7 and upwards are supported :)
Options and Configuration
Command Line Arguments
git up -h shows a help message.
git up --quiet suppresses all output except for error messages.
git up --no-fetch skips fetching the remote and rebases all local branches.
git up --version shows the current version and optionally checks for
updates (see below).
Configuration
To configure PyGitUp, you can set options in your git config. Run
git config [--global] git-up.[name] [value] to set one of these
options:
git-up.fetch.prune [*true*|false]: If set to true,
PyGitUp will append the --pruneoption to git fetch and
thus remove any remote tracking branches which no longer exist on
the remote (see git fetch
--help).
git-up.fetch.all [true|*false*]: If set to false, PyGitUp
will only fetch remotes for which there is at least one local
tracking branch. Setting this option will make git up always fetch
from all remotes, which is useful if e.g. you use a remote to push to
your CI system but never check those branches out.
git-up.push.auto [true|*false*]: Push the current branch after
rebasing and fast-forwarding.
git-up.push.all [true|*false*]: Push all branches when auto-pushing.
git-up.push.tags [true|*false*]: Push tags when auto-pushing.
git-up.rebase.arguments [string]: If set, PyGitUp will use
this string as additional arguments when calling git rebase.
Example: --preserve-merges to recreate merge commits in the
rebased branch.
git-up.rebase.auto [*true*|false]: If set to false,
PyGitUp won't rebase your branches for you but notify you that
they diverged. This can be useful if you have a lot of in-progress
work that you don't want to deal with at once, but still want to
update other branches.
git-up.rebase.log-hook [cmd]: Runs cmd every time a branch
is rebased or fast-forwarded, with the old head as $1 and the new
head as $2. This can be used to view logs or diffs of incoming
changes. Example:
echo "changes on $1:"; git log --oneline --decorate $1..$2.
git-up.rebase.show-hashes [true|*false*]: If set to true,
PyGitUp will show the hashes of the current commit (or the point
where the rebase starts) and the target commit like git pull does.
New in v1.0.0:
git-up.updates.check [*true*|false]: When running git up --version,
it shows the version number and checks for updates. If you feel
uncomfortable with it, just set it to false to turn off the checks.
Credits
The original git-up has been written by aanand:
aanand/git-up/.
Changelog
v2.1.0 (2021-10-02)
Switch to Python's argparse for CLI argument parsing. Thanks
@ekohl for Pull Request #96.
Dependencies on 3rd party libraries have been loosened to better interact with other installed packages.
Thanks MaximilianR for Pull Request #45.
Added an command line argument to turn of fetching (--no-fetch). Thanks @buoto
for Pull Request #46.
Don't show a stacktrace anymore when stashing fails (#35).
Fixed a bug that caused problems with submodules if the submodule had unstashed changes/ Thanks
@Javex for Pull Request #27.
v1.3.1 (2015-08-31)
Fixed a bug when showing the version on Python 3 #34.
v1.3.0 (2015-04-08)
Support for Python 3 has been added. Thanks @r4ts0n
for Pull Request #23
and @Byron for quickly merging a Pull Request
in GitPython
and releasing a new version on which this release depends.
v1.2.2 (2015-02-23)
Now updates submodules when called from git submodule foreach (#8).
Fix for #7
(AttributeError: 'GitUp' object has no attribute 'git') introduced by
v1.1.0.
v1.1.0 (2013-10-07)
Prior to v1.1.0, PyGitUp tried to guess the upstream branch for a local
branch by looking for a branch on any remote with the same name. With v1.1.0,
PyGitUp stops guessing and uses the upstream branch config instead.
This by the way fixes issue #6
(git up doesn't work with local only branches).
Note:
This change may break setups, where a local branch accidentally has
the same name as a remote branch without any tracking information set. Prior
to v1.1.0, git up would still fetch and rebase from the remote branch.
If you run into troubles with such a setup, setting tracking information
using git branch -u <remote>/<remote branch> <local branch> should help.
3rd party dependencies have been updated.
Allows to run git up --version from non-git dirs, too.
v1.0.0 (2013-09-05)
Finally PyGitUp reaches 1.0.0. You can consider it stable now :)
Added a comprehensive test suite, now with a coverage of about 90%.
Lots of code cleanup.
Added option -h to display a help screen (--helpwon't work, because
git catches this option and handles it before PyGitUp can do).
Added option --version to show, what version of PyGitUp is running.
Also checks for updates (can be disabled, see configuration).
Added option --quiet to be quiet and only display error messages.
v0.2.3 (2013-06-05)
Fixed issue #4 (ugly
exception if remote branch has been deleted).
v0.2.2 (2013-05-04)
Fixed issue #3 (didn't
return to previous branch).
v0.2.1 (2013-03-18)
Fixed problem: check-bundler.rb has not been installed when installing via
PyPI (problems with setup.py).
v0.2 (2013-03-18)
Incorporated aanand/git-up#41: Support for bundle install --local and
rbenv rehash.
Fixed issue #1 (strange
output buffering when having multiple remotes to fetch from).
请发表评论