Git-cola

====

Usability, bells and whistles
-----------------------------
* The "Browser" widget learned to rename files using "git mv".
(`239 <https://github.com/git-cola/git-cola/issues/239>`_)

* The "Diff" widget learned to diff images. Side-by-side and pixel diff
modes allow you to inspect changes to common images formats.
(`444 <https://github.com/git-cola/git-cola/issues/444>`_)
(`803 <https://github.com/git-cola/git-cola/pull/803>`_)

* Git LFS and Git Annex are natively supported by the image diff viewer.

* Git Annex operations are now included. `git annex init` can be performed on
repositories, and `git annex add` can be run on untracked files from the
status widget. Install `git-annex` to activate this feature.

* Git LFS operations are now included. `git lfs install` can be performed on
repositories, and `git lfs track` can be run on untracked files from the
status widget. Install `git-lfs` to activate this feature.

* The "Stash" tool learned to stash staged changes only. Select the
"Stage Index" option and only staged changes will be stashed away.
(`413 <https://github.com/git-cola/git-cola/issues/413>`_)

* The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
shows error messages when things go wrong, and now saves the "Stash Index"
and "Keep Index" options across sessions.

* The Edit menu's "Copy" and "Select All" actions now forward to either the
diff, status, recent, or favorites widgets, based on which widget has focus.

* The "File" and "Edit" menu can now be activated using `Alt + {F,E}` hotkeys.
(`759 <https://github.com/git-cola/git-cola/issues/759>`_)

* It was easy to accidentally trigger the first action in the `Status` tool's
context menu when using a quick right-click to bring up the menu.
A short sub-second delay was added to ensure that the top-most action is not
triggered unless enough time has passed. This prevents accidental
activation of the first item (typically "Stage" or "Unstage") without
burdening common use cases.
(`755 <https://github.com/git-cola/git-cola/pull/755>`_)
(`643 <https://github.com/git-cola/git-cola/issues/643>`_)

* The "Ctrl+S" hotkey now works for the header items in the Status tool.
Selected the "Modified" header item and activating the "Stage" hotkey,
for example, will stage all modified files. This works for the "Staged",
"Modified", and "Untracked" headers. This is not enabled for the
"Unmerged" header by design.
(`772 <https://github.com/git-cola/git-cola/issues/772>`_)

* The list of "Recent" repositories previously capped the number of
repositories shown to 8 repositories. This can be set to a higher
value by setting the `cola.maxrecent` configuration variable.
(`752 <https://github.com/git-cola/git-cola/issues/752>`_)

* The "Create Branch" dialog now prevents invalid branch names.
(`765 <https://github.com/git-cola/git-cola/issues/765>`_)

* Updated Turkish translation.
(`756 <https://github.com/git-cola/git-cola/pull/756>`_)

* Updated Ukrainian translation.
(`753 <https://github.com/git-cola/git-cola/pull/753>`_)

* Updated German translation.
(`802 <https://github.com/git-cola/git-cola/pull/802>`_)

* Updated Czech translation
(`792 <https://github.com/git-cola/git-cola/pull/792>`_)
(`806 <https://github.com/git-cola/git-cola/pull/806>`_)

* The window title can be configured to not display the absolute path of the
repository.
(`775 <https://github.com/git-cola/git-cola/issues/775>`_)

* The "Edit Remotes" editor learned to edit remote URLS.

* Bare repositories can now be created by selecting the
"New Bare Repository..." action from the `File` menu.

* The "Branches" widget learned to configure upstream branches.

* A new `git cola clone` sub-command was added for cloning repositories.

Packaging
---------
* The vendored `qtpy` library was updated to `v1.3.1`.

* The macOS installation was made simpler for better compatibility with
Homebrew.
(`636 <https://github.com/git-cola/git-cola/issues/636>`_)

* The Windows installer is now much simpler. Git Cola now bundles
Python and PyQt5, so users need only install the "Git for Windows"
and "Git Cola" installers to get things working.

Fixes
-----
* Uninitialized difftool errors will now be displayed graphically.
They were previously going to the shell.
(`457 <https://github.com/git-cola/git-cola/issues/457>`_)

* Translations marked "fuzzy" will no longer be used when translating strings.
(`782 <https://github.com/git-cola/git-cola/issues/782>`_)

