mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
gertty: cleanup .patchset file. No function changes intended. (#11726)
This commit is contained in:
OscarL
GitHub
@@ -19,7 +19,7 @@ changes."
|
||||
HOMEPAGE="https://pypi.org/project/gertty/"
|
||||
COPYRIGHT="2022 The TTY Group"
|
||||
LICENSE="Apache v2"
|
||||
REVISION="8"
|
||||
REVISION="9"
|
||||
SOURCE_URI="https://files.pythonhosted.org/packages/source/${portName:0:1}/$portName/$portName-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="1c3593d2e6ce53bd84b27d6ac92df4a86d8923afd18b4f4f8e2c979f8a6277df"
|
||||
PATCHES="gertty-$portVersion.patchset"
|
||||
|
||||
@@ -1,302 +1,22 @@
|
||||
From 8b4b0c4e16c93b3d055a3fa074db03b14edce7b2 Mon Sep 17 00:00:00 2001
|
||||
From 73fb58d48bb12aeb70ec10f7f64ce9adf29198f7 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Tue, 5 Jul 2022 13:30:07 +0200
|
||||
Subject: Put documentation at the right place.
|
||||
|
||||
|
||||
diff --git a/PKG-INFO b/PKG-INFO
|
||||
index be9b976..1892406 100644
|
||||
index be9b976..fc8dffa 100644
|
||||
--- a/PKG-INFO
|
||||
+++ b/PKG-INFO
|
||||
@@ -8,118 +8,118 @@ Author-email: openstack-infra@lists.openstack.org
|
||||
License: UNKNOWN
|
||||
Description: Gertty
|
||||
======
|
||||
-
|
||||
+
|
||||
Gertty is a console-based interface to the Gerrit Code Review system.
|
||||
-
|
||||
+
|
||||
As compared to the web interface, the main advantages are:
|
||||
-
|
||||
+
|
||||
* Workflow -- the interface is designed to support a workflow similar
|
||||
to reading network news or mail. In particular, it is designed to
|
||||
deal with a large number of review requests across a large number
|
||||
of projects.
|
||||
-
|
||||
+
|
||||
* Offline Use -- Gertty syncs information about changes in subscribed
|
||||
projects to a local database and local git repos. All review
|
||||
operations are performed against that database and then synced back
|
||||
to Gerrit.
|
||||
-
|
||||
+
|
||||
* Speed -- user actions modify locally cached content and need not
|
||||
wait for server interaction.
|
||||
-
|
||||
+
|
||||
* Convenience -- because Gertty downloads all changes to local git
|
||||
repos, a single command instructs it to checkout a change into that
|
||||
repo for detailed examination or testing of larger changes.
|
||||
-
|
||||
+
|
||||
Installation
|
||||
------------
|
||||
-
|
||||
+
|
||||
Debian
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is packaged in Debian and is currently available in:
|
||||
-
|
||||
+
|
||||
* unstable
|
||||
* testing
|
||||
* stable
|
||||
-
|
||||
+
|
||||
You can install it with::
|
||||
-
|
||||
+
|
||||
apt-get install gertty
|
||||
-
|
||||
+
|
||||
Fedora
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is packaged starting in Fedora 21. You can install it with::
|
||||
-
|
||||
+
|
||||
dnf install python-gertty
|
||||
-
|
||||
+
|
||||
openSUSE
|
||||
~~~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is packaged for openSUSE 13.1 onwards. You can install it via
|
||||
`1-click install from the Open Build Service <http://software.opensuse.org/package/python-gertty>`_.
|
||||
-
|
||||
+
|
||||
Gentoo
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is available in the main Gentoo repository. You can install it with::
|
||||
-
|
||||
+
|
||||
emerge gertty
|
||||
-
|
||||
+
|
||||
Arch Linux
|
||||
~~~~~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty packages are available in the Arch User Repository packages. You
|
||||
can get the package from::
|
||||
-
|
||||
+
|
||||
https://aur.archlinux.org/packages/python2-gertty/
|
||||
-
|
||||
+
|
||||
Source
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
When installing from source, it is recommended (but not required) to
|
||||
install Gertty in a virtualenv. To set one up::
|
||||
-
|
||||
+
|
||||
virtualenv gertty-env
|
||||
source gertty-env/bin/activate
|
||||
-
|
||||
+
|
||||
To install the latest version from the cheeseshop::
|
||||
-
|
||||
+
|
||||
pip install gertty
|
||||
-
|
||||
+
|
||||
To install from a git checkout::
|
||||
-
|
||||
+
|
||||
pip install .
|
||||
-
|
||||
+
|
||||
Gertty uses a YAML based configuration file that it looks for at
|
||||
``~/.config/gertty/gertty.yaml``. Several sample configuration files
|
||||
@@ -96,7 +96,7 @@ Description: Gertty
|
||||
are included. You can find them in the examples/ directory of the
|
||||
`source distribution
|
||||
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
|
||||
- the share/gertty/examples directory after installation.
|
||||
-
|
||||
+ or the documentation/packages/gertty/examples directory after installation.
|
||||
+
|
||||
|
||||
Select one of the sample config files, copy it to
|
||||
~/.config/gertty/gertty.yaml and edit as necessary. Search for
|
||||
``CHANGEME`` to find parameters that need to be supplied. The sample
|
||||
config files are as follows:
|
||||
-
|
||||
+
|
||||
**minimal-gertty.yaml**
|
||||
Only contains the parameters required for Gertty to actually run.
|
||||
-
|
||||
+
|
||||
**reference-gertty.yaml**
|
||||
An exhaustive list of all supported options with examples.
|
||||
-
|
||||
+
|
||||
**opendev-gertty.yaml**
|
||||
A configuration designed for use with OpenDev's installation of
|
||||
Gerrit.
|
||||
-
|
||||
+
|
||||
**googlesource-gertty.yaml**
|
||||
A configuration designed for use with installations of Gerrit
|
||||
running on googlesource.com.
|
||||
-
|
||||
+
|
||||
You will need your Gerrit password which you can generate or retrieve
|
||||
by navigating to ``Settings``, then ``HTTP Password``.
|
||||
-
|
||||
+
|
||||
Gertty uses local git repositories to perform much of its work. These
|
||||
can be the same git repositories that you use when developing a
|
||||
project. Gertty will not alter the working directory or index unless
|
||||
@@ -127,46 +127,46 @@ Description: Gertty
|
||||
accidentally losing work remain in place). You will need to supply
|
||||
the name of a directory where Gertty will find or clone git
|
||||
repositories for your projects as the ``git-root`` parameter.
|
||||
-
|
||||
+
|
||||
The config file is designed to support multiple Gerrit instances. The
|
||||
first one is used by default, but others can be specified by supplying
|
||||
the name on the command line.
|
||||
-
|
||||
+
|
||||
Usage
|
||||
-----
|
||||
-
|
||||
+
|
||||
After installing Gertty, you should be able to run it by invoking
|
||||
``gertty``. If you installed it in a virtualenv, you can invoke it
|
||||
without activating the virtualenv with ``/path/to/venv/bin/gertty``
|
||||
which you may wish to add to your shell aliases. Use ``gertty
|
||||
--help`` to see a list of command line options available.
|
||||
-
|
||||
+
|
||||
Once Gertty is running, you will need to start by subscribing to some
|
||||
projects. Use 'L' to list all of the projects and then 's' to
|
||||
subscribe to the ones you are interested in. Hit 'L' again to shrink
|
||||
the list to your subscribed projects.
|
||||
-
|
||||
+
|
||||
In general, pressing the F1 key will show help text on any screen, and
|
||||
ESC will take you to the previous screen.
|
||||
-
|
||||
+
|
||||
Gertty works seamlessly offline or online. All of the actions that it
|
||||
performs are first recorded in a local database (in ``~/.gertty.db``
|
||||
by default), and are then transmitted to Gerrit. If Gertty is unable
|
||||
to contact Gerrit for any reason, it will continue to operate against
|
||||
the local database, and once it re-establishes contact, it will
|
||||
process any pending changes.
|
||||
-
|
||||
+
|
||||
The status bar at the top of the screen displays the current number of
|
||||
outstanding tasks that Gertty must perform in order to be fully up to
|
||||
date. Some of these tasks are more complicated than others, and some
|
||||
of them will end up creating new tasks (for instance, one task may be
|
||||
to search for new changes in a project which will then produce 5 new
|
||||
tasks if there are 5 new changes).
|
||||
-
|
||||
+
|
||||
If Gertty is offline, it will so indicate in the status bar. It will
|
||||
retry requests if needed, and will switch between offline and online
|
||||
mode automatically.
|
||||
-
|
||||
+
|
||||
If you review a change while offline with a positive vote, and someone
|
||||
else leaves a negative vote on that change in the same category before
|
||||
Gertty is able to upload your review, Gertty will detect the situation
|
||||
@@ -176,36 +176,36 @@ Description: Gertty
|
||||
`F12` key by default). When viewing a change, the "held" flag may be
|
||||
toggled with the exclamation key (`!`). Once held, a change must be
|
||||
explicitly un-held in this manner for your review to be uploaded.
|
||||
-
|
||||
+
|
||||
If Gertty encounters an error, this will also be indicated in the
|
||||
status bar. You may wish to examine ~/.gertty.log to see what the
|
||||
error was. In many cases, Gertty can continue after encountering an
|
||||
error. The error flag will be cleared when you leave the current
|
||||
screen.
|
||||
-
|
||||
+
|
||||
To select text (e.g., to copy to the clipboard), hold Shift while
|
||||
selecting the text.
|
||||
-
|
||||
+
|
||||
MacOS
|
||||
~~~~~
|
||||
-
|
||||
+
|
||||
The MacOS terminal blocks ctrl+o, which is the default search key combo in
|
||||
Gertty. To fix this, a custom keymap can be used on MacOS which modifies the
|
||||
search key combo. For example::
|
||||
-
|
||||
+
|
||||
keymaps:
|
||||
- name: default # MacOS blocks ctrl+o
|
||||
change-search: 'ctrl s'
|
||||
interactive-search: 'ctrl i'
|
||||
-
|
||||
+
|
||||
Terminal Integration
|
||||
--------------------
|
||||
-
|
||||
+
|
||||
If you use rxvt-unicode, you can add something like the following to
|
||||
``.Xresources`` to make Gerrit URLs that are displayed in your
|
||||
terminal (perhaps in an email or irc client) clickable links that open
|
||||
in Gertty::
|
||||
-
|
||||
+
|
||||
URxvt.perl-ext: default,matcher
|
||||
URxvt.url-launcher: sensible-browser
|
||||
URxvt.keysym.C-Delete: perl:matcher:last
|
||||
@@ -213,22 +213,22 @@ Description: Gertty
|
||||
URxvt.matcher.button: 1
|
||||
URxvt.matcher.pattern.1: https:\/\/review.example.org/(\\#\/c\/)?(\\d+)[\w]*
|
||||
URxvt.matcher.launcher.1: gertty --open $0
|
||||
-
|
||||
+
|
||||
You will want to adjust the pattern to match the review site you are
|
||||
interested in; multiple patterns may be added as needed.
|
||||
-
|
||||
+
|
||||
Contributing
|
||||
------------
|
||||
-
|
||||
+
|
||||
For information on how to contribute to Gertty, please see the
|
||||
contents of the CONTRIBUTING.rst file.
|
||||
-
|
||||
+
|
||||
Bugs
|
||||
----
|
||||
-
|
||||
+
|
||||
Bugs are handled at: https://storyboard.openstack.org/#!/project/ttygroup/gertty
|
||||
-
|
||||
-
|
||||
+
|
||||
+
|
||||
Keywords: gerrit console urwid review
|
||||
Platform: UNKNOWN
|
||||
Classifier: Topic :: Utilities
|
||||
diff --git a/README.rst b/README.rst
|
||||
index 8717fa1..0de1004 100644
|
||||
--- a/README.rst
|
||||
@@ -324,298 +44,18 @@ index f9ba291..2c0c744 100644
|
||||
Select one of the sample config files, copy it to ~/.config/gertty/gertty.yaml
|
||||
and edit as necessary. Search for ``CHANGEME`` to find parameters that need to
|
||||
diff --git a/gertty.egg-info/PKG-INFO b/gertty.egg-info/PKG-INFO
|
||||
index be9b976..560c155 100644
|
||||
index be9b976..4a166d1 100644
|
||||
--- a/gertty.egg-info/PKG-INFO
|
||||
+++ b/gertty.egg-info/PKG-INFO
|
||||
@@ -8,118 +8,118 @@ Author-email: openstack-infra@lists.openstack.org
|
||||
License: UNKNOWN
|
||||
Description: Gertty
|
||||
======
|
||||
-
|
||||
+
|
||||
Gertty is a console-based interface to the Gerrit Code Review system.
|
||||
-
|
||||
+
|
||||
As compared to the web interface, the main advantages are:
|
||||
-
|
||||
+
|
||||
* Workflow -- the interface is designed to support a workflow similar
|
||||
to reading network news or mail. In particular, it is designed to
|
||||
deal with a large number of review requests across a large number
|
||||
of projects.
|
||||
-
|
||||
+
|
||||
* Offline Use -- Gertty syncs information about changes in subscribed
|
||||
projects to a local database and local git repos. All review
|
||||
operations are performed against that database and then synced back
|
||||
to Gerrit.
|
||||
-
|
||||
+
|
||||
* Speed -- user actions modify locally cached content and need not
|
||||
wait for server interaction.
|
||||
-
|
||||
+
|
||||
* Convenience -- because Gertty downloads all changes to local git
|
||||
repos, a single command instructs it to checkout a change into that
|
||||
repo for detailed examination or testing of larger changes.
|
||||
-
|
||||
+
|
||||
Installation
|
||||
------------
|
||||
-
|
||||
+
|
||||
Debian
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is packaged in Debian and is currently available in:
|
||||
-
|
||||
+
|
||||
* unstable
|
||||
* testing
|
||||
* stable
|
||||
-
|
||||
+
|
||||
You can install it with::
|
||||
-
|
||||
+
|
||||
apt-get install gertty
|
||||
-
|
||||
+
|
||||
Fedora
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is packaged starting in Fedora 21. You can install it with::
|
||||
-
|
||||
+
|
||||
dnf install python-gertty
|
||||
-
|
||||
+
|
||||
openSUSE
|
||||
~~~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is packaged for openSUSE 13.1 onwards. You can install it via
|
||||
`1-click install from the Open Build Service <http://software.opensuse.org/package/python-gertty>`_.
|
||||
-
|
||||
+
|
||||
Gentoo
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty is available in the main Gentoo repository. You can install it with::
|
||||
-
|
||||
+
|
||||
emerge gertty
|
||||
-
|
||||
+
|
||||
Arch Linux
|
||||
~~~~~~~~~~
|
||||
-
|
||||
+
|
||||
Gertty packages are available in the Arch User Repository packages. You
|
||||
can get the package from::
|
||||
-
|
||||
+
|
||||
https://aur.archlinux.org/packages/python2-gertty/
|
||||
-
|
||||
+
|
||||
Source
|
||||
~~~~~~
|
||||
-
|
||||
+
|
||||
When installing from source, it is recommended (but not required) to
|
||||
install Gertty in a virtualenv. To set one up::
|
||||
-
|
||||
+
|
||||
virtualenv gertty-env
|
||||
source gertty-env/bin/activate
|
||||
-
|
||||
+
|
||||
To install the latest version from the cheeseshop::
|
||||
-
|
||||
+
|
||||
pip install gertty
|
||||
-
|
||||
+
|
||||
To install from a git checkout::
|
||||
-
|
||||
+
|
||||
pip install .
|
||||
-
|
||||
+
|
||||
Gertty uses a YAML based configuration file that it looks for at
|
||||
``~/.config/gertty/gertty.yaml``. Several sample configuration files
|
||||
@@ -96,7 +96,7 @@ Description: Gertty
|
||||
are included. You can find them in the examples/ directory of the
|
||||
`source distribution
|
||||
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
|
||||
- the share/gertty/examples directory after installation.
|
||||
-
|
||||
+ the documentation/packages/gertty/examples directory after installation.
|
||||
+
|
||||
|
||||
Select one of the sample config files, copy it to
|
||||
~/.config/gertty/gertty.yaml and edit as necessary. Search for
|
||||
``CHANGEME`` to find parameters that need to be supplied. The sample
|
||||
config files are as follows:
|
||||
-
|
||||
+
|
||||
**minimal-gertty.yaml**
|
||||
Only contains the parameters required for Gertty to actually run.
|
||||
-
|
||||
+
|
||||
**reference-gertty.yaml**
|
||||
An exhaustive list of all supported options with examples.
|
||||
-
|
||||
+
|
||||
**opendev-gertty.yaml**
|
||||
A configuration designed for use with OpenDev's installation of
|
||||
Gerrit.
|
||||
-
|
||||
+
|
||||
**googlesource-gertty.yaml**
|
||||
A configuration designed for use with installations of Gerrit
|
||||
running on googlesource.com.
|
||||
-
|
||||
+
|
||||
You will need your Gerrit password which you can generate or retrieve
|
||||
by navigating to ``Settings``, then ``HTTP Password``.
|
||||
-
|
||||
+
|
||||
Gertty uses local git repositories to perform much of its work. These
|
||||
can be the same git repositories that you use when developing a
|
||||
project. Gertty will not alter the working directory or index unless
|
||||
@@ -127,46 +127,46 @@ Description: Gertty
|
||||
accidentally losing work remain in place). You will need to supply
|
||||
the name of a directory where Gertty will find or clone git
|
||||
repositories for your projects as the ``git-root`` parameter.
|
||||
-
|
||||
+
|
||||
The config file is designed to support multiple Gerrit instances. The
|
||||
first one is used by default, but others can be specified by supplying
|
||||
the name on the command line.
|
||||
-
|
||||
+
|
||||
Usage
|
||||
-----
|
||||
-
|
||||
+
|
||||
After installing Gertty, you should be able to run it by invoking
|
||||
``gertty``. If you installed it in a virtualenv, you can invoke it
|
||||
without activating the virtualenv with ``/path/to/venv/bin/gertty``
|
||||
which you may wish to add to your shell aliases. Use ``gertty
|
||||
--help`` to see a list of command line options available.
|
||||
-
|
||||
+
|
||||
Once Gertty is running, you will need to start by subscribing to some
|
||||
projects. Use 'L' to list all of the projects and then 's' to
|
||||
subscribe to the ones you are interested in. Hit 'L' again to shrink
|
||||
the list to your subscribed projects.
|
||||
-
|
||||
+
|
||||
In general, pressing the F1 key will show help text on any screen, and
|
||||
ESC will take you to the previous screen.
|
||||
-
|
||||
+
|
||||
Gertty works seamlessly offline or online. All of the actions that it
|
||||
performs are first recorded in a local database (in ``~/.gertty.db``
|
||||
by default), and are then transmitted to Gerrit. If Gertty is unable
|
||||
to contact Gerrit for any reason, it will continue to operate against
|
||||
the local database, and once it re-establishes contact, it will
|
||||
process any pending changes.
|
||||
-
|
||||
+
|
||||
The status bar at the top of the screen displays the current number of
|
||||
outstanding tasks that Gertty must perform in order to be fully up to
|
||||
date. Some of these tasks are more complicated than others, and some
|
||||
of them will end up creating new tasks (for instance, one task may be
|
||||
to search for new changes in a project which will then produce 5 new
|
||||
tasks if there are 5 new changes).
|
||||
-
|
||||
+
|
||||
If Gertty is offline, it will so indicate in the status bar. It will
|
||||
retry requests if needed, and will switch between offline and online
|
||||
mode automatically.
|
||||
-
|
||||
+
|
||||
If you review a change while offline with a positive vote, and someone
|
||||
else leaves a negative vote on that change in the same category before
|
||||
Gertty is able to upload your review, Gertty will detect the situation
|
||||
@@ -176,36 +176,36 @@ Description: Gertty
|
||||
`F12` key by default). When viewing a change, the "held" flag may be
|
||||
toggled with the exclamation key (`!`). Once held, a change must be
|
||||
explicitly un-held in this manner for your review to be uploaded.
|
||||
-
|
||||
+
|
||||
If Gertty encounters an error, this will also be indicated in the
|
||||
status bar. You may wish to examine ~/.gertty.log to see what the
|
||||
error was. In many cases, Gertty can continue after encountering an
|
||||
error. The error flag will be cleared when you leave the current
|
||||
screen.
|
||||
-
|
||||
+
|
||||
To select text (e.g., to copy to the clipboard), hold Shift while
|
||||
selecting the text.
|
||||
-
|
||||
+
|
||||
MacOS
|
||||
~~~~~
|
||||
-
|
||||
+
|
||||
The MacOS terminal blocks ctrl+o, which is the default search key combo in
|
||||
Gertty. To fix this, a custom keymap can be used on MacOS which modifies the
|
||||
search key combo. For example::
|
||||
-
|
||||
+
|
||||
keymaps:
|
||||
- name: default # MacOS blocks ctrl+o
|
||||
change-search: 'ctrl s'
|
||||
interactive-search: 'ctrl i'
|
||||
-
|
||||
+
|
||||
Terminal Integration
|
||||
--------------------
|
||||
-
|
||||
+
|
||||
If you use rxvt-unicode, you can add something like the following to
|
||||
``.Xresources`` to make Gerrit URLs that are displayed in your
|
||||
terminal (perhaps in an email or irc client) clickable links that open
|
||||
in Gertty::
|
||||
-
|
||||
+
|
||||
URxvt.perl-ext: default,matcher
|
||||
URxvt.url-launcher: sensible-browser
|
||||
URxvt.keysym.C-Delete: perl:matcher:last
|
||||
@@ -213,22 +213,22 @@ Description: Gertty
|
||||
URxvt.matcher.button: 1
|
||||
URxvt.matcher.pattern.1: https:\/\/review.example.org/(\\#\/c\/)?(\\d+)[\w]*
|
||||
URxvt.matcher.launcher.1: gertty --open $0
|
||||
-
|
||||
+
|
||||
You will want to adjust the pattern to match the review site you are
|
||||
interested in; multiple patterns may be added as needed.
|
||||
-
|
||||
+
|
||||
Contributing
|
||||
------------
|
||||
-
|
||||
+
|
||||
For information on how to contribute to Gertty, please see the
|
||||
contents of the CONTRIBUTING.rst file.
|
||||
-
|
||||
+
|
||||
Bugs
|
||||
----
|
||||
-
|
||||
+
|
||||
Bugs are handled at: https://storyboard.openstack.org/#!/project/ttygroup/gertty
|
||||
-
|
||||
-
|
||||
+
|
||||
+
|
||||
Keywords: gerrit console urwid review
|
||||
Platform: UNKNOWN
|
||||
Classifier: Topic :: Utilities
|
||||
diff --git a/gertty/config.py b/gertty/config.py
|
||||
index 4f38d14..1a33a2d 100644
|
||||
--- a/gertty/config.py
|
||||
@@ -671,23 +111,24 @@ index 0879e81..25952d5 100644
|
||||
tag_date = 0
|
||||
|
||||
--
|
||||
2.36.1
|
||||
2.45.2
|
||||
|
||||
|
||||
From 91b5a31f554268173fdcf8cf52aed5d7c62b890e Mon Sep 17 00:00:00 2001
|
||||
From 45ad9375c18779140d34a9f2a2f804e3fb88b8a1 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Tue, 5 Jul 2022 13:47:02 +0200
|
||||
Subject: Fix config file location.
|
||||
|
||||
Co-authored-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
This is a squashed version of the previous commits by
|
||||
Begasus and Pulkomandy.
|
||||
|
||||
diff --git a/PKG-INFO b/PKG-INFO
|
||||
index 1892406..4098449 100644
|
||||
index fc8dffa..0ea6840 100644
|
||||
--- a/PKG-INFO
|
||||
+++ b/PKG-INFO
|
||||
@@ -92,14 +92,14 @@ Description: Gertty
|
||||
pip install .
|
||||
|
||||
|
||||
Gertty uses a YAML based configuration file that it looks for at
|
||||
- ``~/.config/gertty/gertty.yaml``. Several sample configuration files
|
||||
+ ``~/config/settings/gertty.yaml``. Several sample configuration files are included.
|
||||
@@ -695,13 +136,13 @@ index 1892406..4098449 100644
|
||||
`source distribution
|
||||
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
|
||||
or the documentation/packages/gertty/examples directory after installation.
|
||||
|
||||
|
||||
Select one of the sample config files, copy it to
|
||||
- ~/.config/gertty/gertty.yaml and edit as necessary. Search for
|
||||
+ ~/config/settings/gertty.yaml and edit as necessary. Search for
|
||||
``CHANGEME`` to find parameters that need to be supplied. The sample
|
||||
config files are as follows:
|
||||
|
||||
|
||||
diff --git a/README.rst b/README.rst
|
||||
index 0de1004..71c706f 100644
|
||||
--- a/README.rst
|
||||
@@ -794,12 +235,12 @@ index b6f65b7..75ed86b 100644
|
||||
|
||||
# This section lists the servers that Gertty can talk to. Multiple
|
||||
diff --git a/gertty.egg-info/PKG-INFO b/gertty.egg-info/PKG-INFO
|
||||
index 560c155..ad2f072 100644
|
||||
index 4a166d1..8aaca04 100644
|
||||
--- a/gertty.egg-info/PKG-INFO
|
||||
+++ b/gertty.egg-info/PKG-INFO
|
||||
@@ -92,14 +92,14 @@ Description: Gertty
|
||||
pip install .
|
||||
|
||||
|
||||
Gertty uses a YAML based configuration file that it looks for at
|
||||
- ``~/.config/gertty/gertty.yaml``. Several sample configuration files
|
||||
+ ``~/config/settings/gertty.yaml``. Several sample configuration files
|
||||
@@ -807,17 +248,26 @@ index 560c155..ad2f072 100644
|
||||
`source distribution
|
||||
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
|
||||
the documentation/packages/gertty/examples directory after installation.
|
||||
|
||||
|
||||
Select one of the sample config files, copy it to
|
||||
- ~/.config/gertty/gertty.yaml and edit as necessary. Search for
|
||||
+ ~/config/settings/gertty.yaml and edit as necessary. Search for
|
||||
``CHANGEME`` to find parameters that need to be supplied. The sample
|
||||
config files are as follows:
|
||||
|
||||
|
||||
diff --git a/gertty/config.py b/gertty/config.py
|
||||
index 1a33a2d..21348f0 100644
|
||||
index 1a33a2d..b3ce7ba 100644
|
||||
--- a/gertty/config.py
|
||||
+++ b/gertty/config.py
|
||||
@@ -36,7 +36,7 @@ try:
|
||||
except AttributeError:
|
||||
OrderedDict = ordereddict.OrderedDict
|
||||
|
||||
-DEFAULT_CONFIG_PATH = '~/.config/gertty/gertty.yaml'
|
||||
+DEFAULT_CONFIG_PATH = '~/config/settings/gertty.yaml'
|
||||
FALLBACK_CONFIG_PATH = '~/.gertty.yaml'
|
||||
|
||||
class ConfigSchema(object):
|
||||
@@ -282,7 +282,7 @@ class Config(object):
|
||||
|
||||
def printSample(self):
|
||||
@@ -843,35 +293,10 @@ index 25952d5..634ce27 100644
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
--
|
||||
2.36.1
|
||||
2.45.2
|
||||
|
||||
|
||||
From 7c802c6430cf015da4e22f44c8dec0c2cc3e26dd Mon Sep 17 00:00:00 2001
|
||||
From: PulkoMandy <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 15 Jul 2022 18:07:53 +0200
|
||||
Subject: Actually fix the configuation file path
|
||||
|
||||
The previous patch changed everything (messages, documentation) except
|
||||
the actual place where the config file location is defined.
|
||||
|
||||
diff --git a/gertty/config.py b/gertty/config.py
|
||||
index 21348f0..b3ce7ba 100644
|
||||
--- a/gertty/config.py
|
||||
+++ b/gertty/config.py
|
||||
@@ -36,7 +36,7 @@ try:
|
||||
except AttributeError:
|
||||
OrderedDict = ordereddict.OrderedDict
|
||||
|
||||
-DEFAULT_CONFIG_PATH = '~/.config/gertty/gertty.yaml'
|
||||
+DEFAULT_CONFIG_PATH = '~/config/settings/gertty.yaml'
|
||||
FALLBACK_CONFIG_PATH = '~/.gertty.yaml'
|
||||
|
||||
class ConfigSchema(object):
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
||||
From 4c9c92797c5b306e4cffb88e551e16ecf3ea8bb8 Mon Sep 17 00:00:00 2001
|
||||
From 01cfda0ee844d264150161ffa300b6989df0c1cb Mon Sep 17 00:00:00 2001
|
||||
From: PulkoMandy <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 15 Jul 2022 18:08:45 +0200
|
||||
Subject: Backport fix for alembic >= 1.7 from upstream
|
||||
@@ -891,5 +316,5 @@ index 3bb7ddd..7f4388a 100644
|
||||
import sqlalchemy
|
||||
from sqlalchemy import create_engine, MetaData, Table, Column, Integer, String, Boolean, DateTime, Text, UniqueConstraint
|
||||
--
|
||||
2.36.1
|
||||
2.45.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user