summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--git-review-1.24-main.patch48
-rw-r--r--git-review-1.24-man.patch113
-rw-r--r--git-review.conf8
-rw-r--r--git-review.spec16
5 files changed, 6 insertions, 180 deletions
diff --git a/.gitignore b/.gitignore
index 070cb64..646026c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/openstack-ci-git-review-1.18-0-ge20ad53.tar.gz
/git-review-1.22.tar.gz
/git-review-1.24.tar.gz
+/git-review-1.28.0.tar.gz
diff --git a/git-review-1.24-main.patch b/git-review-1.24-main.patch
deleted file mode 100644
index e64ddfb..0000000
--- a/git-review-1.24-main.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-(cherry-picked with corrections)
-
-commit 856ccd958bd4c47158aae574b6211f7da2b57be7
-Author: Cedric Brandily <zzelle@gmail.com>
-Date: Thu Sep 4 14:24:59 2014 +0200
-
- Align git-review and python -m git_review.cmd behaviors
-
- Currently, python -m git_review.cmd wraps git_review.cmd.main call to
- handle correctly unicode in python2 where git-review calls directly
- git_review.cmd.main. This change embeds the wrapper inside main in
- order to align git-review and python -m git_review.cmd behaviors.
-
- Change-Id: I390e2d68b851299c3b07292b89dee8198068e6aa
-
-diff --git a/git_review/cmd.py b/git_review/cmd.py
-index a1c655a..2619989 100755
---- a/git_review/cmd.py
-+++ b/git_review/cmd.py
-@@ -1033,7 +1043,7 @@ def convert_bool(one_or_zero):
- return one_or_zero in ["1", "true", "True"]
-
-
--def main():
-+def _main():
- usage = "git review [OPTIONS] ... [BRANCH]"
-
- import argparse
-@@ -1256,9 +1262,9 @@ def main():
- sys.exit(status)
-
-
--if __name__ == "__main__":
-+def main():
- try:
-- main()
-+ _main()
- except GitReviewException as e:
- # If one does unguarded print(e) here, in certain locales the implicit
- # str(e) blows up with familiar "UnicodeEncodeError ... ordinal not in
-@@ -1269,3 +1277,7 @@ if __name__ == "__main__":
- else:
- print(u.encode('utf-8'))
- sys.exit(e.EXIT_CODE)
-+
-+
-+if __name__ == "__main__":
-+ main()
diff --git a/git-review-1.24-man.patch b/git-review-1.24-man.patch
deleted file mode 100644
index 7bd181b..0000000
--- a/git-review-1.24-man.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- 1/xxx.1 2014-12-03 22:50:21.318837161 -0700
-+++ 2/git-review.1 2014-12-03 22:49:44.698420742 -0700
-@@ -63,7 +63,7 @@
- In that case local branch name will have a \-patch[patchsetNumber] suffix.
- .Pp
- The following options are available:
--.Bl \-tag \-width indent
-+.Bl -tag -width indent
- .It Fl d Ar change , Fl \-download= Ns Ar change
- Download
- .Ar change
-@@ -165,7 +165,7 @@
- This utility can be configured by adding entries to Git configuration.
- .Pp
- The following configuration keys are supported:
--.Bl \-tag
-+.Bl -tag
- .It gitreview.username
- Default username used to access the repository. If not specified
- in the Git configuration, Git remote or
-@@ -175,7 +175,7 @@
- Example entry in the
- .Pa .gitconfig
- file:
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- [gitreview]
- username=\fImygerrituser\fP
- .Ed
-@@ -184,7 +184,7 @@
- be rebased to the newest state of the branch.
- .Pp
- A value of 'true' or 'false' should be specified.
--.Bl \-tag
-+.Bl -tag
- .It false
- Do not rebase changes on submit \- equivalent to setting
- .Fl R
-@@ -208,7 +208,7 @@
- a file at the root of the repository named
- .Pa .gitreview
- and place information about your gerrit installation in it. The format is similar to the Windows .ini file format:
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- [gerrit]
- host=\fIhostname\fP
- port=\fITCP port number of gerrit\fP
-@@ -228,7 +228,7 @@
- not to rebase changes by default (same as the
- .Fl R
- command line option)
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- [gerrit]
- host=review.example.com
- port=29418
-@@ -243,7 +243,7 @@
- Normally, exit status is 0 if executed successfully.
- Exit status 1 indicates general error, sometimes more
- specific error codes are available:
--.Bl \-tag \-width 999
-+.Bl -tag -width 999
- .It 2
- Gerrit
- .Ar commit\-msg
-@@ -289,14 +289,14 @@
- communication with Gerrit or remote Git repository,
- exit status larger than 63 means there was a problem with
- a local repository or a working copy.
--
-+.Pp
- Exit status larger than or equal to 128 means internal
- error in running the "git" command.
- .Pp
- .Sh EXAMPLES
- To fetch a remote change number 3004:
- .Pp
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- $ git\-review \-d 3004
- Downloading refs/changes/04/3004/1 from gerrit into
- review/someone/topic_name
-@@ -311,7 +311,7 @@
- .Pp
- To fetch a remote patchset number 5 from change number 3004:
- .Pp
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- $ git\-review \-d 3004,5
- Downloading refs/changes/04/3004/5 from gerrit into
- review/someone/topic_name\-patch5
-@@ -322,10 +322,10 @@
- .Ed
- .Pp
- To send a change for review and delete local branch afterwards:
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- $ git\-review \-f
- remote: Resolving deltas: 0% (0/8)
--To ssh://username@review.example.com/departement/project.git
-+To ssh://username@review.example.com/department/project.git
- * [new branch] HEAD \-> refs/for/master/topic_name
- Switched to branch 'master'
- Deleted branch 'review/someone/topic_name'
-@@ -344,7 +344,7 @@
- in the branch
- .Cm master
- :
--.Bd \-literal \-offset indent
-+.Bd -literal -offset indent
- [gerrit]
- host=review.example.com
- port=29418
diff --git a/git-review.conf b/git-review.conf
deleted file mode 100644
index 0c60d2b..0000000
--- a/git-review.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-# scheme=
-# hostname=
-# port=
-# project=
-# defaultbranch=
-# defaultremote=
-# defaultrebase=
diff --git a/git-review.spec b/git-review.spec
index b95cfec..6601215 100644
--- a/git-review.spec
+++ b/git-review.spec
@@ -1,15 +1,12 @@
Name: git-review
-Version: 1.24
-Release: 5%{?dist}
+Version: 1.28.0
+Release: 1%{?dist}
Summary: A Git helper for integration with Gerrit
Group: Development/Tools
License: ASL 2.0
URL: https://github.com/openstack-infra/git-review
Source0: http://tarballs.openstack.org/git-review/git-review-%{version}.tar.gz
-Source1: git-review.conf
-Patch1: git-review-1.24-man.patch
-Patch2: git-review-1.24-main.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -27,9 +24,6 @@ requests in the patch management system Gerrit. It replaces the rfc.sh script.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-
%build
%{__python} setup.py build
sed -i 's/\r//' LICENSE
@@ -39,7 +33,6 @@ rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/git-review/
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/git-review/
# We do not save ".gitreview" as dot.gitreview because the man page has it too.
# cp .gitreview #{buildroot}/usr/share/doc/dot.gitreview
@@ -57,13 +50,14 @@ rm -rf %{buildroot}
%{python_sitelib}/git_review/
%{python_sitelib}/git_review-%{version}-*.egg-info/
-%dir %{_sysconfdir}/git-review/
-%config(noreplace) %{_sysconfdir}/git-review/git-review.conf
# License is required in percent-doc according to Packaging:LicensingGuidelines
%doc AUTHORS LICENSE
%doc README.rst
%changelog
+* Thu Apr 02 2020 Dominique Martinet <dominique.martinet@cea.fr> - 1.28.0-1
+ - Update to upstream 1.28.0
+
* Fri Apr 24 2015 Pete Zaitcev <zaitcev@redhat.com> - 1.24-5
- Add runtime requirement for setuptools to provide pkg_resources (#1214040)