* Deleted unmerged files will now correctly use a deleted icon.
(`479 <https://github.com/git-cola/git-cola/issues/479>`_)

* The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
(`767 <https://github.com/git-cola/git-cola/issues/767>`_)

* The "Create Tag" dialog did not correctly handle the case when a signed
tag is requested, but no message is provided, and the user chooses to
create a non-annotated tag instead. This convenience fallback will now
properly create an unsigned, non-annotated tag.
(`696 <https://github.com/git-cola/git-cola/issues/696>`_)

* `.gitconfig` and `.git/config` values editable by the Preferences dialog
(aka `git cola config`) will now get unset when set to an empty value.
For example, setting a different `user.email` in the current repository,
followed by a subsequent emptying of that field, would previously result in
an empty string getting stored in the config. This has been fixed so that
the value will now get unset in the config instead.
(`406 <https://github.com/git-cola/git-cola/issues/406>`_)

* Spelling and typo fixes.
(`748 <https://github.com/git-cola/git-cola/pull/748>`_)

* `core.commentChar` is now honored when set in the local repository
`.git/config`.
(`766 <https://github.com/git-cola/git-cola/issues/766>`_)

* The log window was using a format string that did not display
correctly in all locales. A locale-aware format is now used.
(`800 <https://github.com/git-cola/git-cola/pull/800>`_)

* The dialog displayed when prompting for a reference could sometimes
lose focus.
(`804 <https://github.com/git-cola/git-cola/pull/804>`_)

====

Usability, bells and whistles
-----------------------------
* Updated Simplified Chinese translation.
(`726 <https://github.com/git-cola/git-cola/pull/726>`_)

* Updated Ukrainian translation.
(`723 <https://github.com/git-cola/git-cola/pull/723>`_)

* New Czech translation.
(`736 <https://github.com/git-cola/git-cola/pull/736>`_)
(`737 <https://github.com/git-cola/git-cola/pull/737>`_)
(`740 <https://github.com/git-cola/git-cola/pull/740>`_)
(`743 <https://github.com/git-cola/git-cola/pull/743>`_)

* The "name" field in the "Create Tag" dialog now includes autocompletion,
which makes it easy to see which tags currently exist.

* `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
menu item to add a toolbar.

* Setting `cola.expandtab` to `true` will now expand tabs into spaces
in the commit message editor. The number of spaces to insert is determined
by consulting `cola.tabwidth`, which defaults to `8`.

* The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
ability to copy text from the DAG window.
(`705 <https://github.com/git-cola/git-cola/pull/705>`_)

* The "Prepare Commit Message" action can now be invoked via the
`Ctrl+Shift+Return` shortcut.
(`707 <https://github.com/git-cola/git-cola/pull/707>`_)

* The `Branches` pane now has a filter field that highlights branches whose
names match the string entered into its text field.
(`713 <https://github.com/git-cola/git-cola/pull/713>`_)

* Actions that are triggered in response to button presses were being
triggered when the button was pressed, rather than when it was released,
which was a usability flaw. All buttons now respond when clicked
rather than when pressed.
(`715 <https://github.com/git-cola/git-cola/pull/715>`_)

* The DAG window will now only refresh when object IDs change.
Previously, the DAG would redraw itself in response to inotify events,
such as filesystem operations, which was disruptive when inspecting a large
diff in its diff viewer. The DAG will now only redraw when the object IDs
corresponding to its query input changes. Furthermore, when redrawing, the
scrollbar positions are retained to minimize disruption to the viewport
contents.
(`620 <https://github.com/git-cola/git-cola/issues/620>`_)
(`724 <https://github.com/git-cola/git-cola/issues/724>`_)

* The "About" dialog now includes the SHA-1 where Git Cola was built.
(`530 <https://github.com/git-cola/git-cola/issues/530>`_)

* The "Status" widget now has "Copy Leading Path to Clipboard" and
"Copy Basename to Clipboard" actions.
(`435 <https://github.com/git-cola/git-cola/issues/435>`_)
(`436 <https://github.com/git-cola/git-cola/issues/436>`_)

* The "Status" widget now supports custom "Copy xxx to Clipboard" actions.
(`437 <https://github.com/git-cola/git-cola/issues/437>`_)

