From 4565ce2f237445b2bd5689cf532f8b77ba64c36d Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Mon, 15 Jun 2015 00:07:56 -0700 Subject: [PATCH] git-cola v2.2 Signed-off-by: David Aguilar --- cola/_version.py | 2 +- share/doc/git-cola/relnotes.rst | 1 + share/doc/git-cola/relnotes/unreleased.rst | 87 +++++----------------- .../git-cola/relnotes/{unreleased.rst => v2.2.rst} | 43 +++++------ 4 files changed, 40 insertions(+), 93 deletions(-) rewrite share/doc/git-cola/relnotes/unreleased.rst (90%) copy share/doc/git-cola/relnotes/{unreleased.rst => v2.2.rst} (88%) diff --git a/cola/_version.py b/cola/_version.py index 5dcd76bf..c225ad2e 100644 --- a/cola/_version.py +++ b/cola/_version.py @@ -1,2 +1,2 @@ # The current git-cola version -VERSION = '2.1.2' +VERSION = '2.2' diff --git a/share/doc/git-cola/relnotes.rst b/share/doc/git-cola/relnotes.rst index ce472f4b..d3f0be79 100644 --- a/share/doc/git-cola/relnotes.rst +++ b/share/doc/git-cola/relnotes.rst @@ -6,6 +6,7 @@ Releases :titlesonly: relnotes/unreleased + relnotes/v2.2 relnotes/v2.1.2 relnotes/v2.1.1 relnotes/v2.1.0 diff --git a/share/doc/git-cola/relnotes/unreleased.rst b/share/doc/git-cola/relnotes/unreleased.rst dissimilarity index 90% index e2596e5c..a021574a 100644 --- a/share/doc/git-cola/relnotes/unreleased.rst +++ b/share/doc/git-cola/relnotes/unreleased.rst @@ -1,69 +1,18 @@ -.. _unreleased: - -Latest Release -============== - -:ref:`v2.1.2 ` is the latest stable release. - -Unreleased Topics -================= - -* The stash viewer now uses ``git show --no-ext-diff`` to avoid running - user-configured diff tools. - -* Double-click will now choose a commit in the "Select commit" dialog. - -* `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the - commit message when a merge is in-progress. Upon refresh, `git cola` will - now detect when a merge has completed and reset the commit message back to - its previous state. It is only reset if the editor contains a message - that was read from the file and has not been manually edited by the user. - -* The commit message editor's context menu now has a "Clear..." action for - clearing the message across both the summary and description fields. - -* `git cola` now uses the `setsid()` system call to ensure that the - `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing - changes using `git`. The askpass helpers will now be used even when - `git cola` is launched from a terminal. - - The behavior without `setsid()` is that `git cola` can appear to hang while - pushing changes. The hang happens when `git` prompts the user for a - password using the terminal, but the user never sees the prompt. `setsid()` - detaches the terminal, which ensures that the askpass helpers are used. - - https://github.com/git-cola/git-cola/issues/218 - - https://github.com/git-cola/git-cola/issues/262 - - https://github.com/git-cola/git-cola/issues/377 - -* `git dag`'s file list tool was updated to properly handle unicode paths. - -* `gnome-terminal` is no longer used by default when `cola.terminal` is unset. - It is broken, as was detailed in #456. - - https://github.com/git-cola/git-cola/issues/456 - -* Traditional Chinese (Taiwan) translation updates. - -* The interactive rebase feature was not always setting `$GIT_EDITOR` - to the value of `gui.editor`, thus there could be instances where rebase - will seem to not stop, or hang, when performing "reword" actions. - - We now set the `$GIT_EDITOR` environment variable when performing the - "Continue", "Skip", and "Edit Todo" rebase actions so that the correct - editor is used during the rebase. - - https://github.com/git-cola/git-cola/issues/445 - -* The system theme's icons are now used whereever possible. - - https://github.com/git-cola/git-cola/pull/458 - -Development version -=================== - -Clone the git-cola repo to get the latest development version: - -``git clone git://github.com/git-cola/git-cola.git`` +.. _unreleased: + +Latest Release +============== + +:ref:`v2.2 ` is the latest stable release. + +Unreleased Topics +================= + +* Coming soon... + +Development version +=================== + +Clone the git-cola repo to get the latest development version: + +``git clone git://github.com/git-cola/git-cola.git`` diff --git a/share/doc/git-cola/relnotes/unreleased.rst b/share/doc/git-cola/relnotes/v2.2.rst similarity index 88% copy from share/doc/git-cola/relnotes/unreleased.rst copy to share/doc/git-cola/relnotes/v2.2.rst index e2596e5c..85335439 100644 --- a/share/doc/git-cola/relnotes/unreleased.rst +++ b/share/doc/git-cola/relnotes/v2.2.rst @@ -1,16 +1,10 @@ -.. _unreleased: +.. _v2.2: -Latest Release -============== - -:ref:`v2.1.2 ` is the latest stable release. - -Unreleased Topics -================= - -* The stash viewer now uses ``git show --no-ext-diff`` to avoid running - user-configured diff tools. +git-cola v2.2 +============= +Usability, bells and whistles +----------------------------- * Double-click will now choose a commit in the "Select commit" dialog. * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the @@ -22,6 +16,17 @@ Unreleased Topics * The commit message editor's context menu now has a "Clear..." action for clearing the message across both the summary and description fields. +* Traditional Chinese (Taiwan) translation updates. + +* The system theme's icons are now used whereever possible. + + https://github.com/git-cola/git-cola/pull/458 + +Fixes +----- +* The stash viewer now uses ``git show --no-ext-diff`` to avoid running + user-configured diff tools. + * `git cola` now uses the `setsid()` system call to ensure that the `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing changes using `git`. The askpass helpers will now be used even when @@ -45,8 +50,6 @@ Unreleased Topics https://github.com/git-cola/git-cola/issues/456 -* Traditional Chinese (Taiwan) translation updates. - * The interactive rebase feature was not always setting `$GIT_EDITOR` to the value of `gui.editor`, thus there could be instances where rebase will seem to not stop, or hang, when performing "reword" actions. @@ -57,13 +60,7 @@ Unreleased Topics https://github.com/git-cola/git-cola/issues/445 -* The system theme's icons are now used whereever possible. - - https://github.com/git-cola/git-cola/pull/458 - -Development version -=================== - -Clone the git-cola repo to get the latest development version: - -``git clone git://github.com/git-cola/git-cola.git`` +Packaging +--------- +* `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y" + version number. Most of our releases tend to contain new features. -- 2.11.4.GIT