diff options
author | Jesse Keating <jkeating@redhat.com> | 2011-02-09 15:39:10 -0700 |
---|---|---|
committer | Jesse Keating <jkeating@redhat.com> | 2011-02-09 15:39:10 -0700 |
commit | 21ca17d3cd79e4f9887a51dff672cc0a47e11ae9 (patch) | |
tree | c7eaac6cbf6e40d522b9162f56c7befa8345ddf5 /src/pyfedpkg/__init__.py | |
parent | f4532e14662066aa0725932b6f861d9413ae76c3 (diff) | |
download | fedora-packager-21ca17d3cd79e4f9887a51dff672cc0a47e11ae9.tar.gz fedora-packager-21ca17d3cd79e4f9887a51dff672cc0a47e11ae9.tar.xz fedora-packager-21ca17d3cd79e4f9887a51dff672cc0a47e11ae9.zip |
Add a --rebase and --no-rebase option to pull
I decided to emulate git here and not default to a rebase.
Diffstat (limited to 'src/pyfedpkg/__init__.py')
-rw-r--r-- | src/pyfedpkg/__init__.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 8696026..dcea285 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -710,12 +710,22 @@ def new(path=None): log.debug('Diffing from tag %s' % tag) return repo.git.diff('-M', tag) -def pull(path=None): - """Pull changes from the main repository using optional path""" +def pull(path=None, rebase=False, norebase=False): + """Pull changes from the main repository using optional path + + Optionally rebase current branch on top of upstream branch + + Optionally override .git setting to always rebase + + """ if not path: path = os.getcwd() cmd = ['git', 'pull'] + if rebase: + cmd.append('--rebase') + if norebase: + cmd.append('--no-rebase') _run_command(cmd, cwd=path) return |