* The main menu now has an "Edit" menu.
(`725 <https://github.com/git-cola/git-cola/issues/725>`_)

* `git dag` learned to checkout commits into a detached HEAD state.
(`698 <https://github.com/git-cola/git-cola/issues/698>`_)

* The `status` widget's context menus now omit actions selection-dependent
actions when no file is selected.
(`731 <https://github.com/git-cola/git-cola/pull/731>`_)

* The startup dialog now focuses the repository list so that repositories
can be selected with the keyboard without mouse intervention.
(`741 <https://github.com/git-cola/git-cola/issues/741>`_)

Fixes
-----
* `git dag` now prevents nodes from overlapping in more situations.
(`689 <https://github.com/git-cola/git-cola/pull/689>`_)

* Adding untracked Git submodule repo directories previously ran
`git add submodule/` but we now call `git add submodule` without
the trailing slash (`/`) to avoid staging files that belong to the
submodule (which is possibly a `git` bug). By working around the
buggy behavior we allow users to recover by issuing the appropriate
`git submodule add` command to properly register the submodule.
(`681 <https://github.com/git-cola/git-cola/pull/681>`_)

* We now avoid `git for-each-ref --sort=version:refname` on versions
of `git` older than `v2.7.0`. Previously we only avoided it for
versions older than `v2.0.0`, which was a mistake.
(`686 <https://github.com/git-cola/git-cola/pull/686>`_)

* The error message displayed when `git` is not installed has been fixed.
(`686 <https://github.com/git-cola/git-cola/pull/686>`_)

* Adding new remotes was silently broken.
(`684 <https://github.com/git-cola/git-cola/issues/684>`_)
(`685 <https://github.com/git-cola/git-cola/pull/685>`_)

* The repo selection dialog had errors during startup when the
`cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
(`690 <https://github.com/git-cola/git-cola/issues/690>`_)

* Restored support for PyQt 4.6 (Centos 6.8)
(`692 <https://github.com/git-cola/git-cola/issues/692>`_)

* Switching repositories now resets the "Amend Mode" and other settings
when switching.
(`710 <https://github.com/git-cola/git-cola/issues/710>`_)

* `git rebase` error messages now displayed when rebasing fails or stops
via the standalone `git cola rebase` front-end.
(`721 <https://github.com/git-cola/git-cola/issues/721>`_)

* `git cola` learned to stage broken symlinks.
(`727 <https://github.com/git-cola/git-cola/issues/727>`_)

* The "View History" feature in the `Browser` tool was fixed, and now
disambiguates between refs and paths.
(`732 <https://github.com/git-cola/git-cola/issues/732>`_)

* The diff editor now has better support for files with CRLF `\r\n`
line endings.
(`730 <https://github.com/git-cola/git-cola/issues/730>`_)

* `cola.inotify` in a repo-local config is now honored
when `git cola` is launched from a desktop entry (`git cola --prompt`).
(`695 <https://github.com/git-cola/git-cola/issues/695>`_)

=====

Usability, bells and whistles
-----------------------------
* New Ukrainian translation.
(`670 <https://github.com/git-cola/git-cola/pull/670>`_)
(`672 <https://github.com/git-cola/git-cola/pull/672>`_)

* New and improved French translations.

* The new `Branches` widget makes it easier to checkout, merge, push,
and pull branches from a single interface.

* `git cola` now includes a dark icon theme. The dark icon theme can be
activated either by setting the `GIT_COLA_ICON_THEME` environment variable
to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
`--icon-theme=dark` on the command line.
(`638 <https://github.com/git-cola/git-cola/pull/638>`_)

* Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.

* The commit message editor now remembers the "Spellcheck" setting
after exiting.
(`645 <https://github.com/git-cola/git-cola/pull/645>`_)

* `git dag` now uses an improved algorithm for laying out the graph,
which avoids collisions under certain graph configurations, and
avoids overlapping tag with commits.
(`648 <https://github.com/git-cola/git-cola/pull/648>`_)
(`651 <https://github.com/git-cola/git-cola/pull/651>`_)
(`654 <https://github.com/git-cola/git-cola/pull/654>`_)
(`656 <https://github.com/git-cola/git-cola/pull/656>`_)
(`659 <https://github.com/git-cola/git-cola/pull/659>`_)

