From 352365711af5e2670d05cd449e05e2b8e1cf48a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kupka?= Date: Thu, 23 Oct 2014 11:19:32 +0200 Subject: [PATCH 1/3] README: Update installation instructions --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index e6dd3c741..edc7cc7a4 100644 --- a/README.rst +++ b/README.rst @@ -43,15 +43,15 @@ of how it works: Installing salsita-gitflow ========================== -You can install ``salsita gitflow``, using:: +You can install ``salsita-gitflow`` using:: - pip install salsita-gitflow + pip install --allow-external rbtools --allow-unverified rbtools salsita-gitflow -Or, if you'd like to use ``easy_install`` instead:: +To upgrade the package to the current version, just add ``-U`` flag to the command:: - easy_install salsita-gitflow + pip install -U --allow-external rbtools --allow-unverified rbtools salsita-gitflow -``salsita-gitflow`` requires Python 2.7. +Please not that ``salsita-gitflow`` requires Python 2.7. Setting it up ------------- From 382edb5b9dc166f4c58e446fd1156fbf9a6f1c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kupka?= Date: Tue, 18 Nov 2014 15:41:27 +0100 Subject: [PATCH 2/3] review.py: Use rbt to submit review requests Some API changes broke the bundled RB client, so this change instead calls rbt directly to perform what is necessary. --- gitflow/exceptions.py | 1 + gitflow/review.py | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gitflow/exceptions.py b/gitflow/exceptions.py index e15808a4e..8c074375b 100644 --- a/gitflow/exceptions.py +++ b/gitflow/exceptions.py @@ -18,6 +18,7 @@ class OperationsError(GitflowError): pass class PrefixNotUniqueError(OperationsError): pass class MergeError(OperationsError): pass class PostReviewError(OperationsError): pass +class SubmitReviewError(OperationsError): pass class StatusError(GitflowError): pass class WorkdirIsDirtyError(StatusError): pass diff --git a/gitflow/review.py b/gitflow/review.py index cc7f90953..0ee09ef6b 100644 --- a/gitflow/review.py +++ b/gitflow/review.py @@ -9,7 +9,7 @@ from gitflow.core import GitFlow from gitflow.exceptions import (GitflowError, MultipleReviewRequestsForBranch, NoSuchBranchError, AncestorNotFound, EmptyDiff, - PostReviewError) + PostReviewError, SubmitReviewError) class ReviewRequestLimitError(GitflowError): def __str__(self): @@ -178,7 +178,19 @@ def submit(self): assert self._status if self._status == 'submitted': return - self._update(status='submitted') + + cmd = ['rbt', 'close', '--close-type', 'submitted', str(self.get_id())] + p = sub.Popen(cmd, stdout=sub.PIPE, stderr=sub.PIPE) + (outdata, errdata) = p.communicate() + + if p.returncode != 0: + print('>>>> rbt error output') + print(errdata) + print('<<<< rbt error output') + print('If the error output is not sufficient, execute') + print('\n $ rbt close --debug --close-type submitted {0}\n'.format(self.get_id())) + print('and see what happens.') + raise SubmitReviewError('Failed to submit review request.') def is_accepted(self): assert self._rid From 2f6eb28f97cbb9c0fdc1d6cbb5935017683ff48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kupka?= Date: Tue, 18 Nov 2014 16:43:44 +0100 Subject: [PATCH 3/3] Bump version to 1.4.9 --- gitflow/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitflow/__init__.py b/gitflow/__init__.py index f5ac7e77e..726e7e298 100644 --- a/gitflow/__init__.py +++ b/gitflow/__init__.py @@ -9,7 +9,7 @@ # Distributed under a BSD-like license. For full terms see the file LICENSE.txt # -VERSION = (1, 4, 8) +VERSION = (1, 4, 9) __version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:]) __author__ = "Ondrej Kupka, Tomas Brambora, Hartmut Goebelm, Vincent Driessen"