From f1ca0440080ceb484c44fa265c340b13699f6458 Mon Sep 17 00:00:00 2001 From: Adeodato Simó Date: Fri, 13 Jun 2008 23:23:21 +0200 Subject: command_wrappers.py: add a GitMerge wrapper class. --- gbp/command_wrappers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py index 1e4c9448..0fa33745 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): -- cgit v1.2.3