* `git dag` now remembers its column sizes across sessions.
(`674 <https://github.com/git-cola/git-cola/issues/674>`_)

* `Grep` now shows a preview of the selected file's content in a split window
below the grep results.

* `Grep` now includes line numbers in the preview pane's output.

* `Edit Remotes` now remembers its window settings after exiting.

* `Diff` now has an option to display line numbers in the editor.
(`136 <https://github.com/git-cola/git-cola/issues/136>`_)

* `Amend Last Commit` can now be triggered via the `Commit` menu in addition
to the commit message editor's options.
(`640 <https://github.com/git-cola/git-cola/issues/640>`_)

* The `File Browser` tool was made much faster and can now operate on
much larger repositories.
(`499 <https://github.com/git-cola/git-cola/issues/499>`_)

* A new "turbo" mode was added that allows you to opt-out of operations
that can slow `git cola` on large repositories. The turbo mode is
enabled by configuring `git config cola.turbo true`. Turbo mode
disables the background loading of Git commit messages and other
details in the `File Browser` widget.

* A new GitIgnore dialog allows adding custom gitignore patterns.
(`653 <https://github.com/git-cola/git-cola/pull/653>`_)

* The spellchecker in `git cola` can now use an additional dictionary
by configuring `cola.dictionary` to the path to a file containing
a newline-separated list of words.
(`663 <https://github.com/git-cola/git-cola/issues/663>`_)

* The stash, export patches, diff, and gitignore dialogs now remember
their window sizes.

* A new `git cola recent` sub-command was added for finding recently
edited files.

* The `Fetch` dialog now allows pruning remote branches.
(`639 <https://github.com/git-cola/git-cola/issues/639>`_)
(`680 <https://github.com/git-cola/git-cola/pull/680>`_)

Fixes
-----
* `git cola`'s spellchecker now supports the new `dict-common` filesystem
layout, and prefers the `/usr/share/dict/cracklib-small` file over the
`/usr/share/dict/words` provided on older distributions.
This makes the spellchecker compatible with Arch, which does not provide
a `words` symlink like Debian.
(`663 <https://github.com/git-cola/git-cola/issues/663>`_)

* Properly handle the case where an existing file is untracked using
the File Browser.

* Fix a quirk where the "Create Branch" dialog sometimes required clicking
twice on the radio buttons.
(`662 <https://github.com/git-cola/git-cola/pull/662>`_)

* Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
be executed with the press of a single enter key after being shown.
(`661 <https://github.com/git-cola/git-cola/issues/661>`_)

* Committing is now allowed in when resolving a merge results in no
changes. This state was previously prevented by the commit message editor,
which prevented users from resolving merges that result in no changes.
(`679 <https://github.com/git-cola/git-cola/pull/679>`_)

* The filesystem monitor would sometimes emit backtraces when directories
are modified. This has been fixed.
(`bz 1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)

* Absolute paths are now returned when querying for `.git`-relative paths
from within a submodule, which uses `.git`-files.
This fixes launching `git cola` from within a subdirectory of a submodule.
(`675 <https://github.com/git-cola/git-cola/pull/675>`_)

=====

Usability, bells and whistles
-----------------------------
* `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
hook to update the commit message. This hook takes the same parameters
as Git's `prepare-commit-message` hook. The default path to this hook
can be overridden by setting the `cola.prepareCommitMessageHook`
configuration variable.
(`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)

* `git cola diff` (and the corresponding `Diff` menu actions) can now
launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
also added for launching an editor.

Translations
------------
* Traditional Chinese (Taiwan) translation updates.

Fixes
-----
* `git cola` now works when installed in non-ASCII, UTF-8-encoded paths.
(`629 <https://github.com/git-cola/git-cola/issues/629>`_)

* Styling issues that caused black backgrounds in various widgets when using
PyQt5 on Mac OS X have been fixed.
(`624 <https://github.com/git-cola/git-cola/issues/624>`_)

* The "Open Recent" menu action was broken and has been fixed.
(`634 <https://github.com/git-cola/git-cola/issues/634>`_)

* Exiting `git cola` with a maximized main window would hang when reopened
on Linux.
(`641 <https://github.com/git-cola/git-cola/issues/641>`_)

