diff options
author | Adeodato Simó <dato@net.com.org.es> | 2008-06-13 23:23:21 +0200 |
---|---|---|
committer | Guido Guenther <agx@sigxcpu.org> | 2008-06-24 18:43:16 +0200 |
commit | f1ca0440080ceb484c44fa265c340b13699f6458 (patch) | |
tree | a450b012a35fe84a1d09433cce7ae86156e63033 /gbp | |
parent | 9bbd5d21b6f9ea655e8fcdec7d4ab2c363760117 (diff) |
command_wrappers.py: add a GitMerge wrapper class.
Diffstat (limited to 'gbp')
-rw-r--r-- | gbp/command_wrappers.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py index 1e4c944..0fa3374 100644 --- a/gbp/command_wrappers.py +++ b/gbp/command_wrappers.py @@ -204,6 +204,14 @@ class GitPull(GitCommand): self.run_error = 'Couldn\'t pull "%s" to "%s"' % (branch, repo) +class GitMerge(GitCommand): + """Wrap git merge""" + def __init__(self, branch, verbose=False): + verbose = [ ['--no-summary'], [] ][verbose] + GitCommand.__init__(self, 'merge', [branch] + verbose) + self.run_error = 'Couldn\'t merge from "%s"' % (branch,) + + class GitTag(GitCommand): """Wrap git tag""" def __init__(self, sign_tag=False, keyid=None): |