Packaging
---------
* `appdata.xml` files are now provided at
`share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
for use by the Linux software gallery.
(`627 <https://github.com/git-cola/git-cola/pull/627>`_)
(`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)

======

Fixes
-----
* The "Open Recent" menu was updated to new bookmarks format.
(`628 <https://github.com/git-cola/git-cola/issues/628>`_)

====

Usability, bells and whistles
-----------------------------
* New Polish translation thanks to Łukasz Wojniłowicz
(`598 <https://github.com/git-cola/git-cola/pull/598>`_)

* The `Bypass Commit Hooks` feature now disables itself automatically
when a new commit is created. The new behavior turns the option into a
single-use flag, which helps prevent users from accidentally leaving it
active longer than intended.
(`595 <https://github.com/git-cola/git-cola/pull/595>`_)

* `git dag` learned to launch an external diff viewer on selected commits.
The standard `Ctrl+D` shortcut can be used to view diffs.
(`468 <https://github.com/git-cola/git-cola/issues/468>`_)

* `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
(`468 <https://github.com/git-cola/git-cola/issues/468>`_)

* Items in the "Favorites" list can now be renamed, which makes it
easier to differentiate between several checkouts of the same repository.
(`599 <https://github.com/git-cola/git-cola/issues/599>`_)
(`601 <https://github.com/git-cola/git-cola/pull/601>`_)

* The startup screen now includes a logo and `git cola` version information.
(`526 <https://github.com/git-cola/git-cola/issues/526>`_)

* The `About` page was revamped to contain multiple tabs. A new tab was added
that provides details about `git cola`''s dependencies. New tabs were also
added for giving credit to `git cola`'s authors and translators.

* The `About` page can now be accessed via `git cola about`.

* The "Fast-forward only" and "No fast-forward" options supported by
`git pull` are now accessible via `git cola pull`.

* Doing a forced push no longer requires selecting the remote branch.
(`618 <https://github.com/git-cola/git-cola/pull/618>`_)

* `git cola push` now has an option to suppress the prompt that is shown
when pushing would create new remote branches.
(`605 <https://github.com/git-cola/git-cola/issues/605>`_)

* `git dag` now shows commit messages in a more readable color.
(`574 <https://github.com/git-cola/git-cola/issues/574>`_)

* `git cola browse` and the `status` widget learned to launch the OS-specified
default action for a file. When used on directories via `git cola browse`,
or when "Open Parent Directory" is used on files, the OS-specified
file browser will typically be used.

* `git cola browse` and the `status` widget learned to launch terminals.

Fixes
-----
* `git cola browse` was not updating when expanding items.
(`588 <https://github.com/git-cola/git-cola/issues/588>`_)

* Typo fixes in comments, naming, and strings have been applied.
(`593 <https://github.com/git-cola/git-cola/pull/593>`_)

* The inotify and win32 filesystem monitoring no longer refreshes
when updates are made to ignored files.
(`517 <https://github.com/git-cola/git-cola/issues/517>`_)
(`516 <https://github.com/git-cola/git-cola/issues/516>`_)

* The `Refresh` button on the actions panel no longer raises an
exception when using PyQt5.
(`604 <https://github.com/git-cola/git-cola/issues/604>`_)

* Fixed a typo in the inotify back-end that is triggered when files are removed.
(`607 <https://github.com/git-cola/git-cola/issues/607>`_)

* Fixed a typo when recovering from a failed attempt to open a repository.
(`606 <https://github.com/git-cola/git-cola/issues/606>`_)

* `git dag` now properly updates itself when launched from the menu bar.
(`613 <https://github.com/git-cola/git-cola/pull/613>`_)

* If git-cola is invoked on Windows using `start pythonw git-cola`,
a console window will briefly flash on the screen each time
`git cola` invokes `git`. The console window is now suppressed.

* We now avoid some problematic Popen flags on Windows which were
breaking the `git rebase` feature on Windows.

* The `Save` button in `git dag`'s "Grab File..." feature now properly
prompts for a filename when saving files.
(`617 <https://github.com/git-cola/git-cola/pull/617>`_)

Development
-----------
* The `qtpy` symlink in the source tree has been removed to allow for easier
development on Windows.
(`626 <https://github.com/git-cola/git-cola/issues/626>`_)