5 * The config reader has been revamped to better read settings when git config
6 files are located in unexpected locations.
7 (`#927 <https://github.com/git-cola/git-cola/issues/927>`_)
8 (`#1264 <https://github.com/git-cola/git-cola/issues/1264>`_)
10 * The preferences dialog no longer throws an error when the editor has not
12 (`#1263 <https://github.com/git-cola/git-cola/issues/1263>`_)
17 * The .po and .pot files now contain location information.
18 (`#880 <https://github.com/git-cola/git-cola/issues/880>`_)
29 Usability, bells and whistles
30 -----------------------------
31 * The Rebase editor (`git-cola-sequence-editor`) now supports multi-select.
32 Use `Shift-{Up,Down}` to select multiple lines and the keyboard hotkeys
33 listed in the `?` dialog to drive the UI.
34 (`#1257 <https://github.com/git-cola/git-cola/pull/1257>`_)
36 * The `$GIT_VISUAL` and `$VISUAL` environment variable are now consulted in addition
37 to `$GIT_EDITOR` and `$EDITOR` when the `gui.editor` configuration is unset.
38 (`#1237 <https://github.com/git-cola/git-cola/pull/1237>`_)
40 * The application window icon is now enabled when running on Wayland.
41 (`#1240 <https://github.com/git-cola/git-cola/pull/1240>`_)
43 * The Status widget now has an "Open Worktree" action.
44 (`#1245 <https://github.com/git-cola/git-cola/pull/1245>`_)
46 * The "Open Using Default Application", "Open Directory",
47 "Open Parent Directory" and "Open Worktree" actions are now available on Windows.
49 * The dialog for opening repositories is now a read-only dialog that omits the
50 ability to create folders and modify the filesystem.
51 (`#1168 <https://github.com/git-cola/git-cola/issues/1168>`_)
53 * A few more `git` calls have been eliminated from the startup sequence.
54 This further improved the startup time for Git Cola.
55 (`#1259 <https://github.com/git-cola/git-cola/pull/1259>`_)
59 * Documentation rendering errors have been fixed.
60 (`#1256 <https://github.com/git-cola/git-cola/pull/1256>`_)
62 * Use of a `~/.config/git-cola/language` file to override the language has been fixed.
63 (`#1246 <https://github.com/git-cola/git-cola/issues/1246>`_)
65 * We no longer write the `cola.spellcheck` configuration value on launch.
66 (`#1238 <https://github.com/git-cola/git-cola/pull/1238>`_)
70 * Updated Spanish translation.
71 (`#1244 <https://github.com/git-cola/git-cola/pull/1244>`_)
73 * Updated Japanese translation.
74 (`#1249 <https://github.com/git-cola/git-cola/pull/1249>`_)
78 * Building documentation offline is supported again.
79 (`#1250 <https://github.com/git-cola/git-cola/issues/1250>`_)
81 * The Appstream Metadata files were missing in the v4.0.0 release are included again.
82 (`#1254 <https://github.com/git-cola/git-cola/pull/1254>`_)
83 (`#1253 <https://github.com/git-cola/git-cola/issues/1253>`_)
91 Usability, bells and whistles
92 -----------------------------
93 * Double-clicking dock widgets no longer creates sub-windows when the layout is locked.
94 (`#1176 <https://github.com/git-cola/git-cola/issues/1176>`_)
95 (`#1198 <https://github.com/git-cola/git-cola/pull/1198>`_)
99 * We now guard against `locale.getdefaultlocale()` returning `None` in some
100 configurations, notably on macOS if none of 'LC_ALL', 'LC_CTYPE', 'LANG' or 'LANGUAGE'
102 (`#1234 <https://github.com/git-cola/git-cola/issues/1234>`_)
104 * The preferences dialog has been fixed to properly handle booleans.
105 (`#1235 <https://github.com/git-cola/git-cola/issues/1235>`_)
107 * The `docs/` directory was restructured to avoid missing `setup.py` errors.
108 `share/doc/git-cola` is now a symlink pointing to `docs/`.
109 (`#1230 <https://github.com/git-cola/git-cola/issues/1230>`_)
111 * Message boxes could sometimes display off-screen or using geometry that is larger
112 than the current desktop. Message box sizes are now clamped to the desktop size.
113 (`#1228 <https://github.com/git-cola/git-cola/issues/1228>`_)
123 These changes are primarily breaking changes for packagers of Git Cola.
124 For example, Linux distribution and Homebrew package maintainers may need to
125 be aware of these changes.
127 Changes have been made build infrastructure and the resulting filesystem artifacts.
129 * The build system is now Python3-only and has been modernized for PEP-517/518.
130 While Git Cola still builds and runs under Python2, it is no longer officially
131 supported and may stop working in a future release without notice.
132 (`#1201 <https://github.com/git-cola/git-cola/issues/1201>`_)
134 * The `#!/usr/bin/env python` shebang lines in the `git-cola` and `git-dag` wrapper
135 scripts have been updated to use `python3`.
136 (`#1204 <https://github.com/git-cola/git-cola/pull/1204>`_)
138 * The build system was switched to `setuptools` and no longer depends on `distutils`.
139 ``python setup.py {build,install,build_pot,build_mo}`` are no longer provided.
140 Use the https://pypa-build.readthedocs.io/en/stable/installation.html
141 ``python -m build`` tool to generate sdist and wheel distributions,
142 and ``pip install .`` to install Git Cola from source.
143 (`#1204 <https://github.com/git-cola/git-cola/pull/1204>`_)
145 * The `git-cola`, `git-dag` and `git-cola-sequence-editor` commands are now installed
146 using setuptools entry points.
148 * The `bin/` wrapper scripts in the source tree continue to be provided for convenience
149 but they are not the scripts that get installed.
151 * The `qtpy` Python package is no longer installed alongside the `cola` Python package.
153 * The `cola` package is now installed into the standard Python site-packages location.
155 * The `share/git-cola/lib` private Python modules directory no longer exists.
157 * The `NO_VENDOR_LIBS` and `NO_PRIVATE_LIBS` Makefile options are no longer necessary.
159 * The `share/git-cola` filesystem namespace no longer exists. All of cola's package data
160 is distributed alongside the `cola` module as package data.
162 * Building the Sphinx documentation now also requires the `jaraco.packaging` and
163 `rst.linker` packages. See `requirements/requirements-dev.txt` for the package
166 Usability, bells and whistles
167 -----------------------------
169 <https://git-cola.readthedocs.io/en/latest/git-cola.html#custom-themes>`_
170 can be used by adding `*.qss` Qt stylesheet files to `~/.config/git-cola/themes/`.
171 (`#1222 <https://github.com/git-cola/git-cola/pull/1222>`_)
172 (`#1226 <https://github.com/git-cola/git-cola/pull/1226>`_)
174 * Git Cola now keeps track of child Browser windows and will close all of them when
175 the main window is closed.
176 (`#1200 <https://github.com/git-cola/git-cola/pull/1200>`_)
180 * Staging conflicted binary files has been fixed to avoid Unicode decoding errors.
181 (`#1189 <https://github.com/git-cola/git-cola/issues/1189>`_)
183 * Ensure that secure permissions are used when creating temporary files.
184 (`#1209 <https://github.com/git-cola/git-cola/pull/1209>`_)
186 * The line numbering in the diff viewer was corrected when displaying merge diffs.
187 (`#1208 <https://github.com/git-cola/git-cola/pull/1208>`_)
189 * Documentation typofixes.
190 (`#1193 <https://github.com/git-cola/git-cola/pull/1193>`_)
192 * Git Cola was revamped to use Qt signals and slots for all of its notifications.
193 This made its notification system more robust.
194 (`#1202 <https://github.com/git-cola/git-cola/pull/1202>`_)
195 (`#1203 <https://github.com/git-cola/git-cola/pull/1203>`_)
196 (`#1205 <https://github.com/git-cola/git-cola/pull/1205>`_)
197 (`#1206 <https://github.com/git-cola/git-cola/pull/1206>`_)
201 * `vcruntime140.dll` and `msvcp140.dll` are now included in the Windows installation.
202 (`#1207 <https://github.com/git-cola/git-cola/pull/1207>`_)
210 Usability, bells and whistles
211 -----------------------------
212 * The git config guitool action can now be grouped under user-defined menus.
213 This is done by using slash (``/``) delimiters in the action name.
214 Entries before the final slash are treated like submenus inside the
215 top-level ``Actions`` menu.
216 (`#1150 <https://github.com/git-cola/git-cola/issues/1150>`_)
218 * Toolbars now have a full set of icons. The icons follow the system theme
219 and can be configured to display text, just icons, or text and icons.
220 (`#1177 <https://github.com/git-cola/git-cola/pull/1177>`_)
222 * The startup dialog will now open the selected repository when the "enter"
224 (`#1162 <https://github.com/git-cola/git-cola/issues/1162>`_)
226 * ``Shift+S`` will stage selected lines (in addition to ``s``).
227 (`#1187 <https://github.com/git-cola/git-cola/issues/1187>`_)
231 * The vendored qtpy library was patched to retain Python2 compatibility.
233 * The "Unstage" toolbar action was fixed.
234 (`#1178 <https://github.com/git-cola/git-cola/issues/1178>`_)
236 * We now avoid `setWidth(float)` for compatibility with newer Qt versions.
237 (`#1183 <https://github.com/git-cola/git-cola/pull/1183>`_)
239 * Documentation typofixes.
240 (`#1185 <https://github.com/git-cola/git-cola/pull/1185>`_)
244 * Updated Polish translation.
245 (`#1184 <https://github.com/git-cola/git-cola/pull/1184>`_)
249 * Git Cola now uses Github Actions for running its continuous integration tests.
250 (`#1179 <https://github.com/git-cola/git-cola/pull/1179>`_)
258 Usability, bells and whistles
259 -----------------------------
260 * The Status tool was improved to better retain selected files when
261 the state changes and the display is refreshed.
262 (`#1130 <https://github.com/git-cola/git-cola/issues/1130>`_)
263 (`#1131 <https://github.com/git-cola/git-cola/pull/1131>`_)
265 * The Diff editor can now stage selected lines for untracked files.
266 Git Cola will detect when a file is untracked and will allow you to
267 partially stage it, just like existing tracked files.
268 (`#1146 <https://github.com/git-cola/git-cola/pull/1146>`_)
269 (`#1084 <https://github.com/git-cola/git-cola/issues/1084>`_)
271 * Diffing of staged files has been implemented for repositories that contain
273 (`#1149 <https://github.com/git-cola/git-cola/pull/1149>`_)
274 (`#1110 <https://github.com/git-cola/git-cola/issues/1110>`_)
276 * Documentation improvements and typofixes.
277 (`#1163 <https://github.com/git-cola/git-cola/pull/1163>`_)
278 (`#1164 <https://github.com/git-cola/git-cola/pull/1164>`_)
282 * The `FIPS security mode
283 <https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/FIPS_Mode_-_an_explanation>`_
284 is now supported by Git Cola when running on FIPS-enabled Python
285 (Python 3.9+ or centos8/rhel8's patched Python 3.6).
286 (`#1157 <https://github.com/git-cola/git-cola/issues/1157>`_)
290 * The `argparse` usage was adjusted to remain compatible with older Pythons.
291 (`#1155 <https://github.com/git-cola/git-cola/issues/1155>`_)
293 * The window restoration logic was fixed to properly save/restore settings
294 when different languages are used.
295 (`#1071 <https://github.com/git-cola/git-cola/issues/1071>`_)
296 (`#1161 <https://github.com/git-cola/git-cola/issues/1161>`_)
297 (`#382 <https://github.com/git-cola/git-cola/issues/382>`_)
299 * `git dag` no longer passes floats to `QPen::setWidth()` for better compatibility.
300 (`bz #2014950 <https://bugzilla.redhat.com/show_bug.cgi?id=2014950>`_)
304 * The Windows installer was slimmed down by removing unused Qt DLLs.
305 (`#1152 <https://github.com/git-cola/git-cola/pull/1152>`_)
315 * Patch release to fix a typo in the Interactive Rebase feature.
322 Usability, bells and whistles
323 -----------------------------
324 * The git config reader now supports the `include.path` directive
325 for including config files.
326 (`#1136 <https://github.com/git-cola/git-cola/issues/1136>`_)
327 (`#1137 <https://github.com/git-cola/git-cola/pull/1137>`_)
329 * The dialog for selecting commits now support filtering.
330 (`#1121 <https://github.com/git-cola/git-cola/pull/1121>`_)
332 * The diff editor now wraps long lines by default. The diff options
333 menu can be used to enable/disable line wrapping.
334 (`#1123 <https://github.com/git-cola/git-cola/pull/1123>`_)
336 * Git Cola now honors `core.hooksPath` for configuring custom Git hooks,
337 which was introduced in Git v2.9.
338 (`#1118 <https://github.com/git-cola/git-cola/issues/1118>`_)
340 * A new `Ctrl + Shift + S` hotkey was added for staging/unstaging all
341 files, both modified and untracked.
343 * The `Status` tool now supports `Ctrl + A` for selecting all files and
344 it behaves more predictably when performing operations when multiple
345 categories of files are selected (eg. when both modified and untracked
346 header items are selected).
347 (`#1117 <https://github.com/git-cola/git-cola/issues/1117>`_)
351 * Updated Hungarian translation.
352 (`#1135 <https://github.com/git-cola/git-cola/pull/1135>`_)
356 * The "Interactive Rebase" feature was updated to work with Windows.
358 * `make install-man` was updated to support Sphinx 4.0.
359 (`#1141 <https://github.com/git-cola/git-cola/issues/1141>`_)
361 * `git cola --help-commands` was updated for newer versions of argparse.
362 (`#1133 <https://github.com/git-cola/git-cola/issues/1133>`_)
366 * Git Cola can now be started as a Python module.
367 (`#1119 <https://github.com/git-cola/git-cola/pull/1119>`_)
375 Usability, bells and whistles
376 -----------------------------
377 * The startup dialog now detects when Recent and Favorite repositories no
378 longer exist on disk, and offers to remove these entries when selected.
379 (`#1089 <https://github.com/git-cola/git-cola/pull/1089>`_)
381 * The startup dialog now includes a simpler and more condensed folder view
382 that can be used for selecting Favorites and Recent repositories.
383 (`#1086 <https://github.com/git-cola/git-cola/pull/1086>`_)
385 * The "Commit" menu now includes an "Undo Last Commit" action.
386 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
388 * The "Reset" menu was revamped to expose all of Git's reset modes alongside a
389 new "Restore Worktree" action that updates the worktree using "git read-tree".
390 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
394 * Updated Polish translation.
395 (`#1107 <https://github.com/git-cola/git-cola/pull/1107>`_)
397 * Updated Japanese translation.
398 (`#1098 <https://github.com/git-cola/git-cola/pull/1098>`_)
400 * Updated Brazilian translation.
401 (`#1091 <https://github.com/git-cola/git-cola/pull/1091>`_)
405 * The ``--use-env-python`` option for ``setup.py`` is now Python3 compatible.
406 (`#1102 <https://github.com/git-cola/git-cola/issues/1102>`_)
414 Usability, bells and whistles
415 -----------------------------
416 * The submodules widget can now be used to add submodules.
417 Submodules are now updated recursively.
418 (`#534 <https://github.com/git-cola/git-cola/issues/534>`_)
420 * The image diff viewer can now be toggled between text and image modes.
421 This is helpful when, for example, diffing .svg files where it can be useful
422 to see diffs in both an image and text representation.
423 (`#859 <https://github.com/git-cola/git-cola/issues/859>`_)
424 (`#1035 <https://github.com/git-cola/git-cola/pull/1035>`_)
426 * The default `ssh-askpass` username + password dialog included with Git Cola
427 can now toggle between showing and masking the password input field.
428 (`#1069 <https://github.com/git-cola/git-cola/pull/1069>`_)
432 * Updated Polish translation.
433 (`#1076 <https://github.com/git-cola/git-cola/pull/1076>`_)
435 * Updated Hungarian translation.
436 (`#1067 <https://github.com/git-cola/git-cola/pull/1067>`_)
440 * The `share/appdata` AppStream data was renamed to `share/metainfo`
441 in accordance with `AppStream standard changes from 2016
442 <https://github.com/ximion/appstream/blob/master/NEWS#L1363>`_.
443 (`#1079 <https://github.com/git-cola/git-cola/pull/1079>`_)
445 * The ``cola`` modules are now installed into the Python ``site-packages``
446 directory by default. This allows distributions to package ``git-cola`` for
447 multiple versions of Python. See the PACKAGING NOTES section in the README
448 for details about suppressing the installation of the private
449 ``share/git-cola/lib/cola`` modules when building cola.
450 (`#181 <https://github.com/git-cola/git-cola/issues/181>`_)
452 * Git Cola's rebase / sequence editor, formerly known as ``git-xbase`` and
453 installed as ``share/git-cola/bin/git-xbase``, has been renamed to
454 ``git-cola-sequence-editor`` and is now installed into the default
455 ``bin/git-cola-sequence-editor`` executable location to enable external
456 reuse of this general-purpose tool.
458 * A workaround used by the pynsist installer preamble script was obsoleted by
459 `takluyver/pynsist#149 <https://github.com/takluyver/pynsist/pull/149>`_
460 and has now been removed.
461 (`#1073 <https://github.com/git-cola/git-cola/pull/1073>`_)
465 * `git dag` now uses integer widths when initializing its brushes.
466 (`#1080 <https://github.com/git-cola/git-cola/pull/1080>`_)
474 Usability, bells and whistles
475 -----------------------------
476 * The ``git-xbase`` rebase editor now includes a file list for filtering
477 the changes displayed in the diff view.
478 (`#1051 <https://github.com/git-cola/git-cola/pull/1051>`_)
480 * The fallback `ssh-askpass` script, which provides the Username/Password
481 login dialog when performing remote operations, previously presented both
482 the username and password input fields with ``***`` asterisks.
483 The dialog now uses asterisks for the password field only.
484 (`#1026 <https://github.com/git-cola/git-cola/pull/1026>`_)
486 * Stashes can now be applied using the `Ctrl + Enter` hotkey, popped with the
487 `Ctrl + Backspace` hotkey, and dropped with the `Ctrl + Shift + Backspace`
488 hotkey when inside the stash dialog. This enables a keyboard-centric
489 mouse-free workflow when using the stash dialog.
491 * When amending a commit, `git cola` will check whether the commit has been
492 published to a remote branch using ``git branch -r --contains HEAD``.
493 This command can be slow when operating on a repository with many
494 remote branches. The new `cola.checkpublishedcommits` configuration
495 variable allows you to opt-out of this check, which improves performance
496 when amending a commit. The settings widget exposes this variable as,
497 "Check Published Commits when Amending".
498 (`#1021 <https://github.com/git-cola/git-cola/issues/1021>`_)
499 (`#1027 <https://github.com/git-cola/git-cola/pull/1027>`_)
503 * Updated Polish translation.
504 (`#1033 <https://github.com/git-cola/git-cola/pull/1033>`_)
508 * ``git-dag.appdata.xml`` was updated to allow network access for author icons.
509 (`#1050 <https://github.com/git-cola/git-cola/pull/1050>`_)
511 * The inotify filesystem monitor now handles
512 `OSError: [Errno 24] Too many open files` errors by disabling inotify.
513 (`#1015 <https://github.com/git-cola/git-cola/issues/1015>`_)
515 * Typos in various documentation files have been fixed.
516 (`#1025 <https://github.com/git-cola/git-cola/pull/1025>`_)
518 * The "Recent Repositories" limit was off by one, and now correctly
519 remembers the configured number of repositories in the menu.
520 (`#1024 <https://github.com/git-cola/git-cola/pull/1024>`_)
522 * The "revert" action in the DAG and other tools now uses
523 ``git revert --no-edit``, which avoids launching an editor
524 when reverting the commit. Use `Ctrl+m` in the commit message
525 editor after reverting a commit to rewrite its commit message.
526 (`#1020 <https://github.com/git-cola/git-cola/issues/1020>`_)
534 Usability, bells and whistles
535 -----------------------------
536 * The remote editor is much faster since it no longer queries
537 remotes, and uses the cached information instead.
538 (`#986 <https://github.com/git-cola/git-cola/issues/986>`_)
540 * Commit message templates can now be loaded automatically by setting
541 ``git config cola.autoloadcommittemplate true``.
542 (`#1013 <https://github.com/git-cola/git-cola/pull/1013>`_)
543 (`#735 <https://github.com/git-cola/git-cola/pull/735>`_)
545 * The UI layout can now be reset back to its initial state by selecting
546 the "Reset Layout" action. This reverts the layout to the same state
547 as when the app first launched.
548 (`#1008 <https://github.com/git-cola/git-cola/pull/1008>`_)
549 (`#994 <https://github.com/git-cola/git-cola/issues/994>`_)
551 * Files can now be ignored in either the project's `.gitignore`, or in the
552 repository's private local `.git/info/exclude` ignore file.
553 (`#1006 <https://github.com/git-cola/git-cola/pull/1006>`_)
554 (`#1000 <https://github.com/git-cola/git-cola/issues/1000>`_)
556 * New remotes are now selected when they are added in the "Edit Remotes" tool.
557 (`#1002 <https://github.com/git-cola/git-cola/pull/1002>`_)
559 * The "Recent" repositories list is now saved to disk when opening a
560 repository. Previously, this list was only updated when exiting the app.
561 (`#1001 <https://github.com/git-cola/git-cola/pull/1001>`_)
563 * The bookmarks tool now has a "Delete" option in its right-click menu.
564 (`#999 <https://github.com/git-cola/git-cola/pull/999>`_)
566 * The current repository is no longer listed in the "File/Open Recent" menu.
567 (`#998 <https://github.com/git-cola/git-cola/pull/998>`_)
571 * Updated Hungarian translation.
572 (`#1005 <https://github.com/git-cola/git-cola/pull/1005>`_)
573 (`#1018 <https://github.com/git-cola/git-cola/pull/1018>`_)
575 * Updated Turkish translation.
576 (`#1003 <https://github.com/git-cola/git-cola/pull/1003>`_)
577 (`#1011 <https://github.com/git-cola/git-cola/pull/1011>`_)
581 * Better support for Python 3.8's line buffering modes.
582 (`#1014 <https://github.com/git-cola/git-cola/pull/1014>`_)
584 * The default `ssh-askpass` script now uses a more generic `#!` shebang line.
585 (`#1012 <https://github.com/git-cola/git-cola/pull/1012>`_)
587 * Fetch, push, and pull operations will now refresh the model and display when
589 (`#996 <https://github.com/git-cola/git-cola/issues/996>`_)
591 * The branches widget now refreshes its display when changing branches.
592 (`#992 <https://github.com/git-cola/git-cola/pull/992>`_)
596 * The `share/git-cola/bin/git-xbase` script will now have its `#!` lines
597 updated during installation.
598 (`#991 <https://github.com/git-cola/git-cola/pull/991>`_)
602 * The unit tests were made more platform-independent.
603 (`#993 <https://github.com/git-cola/git-cola/pull/993>`_)
611 Usability, bells and whistles
612 -----------------------------
613 * Auto-completion for filenames can now be disabled. This speeds up
614 revision completion when working in large repositories with many files.
615 (`#981 <https://github.com/git-cola/git-cola/pull/981>`_)
617 * The Stash dialog now shows the stash date as a tooltip when hovering
618 over a stashed change.
619 (`#982 <https://github.com/git-cola/git-cola/pull/982>`_)
621 * Qt HiDPI settings are overridden by the `git cola` HiDPI appearance settings.
622 These overrides can now be disabled by selecting the "Disable" mode.
623 This allows users to control Qt's HiDPI settings through environment
624 variables. Additionally, the "Auto" mode now detects the presence of
625 the Qt HiDPI variables and no longer overrides them when the user has
626 configured their environment explicitly.
627 (`#963 <https://github.com/git-cola/git-cola/issues/963>`_)
629 * Confirmation dialogs can now focus buttons using the Tab key.
630 Previously, the "Y" and "N" keys could be used to confirm or deny
631 using the keyboard, but "Tab" is more familiar.
632 (`#965 <https://github.com/git-cola/git-cola/issues/965>`_)
634 * Error dialogs (for example, when a commit hook fails) will now always
635 show the details. The details were previously hidden behind a toggle.
636 (`#968 <https://github.com/git-cola/git-cola/issues/968>`_)
640 * Updated Japanese translation.
641 (`#973 <https://github.com/git-cola/git-cola/pull/973>`_)
642 (`#974 <https://github.com/git-cola/git-cola/pull/974>`_)
644 * Updated Simplified Chinese translation.
645 (`#950 <https://github.com/git-cola/git-cola/pull/950>`_)
649 * The filesystem monitor no longer logs that it has been enabled after the
650 inotify watch limit is reached on Linux.
651 (`#984 <https://github.com/git-cola/git-cola/pull/984>`_)
653 * Better unicode robustness.
654 (`#990 <https://github.com/git-cola/git-cola/issues/990>`_)
655 (`#910 <https://github.com/git-cola/git-cola/issues/991>`_)
657 * The "Branches" widget did not always update itself when deleting branches
658 (for example, when inotify is disabled or unavailable).
659 (`#978 <https://github.com/git-cola/git-cola/issues/978>`_)
661 * Non-ascii unicode byte strings are more robustly handled by the log widget.
662 (`#977 <https://github.com/git-cola/git-cola/issues/977>`_)
664 * Non-unicode results from the `gettext` library are more robustly handled.
665 (`#969 <https://github.com/git-cola/git-cola/issues/969>`_)
667 * Launching `git cola` from within a directory that has since been deleted
668 would previously result in a traceback, and is now robustly handled.
669 (`#961 <https://github.com/git-cola/git-cola/issues/961>`_)
673 * The vendored `qtpy` library was updated to `v1.9`.
681 Usability, bells and whistles
682 -----------------------------
683 * The file browser now includes "Blame" in its context menu.
684 (`#953 <https://github.com/git-cola/git-cola/issues/953>`_)
686 * The "Push" action now uses "git push --force-with-lease" when using
687 the "Force" option with Git v1.8.5 and newer.
688 (`#946 <https://github.com/git-cola/git-cola/issues/946>`_)
690 * Updated German translation.
691 (`#936 <https://github.com/git-cola/git-cola/pull/936>`_)
693 * The `Status` widget learned to optionally display file counts in its
694 category headers, and indent the files displayed in each category.
695 (`#931 <https://github.com/git-cola/git-cola/pull/931>`_)
697 * The `Branches` widget can now sort branches by their most recent commit.
698 (`#930 <https://github.com/git-cola/git-cola/pull/930>`_)
700 * `git cola` now includes configurable GUI themes that can be used to style
701 the user interface. Enable the new themes by configuring `cola.theme`
702 in the preferences window. See the
703 `cola.theme documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-theme>`_
704 for more details. (`#924 <https://github.com/git-cola/git-cola/pull/924>`_)
706 * `git cola` now has built-in support for HiDPI displays by enabling
707 Qt's 5.6's `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
708 (`#938 <https://github.com/git-cola/git-cola/issues/938>`_)
710 * `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
711 icons have been updated to look sharp when displayed in HiDPI.
712 (`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
716 * `git cola`'s "Revert Unstaged Edits" previously checked out from "HEAD^",
717 when in "Amend" mode, and removing staged changes. This behavior has been
718 changed to always checkout from the index, which avoids data loss.
719 (`#947 <https://github.com/git-cola/git-cola/issues/947>`_)
721 * `git cola` has been updated to work with newer versions of `gnome-terminal`
722 and no longer shell-quotes its arguments when launching `gnome-terminal`.
723 The `cola.terminalshellquote` configuration variable can be set to `true` to
724 get the old behavior, or to handle other terminals that take the command to run
725 as a single string instead of as arguments to `execv()`.
726 (`#935 <https://github.com/git-cola/git-cola/pull/935>`_)
728 * `git dag` now properly handles arbitrary input on Python3.
729 Previously, an exception would be raised when entering `--grep=xxx` where
730 `xxx` is a quoted string with a missing end-quote.
731 (`#941 <https://github.com/git-cola/git-cola/pull/941>`_)
735 * The contribution guidelines for contributors has been updated to mention
736 how to regenerate the `*.mo` message files.
737 (`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
745 Usability, bells and whistles
746 -----------------------------
747 * `git dag` improved how it renders parent commits.
748 (`#921 <https://github.com/git-cola/git-cola/pull/921>`_)
750 * The `Branches` widget now checks out branches when double-clicked.
751 (`#920 <https://github.com/git-cola/git-cola/pull/920>`_)
753 * The new `Submodules` widget makes it easy to interact with submodules.
754 Additionally, submodules can now be updated using the `Status` widget.
755 (`#916 <https://github.com/git-cola/git-cola/pull/916>`_)
757 * Updated Japanese translation.
758 (`#914 <https://github.com/git-cola/git-cola/pull/914>`_)
760 * The "Open Terminal" action now launches a Git Bash shell on Windows.
761 (`#913 <https://github.com/git-cola/git-cola/pull/913>`_)
763 * New menu actions for updating all submodules.
764 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
766 * The status widget can now update submodules.
767 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
769 * The "Apply Patch" `git cola am` dialog now includes a diff viewer
770 to display the contents of the selected patch.
772 * The "Alt+D" diffstat hotkey now selects the staged/modified/etc.
773 header in the Status widget, which shows the totality of everything
774 that will be committed.
775 (`#771 <https://github.com/git-cola/git-cola/issues/771>`_)
777 * Running "Launch Editor" from the diff editor now opens the editor at the
779 (`#898 <https://github.com/git-cola/git-cola/pull/898>`_)
781 * The textwidth and tabwidth configuration values can now be set
782 per-repository, rather than globally only.
784 * Text entry widgets switched to using a block cursor in `v3.2`.
785 This has been reverted to the original line cursor for consistency
786 with other applications and user expectations.
787 (`#889 <https://github.com/git-cola/git-cola/issues/889>`_)
789 * The "edit at line" feature, used by the "Grep" tool, now supports
790 the Sublime text editor.
791 (`#894 <https://github.com/git-cola/git-cola/pull/894>`_)
795 * Launching external programs has been improved on Windows.
796 (`#925 <https://github.com/git-cola/git-cola/pull/925>`_)
798 * Improve compatibility when using PySide2.
799 (`#912 <https://github.com/git-cola/git-cola/pull/912>`_)
801 * The Diff Editor was not honoring the configured tab width on startup.
802 (`#900 <https://github.com/git-cola/git-cola/issues/900>`_)
804 * The "Delete Files" feature was creating an unreadable display when
805 many files were selected. Word-wrap the list of files so that the
806 display stays within a sensible size.
807 (`#895 <https://github.com/git-cola/git-cola/issues/895>`_)
809 * Spelling and grammar fixes.
810 (`#915 <https://github.com/git-cola/git-cola/pull/915>`_)
811 (`#891 <https://github.com/git-cola/git-cola/pull/891>`_)
815 * The logo was run through `tidy` to give it a consistent style.
816 Some technical issues with the logo were improved.
817 (`#877 <https://github.com/git-cola/git-cola/issues/877>`_)
819 * The entire codebase is now checked by `flake8`, rather than just
820 the module and test directories. This catches things like
821 the pynsist installer scripts.
822 (`#884 <https://github.com/git-cola/git-cola/issues/884>`_)
823 (`#882 <https://github.com/git-cola/git-cola/issues/882>`_)
824 (`#879 <https://github.com/git-cola/git-cola/pull/879>`_)
828 * The vendored `qtpy` library was updated to `v1.6`.
830 * The Windows installer's wrapper scripts were missing an import.
831 (`#878 <https://github.com/git-cola/git-cola/issues/878>`_)
839 Usability, bells and whistles
840 -----------------------------
841 * The `git cola dag` DAG window now supports `git revert`.
842 (`#843 <https://github.com/git-cola/git-cola/issues/843>`_)
844 * `git stash pop` is now supported by the stash dialog.
845 (`#844 <https://github.com/git-cola/git-cola/issues/844>`_)
847 * The status widget now ensures that each item is visible when selection
848 changes. Previously, if you scrolled to the right to see the name of
849 a long filename, and then selected a short filename above it, the widget
850 may not have shown the short filename in the viewport. We now ensure
851 that the filenames are visible when the selection changes.
852 (`#828 <https://github.com/git-cola/git-cola/pull/828>`_)
854 * The `git xbase` rebase editor no longer displays an error when
855 cancelling an interactive rebase.
856 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
858 * The dialog shown when renaming remotes has been simplified.
859 (`#840 <https://github.com/git-cola/git-cola/pull/840>`_)
860 (`#838 <https://github.com/git-cola/git-cola/issues/838>`_)
862 * The help dialog in the `git-xbase` Rebase editor is now scrollable.
863 (`#855 <https://github.com/git-cola/git-cola/issues/855>`_)
867 * Updated Brazilian translation.
868 (`#845 <https://github.com/git-cola/git-cola/pull/845>`_)
870 * Updated Czech translation.
871 (`#854 <https://github.com/git-cola/git-cola/pull/854>`_)
872 (`#853 <https://github.com/git-cola/git-cola/pull/853>`_)
873 (`#835 <https://github.com/git-cola/git-cola/pull/835>`_)
874 (`#813 <https://github.com/git-cola/git-cola/pull/813>`_)
876 * Update Spanish translation.
877 (`#862 <https://github.com/git-cola/git-cola/pull/862>`_)
878 (`#867 <https://github.com/git-cola/git-cola/pull/867>`_)
882 * The original `#!/usr/bin/env python` shebang lines can now be
883 retained by passing `USE_ENV_PYTHON=1` to `make` when installing.
884 (`#850 <https://github.com/git-cola/git-cola/issues/850>`_)
886 * The Makefile is now resilient to DESTDIR and prefix containing whitespace.
887 (`#858 <https://github.com/git-cola/git-cola/pull/858>`_)
889 * The vendored `qtpy` library was updated to `v1.4.2`.
891 * `python3-distutils` is needed to build cola on Debian.
892 (`#837 <https://github.com/git-cola/git-cola/issues/837>`_)
896 * The "C" key no longer closes the message dialogs, for example the
897 one that is shown when a commit fails its pre-commit hooks.
898 This allows "Ctrl+C" copy to work, rather than closing the dialog.
899 (`#734 <https://github.com/git-cola/git-cola/issues/734>`_)
901 * Dock widgets sizes are now properly saved and restored when the main
903 (`#848 <https://github.com/git-cola/git-cola/issues/848>`_)
905 * The spellcheck feature was broken under Python3.
906 (`#857 <https://github.com/git-cola/git-cola/issues/857>`_)
908 * A regression when saving stashes was fixed.
909 (`#847 <https://github.com/git-cola/git-cola/issues/847>`_)
911 * Diffing image files was not updating the available context menus,
912 which prevented the "Stage" action from being present in the menu.
913 (`#841 <https://github.com/git-cola/git-cola/issues/841>`_)
915 * `git cola` now detects when `git lfs uninstall` has been run. This allows
916 you to re-initialize "Git LFS" in an existing repository where it had been
917 previously uninstalled.
918 (`#842 <https://github.com/git-cola/git-cola/issues/842>`_)
920 * Custom color values that did not contain any hexadecimal digits in the
921 `a-f` range were being converted into integers by the config reader. This
922 then caused the configured colors to be ignored.
924 These color values are now interpreted correctly. Additionally, color
925 values can now use an optional HTML-like `#` prefix.
927 Example `.gitconfig` snippet::
932 (`#836 <https://github.com/git-cola/git-cola/pull/836>`_)
933 (`#849 <https://github.com/git-cola/git-cola/issues/849>`_)
935 * We now display an error message graphically when `Git` is not installed.
936 Previously, the message went to stderr only.
937 (`#830 <https://github.com/git-cola/git-cola/issues/830>`_)
939 * Changing diff options was causing resulting in an exception.
940 (`#833 <https://github.com/git-cola/git-cola/issues/833>`_)
941 (`#834 <https://github.com/git-cola/git-cola/pull/834>`_)
943 * The DAG window now updates itself when branches and tags are created.
944 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
946 * The user's `$PATH` environment variable can now contain utf-8
947 encoded paths. Previously, launching external commands could
949 (`#807 <https://github.com/git-cola/git-cola/issues/807>`_)
951 * Git Cola development sandboxes can now be stored on utf-8 encoded
952 filesystem paths. Previously, the interactive rebase feature
953 could be broken when running in that environment.
954 (`#825 <https://github.com/git-cola/git-cola/issues/825>`_)
956 * The log window now uses an ISO-8601 timestamp, which
957 avoids localized output in the log window.
958 (`#817 <https://github.com/git-cola/git-cola/issues/817>`_)
962 * The code base has been thoroughly sanitized using `pylint`, and
963 travis is now running pylint over the entire project.
965 * Miscellaneous improvements and code improvements.
966 (`#874 <https://github.com/git-cola/git-cola/issues/874>`_)
974 Usability, bells and whistles
975 -----------------------------
976 * The "Browser" widget learned to rename files using "git mv".
977 (`#239 <https://github.com/git-cola/git-cola/issues/239>`_)
979 * The "Diff" widget learned to diff images. Side-by-side and pixel diff
980 modes allow you to inspect changes to common images formats.
981 (`#444 <https://github.com/git-cola/git-cola/issues/444>`_)
982 (`#803 <https://github.com/git-cola/git-cola/pull/803>`_)
984 * Git LFS and Git Annex are natively supported by the image diff viewer.
986 * Git Annex operations are now included. `git annex init` can be performed on
987 repositories, and `git annex add` can be run on untracked files from the
988 status widget. Install `git-annex` to activate this feature.
990 * Git LFS operations are now included. `git lfs install` can be performed on
991 repositories, and `git lfs track` can be run on untracked files from the
992 status widget. Install `git-lfs` to activate this feature.
994 * The "Stash" tool learned to stash staged changes only. Select the
995 "Stage Index" option and only staged changes will be stashed away.
996 (`#413 <https://github.com/git-cola/git-cola/issues/413>`_)
998 * The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
999 shows error messages when things go wrong, and now saves the "Stash Index"
1000 and "Keep Index" options across sessions.
1002 * The Edit menu's "Copy" and "Select All" actions now forward to either the
1003 diff, status, recent, or favorites widgets, based on which widget has focus.
1005 * The "File" and "Edit" menu can now be activated using `Alt-{f,e}` hotkeys.
1006 (`#759 <https://github.com/git-cola/git-cola/issues/759>`_)
1008 * It was easy to accidentally trigger the first action in the `Status` tool's
1009 context menu when using a quick right-click to bring up the menu.
1010 A short sub-second delay was added to ensure that the top-most action is not
1011 triggered unless enough time has passed. This prevents accidental
1012 activation of the first item (typically "Stage" or "Unstage") without
1013 burdening common use cases.
1014 (`#755 <https://github.com/git-cola/git-cola/pull/755>`_)
1015 (`#643 <https://github.com/git-cola/git-cola/issues/643>`_)
1017 * The "Ctrl+S" hotkey now works for the header items in the Status tool.
1018 Selected the "Modified" header item and activating the "Stage" hotkey,
1019 for example, will stage all modified files. This works for the "Staged",
1020 "Modified", and "Untracked" headers. This is not enabled for the
1021 "Unmerged" header by design.
1022 (`#772 <https://github.com/git-cola/git-cola/issues/772>`_)
1024 * The list of "Recent" repositories previously capped the number of
1025 repositories shown to 8 repositories. This can be set to a higher
1026 value by setting the `cola.maxrecent` configuration variable.
1027 (`#752 <https://github.com/git-cola/git-cola/issues/752>`_)
1029 * The "Create Branch" dialog now prevents invalid branch names.
1030 (`#765 <https://github.com/git-cola/git-cola/issues/765>`_)
1032 * Updated Turkish translation.
1033 (`#756 <https://github.com/git-cola/git-cola/pull/756>`_)
1035 * Updated Ukrainian translation.
1036 (`#753 <https://github.com/git-cola/git-cola/pull/753>`_)
1038 * Updated German translation.
1039 (`#802 <https://github.com/git-cola/git-cola/pull/802>`_)
1041 * Updated Czech translation
1042 (`#792 <https://github.com/git-cola/git-cola/pull/792>`_)
1043 (`#806 <https://github.com/git-cola/git-cola/pull/806>`_)
1045 * The window title can be configured to not display the absolute path of the
1047 (`#775 <https://github.com/git-cola/git-cola/issues/775>`_)
1049 * The "Edit Remotes" editor learned to edit remote URLS.
1051 * Bare repositories can now be created by selecting the
1052 "New Bare Repository..." action from the `File` menu.
1054 * The "Branches" widget learned to configure upstream branches.
1056 * A new `git cola clone` sub-command was added for cloning repositories.
1060 * The vendored `qtpy` library was updated to `v1.3.1`.
1062 * The macOS installation was made simpler for better compatibility with
1064 (`#636 <https://github.com/git-cola/git-cola/issues/636>`_)
1066 * The Windows installer is now much simpler. Git Cola now bundles
1067 Python and PyQt5, so users need only install the "Git for Windows"
1068 and "Git Cola" installers to get things working.
1072 * Uninitialized difftool errors will now be displayed graphically.
1073 They were previously going to the shell.
1074 (`#457 <https://github.com/git-cola/git-cola/issues/457>`_)
1076 * Translations marked "fuzzy" will no longer be used when translating strings.
1077 (`#782 <https://github.com/git-cola/git-cola/issues/782>`_)
1079 * Deleted unmerged files will now correctly use a deleted icon.
1080 (`#479 <https://github.com/git-cola/git-cola/issues/479>`_)
1082 * The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
1083 (`#767 <https://github.com/git-cola/git-cola/issues/767>`_)
1085 * The "Create Tag" dialog did not correctly handle the case when a signed
1086 tag is requested, but no message is provided, and the user chooses to
1087 create an unannotated tag instead. This convenience fallback will now
1088 properly create an unsigned, unannotated tag.
1089 (`#696 <https://github.com/git-cola/git-cola/issues/696>`_)
1091 * `.gitconfig` and `.git/config` values editable by the Preferences dialog
1092 (aka `git cola config`) will now get unset when set to an empty value.
1093 For example, setting a different `user.email` in the current repository,
1094 followed by a subsequent emptying of that field, would previously result in
1095 an empty string getting stored in the config. This has been fixed so that
1096 the value will now get unset in the config instead.
1097 (`#406 <https://github.com/git-cola/git-cola/issues/406>`_)
1099 * Spelling and typofixes.
1100 (`#748 <https://github.com/git-cola/git-cola/pull/748>`_)
1102 * `core.commentChar` is now honored when set in the local repository
1104 (`#766 <https://github.com/git-cola/git-cola/issues/766>`_)
1106 * The log window was using a format string that did not display
1107 correctly in all locales. A locale-aware format is now used.
1108 (`#800 <https://github.com/git-cola/git-cola/pull/800>`_)
1110 * The dialog displayed when prompting for a reference could sometimes
1112 (`#804 <https://github.com/git-cola/git-cola/pull/804>`_)
1120 Usability, bells and whistles
1121 -----------------------------
1122 * Updated Simplified Chinese translation.
1123 (`#726 <https://github.com/git-cola/git-cola/pull/726>`_)
1125 * Updated Ukrainian translation.
1126 (`#723 <https://github.com/git-cola/git-cola/pull/723>`_)
1128 * New Czech translation.
1129 (`#736 <https://github.com/git-cola/git-cola/pull/736>`_)
1130 (`#737 <https://github.com/git-cola/git-cola/pull/737>`_)
1131 (`#740 <https://github.com/git-cola/git-cola/pull/740>`_)
1132 (`#743 <https://github.com/git-cola/git-cola/pull/743>`_)
1134 * The "name" field in the "Create Tag" dialog now includes autocompletion,
1135 which makes it easy to see which tags currently exist.
1137 * `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
1138 menu item to add a toolbar.
1140 * Setting `cola.expandtab` to `true` will now expand tabs into spaces
1141 in the commit message editor. The number of spaces to insert is determined
1142 by consulting `cola.tabwidth`, which defaults to `8`.
1144 * The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
1145 ability to copy text from the DAG window.
1146 (`#705 <https://github.com/git-cola/git-cola/pull/705>`_)
1148 * The "Prepare Commit Message" action can now be invoked via the
1149 `Ctrl+Shift+Return` shortcut.
1150 (`#707 <https://github.com/git-cola/git-cola/pull/707>`_)
1152 * The `Branches` pane now has a filter field that highlights branches whose
1153 names match the string entered into its text field.
1154 (`#713 <https://github.com/git-cola/git-cola/pull/713>`_)
1156 * Actions that are triggered in response to button presses were being
1157 triggered when the button was pressed, rather than when it was released,
1158 which was a usability flaw. All buttons now respond when clicked
1159 rather than when pressed.
1160 (`#715 <https://github.com/git-cola/git-cola/pull/715>`_)
1162 * The DAG window will now only refresh when object IDs change.
1163 Previously, the DAG would redraw itself in response to inotify events,
1164 such as filesystem operations, which was disruptive when inspecting a large
1165 diff in its diff viewer. The DAG will now only redraw when the object IDs
1166 corresponding to its query input changes. Furthermore, when redrawing, the
1167 scrollbar positions are retained to minimize disruption to the viewport
1169 (`#620 <https://github.com/git-cola/git-cola/issues/620>`_)
1170 (`#724 <https://github.com/git-cola/git-cola/issues/724>`_)
1172 * The "About" dialog now includes the SHA-1 where Git Cola was built.
1173 (`#530 <https://github.com/git-cola/git-cola/issues/530>`_)
1175 * The "Status" widget now has "Copy Leading Path to Clipboard" and
1176 "Copy Basename to Clipboard" actions.
1177 (`#435 <https://github.com/git-cola/git-cola/issues/435>`_)
1178 (`#436 <https://github.com/git-cola/git-cola/issues/436>`_)
1180 * The "Status" widget now supports custom "Copy ... to Clipboard" actions.
1181 (`#437 <https://github.com/git-cola/git-cola/issues/437>`_)
1183 * The main menu now has an "Edit" menu.
1184 (`#725 <https://github.com/git-cola/git-cola/issues/725>`_)
1186 * `git dag` learned to checkout commits into a detached HEAD state.
1187 (`#698 <https://github.com/git-cola/git-cola/issues/698>`_)
1189 * The `status` widget's context menus now omit actions selection-dependent
1190 actions when no file is selected.
1191 (`#731 <https://github.com/git-cola/git-cola/pull/731>`_)
1193 * The startup dialog now focuses the repository list so that repositories
1194 can be selected with the keyboard without mouse intervention.
1195 (`#741 <https://github.com/git-cola/git-cola/issues/741>`_)
1199 * `git dag` now prevents nodes from overlapping in more situations.
1200 (`#689 <https://github.com/git-cola/git-cola/pull/689>`_)
1202 * Adding untracked Git submodule repo directories previously ran
1203 `git add submodule/` but we now call `git add submodule` without
1204 the trailing slash (`/`) to avoid staging files that belong to the
1205 submodule (which is possibly a `git` bug). By working around the
1206 buggy behavior we allow users to recover by issuing the appropriate
1207 `git submodule add` command to properly register the submodule.
1208 (`#681 <https://github.com/git-cola/git-cola/pull/681>`_)
1210 * We now avoid `git for-each-ref --sort=version:refname` on versions
1211 of `git` older than `v2.7.0`. Previously we only avoided it for
1212 versions older than `v2.0.0`, which was a mistake.
1213 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
1215 * The error message displayed when `git` is not installed has been fixed.
1216 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
1218 * Adding new remotes was silently broken.
1219 (`#684 <https://github.com/git-cola/git-cola/issues/684>`_)
1220 (`#685 <https://github.com/git-cola/git-cola/pull/685>`_)
1222 * The repo selection dialog had errors during startup when the
1223 `cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
1224 (`#690 <https://github.com/git-cola/git-cola/issues/690>`_)
1226 * Restored support for PyQt 4.6 (Centos 6.8)
1227 (`#692 <https://github.com/git-cola/git-cola/issues/692>`_)
1229 * Switching repositories now resets the "Amend Mode" and other settings
1231 (`#710 <https://github.com/git-cola/git-cola/issues/710>`_)
1233 * `git rebase` error messages now displayed when rebasing fails or stops
1234 via the standalone `git cola rebase` front-end.
1235 (`#721 <https://github.com/git-cola/git-cola/issues/721>`_)
1237 * `git cola` learned to stage broken symlinks.
1238 (`#727 <https://github.com/git-cola/git-cola/issues/727>`_)
1240 * The "View History" feature in the `Browser` tool was fixed, and now
1241 disambiguates between refs and paths.
1242 (`#732 <https://github.com/git-cola/git-cola/issues/732>`_)
1244 * The diff editor now has better support for files with CRLF `\r\n`
1246 (`#730 <https://github.com/git-cola/git-cola/issues/730>`_)
1248 * `cola.inotify` in a repo-local config is now honored
1249 when `git cola` is launched from a desktop entry (`git cola --prompt`).
1250 (`#695 <https://github.com/git-cola/git-cola/issues/695>`_)
1258 Usability, bells and whistles
1259 -----------------------------
1260 * New Ukrainian translation.
1261 (`#670 <https://github.com/git-cola/git-cola/pull/670>`_)
1262 (`#672 <https://github.com/git-cola/git-cola/pull/672>`_)
1264 * New and improved French translations.
1266 * The new `Branches` widget makes it easier to checkout, merge, push,
1267 and pull branches from a single interface.
1269 * `git cola` now includes a dark icon theme. The dark icon theme can be
1270 activated either by setting the `GIT_COLA_ICON_THEME` environment variable
1271 to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
1272 `--icon-theme=dark` on the command line.
1273 (`#638 <https://github.com/git-cola/git-cola/pull/638>`_)
1275 * Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.
1277 * The commit message editor now remembers the "Spellcheck" setting
1279 (`#645 <https://github.com/git-cola/git-cola/pull/645>`_)
1281 * `git dag` now uses an improved algorithm for laying out the graph,
1282 which avoids collisions under certain graph configurations, and
1283 avoids overlapping tag with commits.
1284 (`#648 <https://github.com/git-cola/git-cola/pull/648>`_)
1285 (`#651 <https://github.com/git-cola/git-cola/pull/651>`_)
1286 (`#654 <https://github.com/git-cola/git-cola/pull/654>`_)
1287 (`#656 <https://github.com/git-cola/git-cola/pull/656>`_)
1288 (`#659 <https://github.com/git-cola/git-cola/pull/659>`_)
1290 * `git dag` now remembers its column sizes across sessions.
1291 (`#674 <https://github.com/git-cola/git-cola/issues/674>`_)
1293 * `Grep` now shows a preview of the selected file's content in a split window
1294 below the grep results.
1296 * `Grep` now includes line numbers in the preview pane's output.
1298 * `Edit Remotes` now remembers its window settings after exiting.
1300 * `Diff` now has an option to display line numbers in the editor.
1301 (`#136 <https://github.com/git-cola/git-cola/issues/136>`_)
1303 * `Amend Last Commit` can now be triggered via the `Commit` menu in addition
1304 to the commit message editor's options.
1305 (`#640 <https://github.com/git-cola/git-cola/issues/640>`_)
1307 * The `File Browser` tool was made much faster and can now operate on
1308 much larger repositories.
1309 (`#499 <https://github.com/git-cola/git-cola/issues/499>`_)
1311 * A new "turbo" mode was added that allows you to opt-out of operations
1312 that can slow `git cola` on large repositories. The turbo mode is
1313 enabled by configuring `git config cola.turbo true`. Turbo mode
1314 disables the background loading of Git commit messages and other
1315 details in the `File Browser` widget.
1317 * A new GitIgnore dialog allows adding custom gitignore patterns.
1318 (`#653 <https://github.com/git-cola/git-cola/pull/653>`_)
1320 * The spellchecker in `git cola` can now use an additional dictionary
1321 by configuring `cola.dictionary` to the path to a file containing
1322 a newline-separated list of words.
1323 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1325 * The stash, export patches, diff, and gitignore dialogs now remember
1328 * A new `git cola recent` sub-command was added for finding recently
1331 * The `Fetch` dialog now allows pruning remote branches.
1332 (`#639 <https://github.com/git-cola/git-cola/issues/639>`_)
1333 (`#680 <https://github.com/git-cola/git-cola/pull/680>`_)
1337 * `git cola`'s spellchecker now supports the new `dict-common` filesystem
1338 layout, and prefers the `/usr/share/dict/cracklib-small` file over the
1339 `/usr/share/dict/words` provided on older distributions.
1340 This makes the spellchecker compatible with Arch, which does not provide
1341 a `words` symlink like Debian.
1342 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1344 * Properly handle the case where an existing file is untracked using
1347 * Fix a quirk where the "Create Branch" dialog sometimes required clicking
1348 twice on the radio buttons.
1349 (`#662 <https://github.com/git-cola/git-cola/pull/662>`_)
1351 * Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
1352 be executed with the press of a single enter key after being shown.
1353 (`#661 <https://github.com/git-cola/git-cola/issues/661>`_)
1355 * Committing is now allowed in when resolving a merge results in no
1356 changes. This state was previously prevented by the commit message editor,
1357 which prevented users from resolving merges that result in no changes.
1358 (`#679 <https://github.com/git-cola/git-cola/pull/679>`_)
1360 * The filesystem monitor would sometimes emit backtraces when directories
1361 are modified. This has been fixed.
1362 (`bz #1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)
1364 * Absolute paths are now returned when querying for `.git`-relative paths
1365 from within a submodule, which uses `.git`-files.
1366 This fixes launching `git cola` from within a subdirectory of a submodule.
1367 (`#675 <https://github.com/git-cola/git-cola/pull/675>`_)
1375 Usability, bells and whistles
1376 -----------------------------
1377 * `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
1378 hook to update the commit message. This hook takes the same parameters
1379 as Git's `prepare-commit-message` hook. The default path to this hook
1380 can be overridden by setting the `cola.prepareCommitMessageHook`
1381 configuration variable.
1382 (`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)
1384 * `git cola diff` (and the corresponding `Diff` menu actions) can now
1385 launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
1386 also added for launching an editor.
1388 * Traditional Chinese (Taiwan) translation updates.
1392 * `git cola` now works when installed in non-ascii, utf8-encoded paths.
1393 (`#629 <https://github.com/git-cola/git-cola/issues/629>`_)
1395 * Styling issues that caused black backgrounds in various widgets when using
1396 PyQ5 on Mac OS X have been fixed.
1397 (`#624 <https://github.com/git-cola/git-cola/issues/624>`_)
1399 * The "Open Recent" menu action was broken and has been fixed.
1400 (`#634 <https://github.com/git-cola/git-cola/issues/634>`_)
1402 * Exiting `git cola` with a maximized main window would hang when reopened
1404 (`#641 <https://github.com/git-cola/git-cola/issues/641>`_)
1408 * `appdata.xml` files are now provided at
1409 `share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
1410 for use by the Linux software gallery.
1411 (`#627 <https://github.com/git-cola/git-cola/pull/627>`_)
1412 (`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)
1422 * The "Open Recent" menu was updated to new bookmarks format.
1423 (`#628 <https://github.com/git-cola/git-cola/issues/628>`_)
1431 Usability, bells and whistles
1432 -----------------------------
1433 * New Polish translation thanks to Łukasz Wojniłowicz
1434 (`#598 <https://github.com/git-cola/git-cola/pull/598>`_)
1436 * The `Bypass Commit Hooks` feature now disables itself automatically
1437 when a new commit is created. The new behavior turns the option into a
1438 single-use flag, which helps prevent users from accidentally leaving it
1439 active longer than intended.
1440 (`#595 <https://github.com/git-cola/git-cola/pull/595>`_)
1442 * `git dag` learned to launch an external diff viewer on selected commits.
1443 The standard `Ctrl+D` shortcut can be used to view diffs.
1444 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1446 * `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
1447 The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
1448 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1450 * Items in the "Favorites" list can now be renamed, which makes it
1451 easier to differentiate between several checkouts of the same repository.
1452 (`#599 <https://github.com/git-cola/git-cola/issues/599>`_)
1453 (`#601 <https://github.com/git-cola/git-cola/pull/601>`_)
1455 * The startup screen now includes a logo and `git cola` version information.
1456 (`#526 <https://github.com/git-cola/git-cola/issues/526>`_)
1458 * The `About` page was revamped to contain multiple tabs. A new tab was added
1459 that provides details about `git cola`''s dependencies. New tabs were also
1460 added for giving credit to `git cola`'s authors and translators.
1462 * The `About` page can now be accessed via `git cola about`.
1464 * The "Fast-forward only" and "No fast-forward" options supported by
1465 `git pull` are now accessible via `git cola pull`.
1467 * Doing a forced push no longer requires selecting the remote branch.
1468 (`#618 <https://github.com/git-cola/git-cola/pull/618>`_)
1470 * `git cola push` now has an option to suppress the prompt that is shown
1471 when pushing would create new remote branches.
1472 (`#605 <https://github.com/git-cola/git-cola/issues/605>`_)
1474 * `git dag` now shows commit messages in a more readable color.
1475 (`#574 <https://github.com/git-cola/git-cola/issues/574>`_)
1477 * `git cola browse` and the `status` widget learned to launch the OS-specified
1478 default action for a file. When used on directories via `git cola browse`,
1479 or when "Open Parent Directory" is used on files, the OS-specified
1480 file browser will typically be used.
1482 * `git cola browse` and the `status` widget learned to launch terminals.
1486 * `git cola browse` was not updating when expanding items.
1487 (`#588 <https://github.com/git-cola/git-cola/issues/588>`_)
1489 * Typofixes in comments, naming, and strings have been applied.
1490 (`#593 <https://github.com/git-cola/git-cola/pull/593>`_)
1492 * The inotify and win32 filesystem monitoring no longer refreshes
1493 when updates are made to ignored files.
1494 (`#517 <https://github.com/git-cola/git-cola/issues/517>`_)
1495 (`#516 <https://github.com/git-cola/git-cola/issues/516>`_)
1497 * The `Refresh` button on the actions panel no longer raises an
1498 exception when using PyQt5.
1499 (`#604 <https://github.com/git-cola/git-cola/issues/604>`_)
1501 * Fixed a typo in the inotify backend that is triggered when files are removed.
1502 (`#607 <https://github.com/git-cola/git-cola/issues/607>`_)
1504 * Fixed a typo when recovering from a failed attempt to open a repository.
1505 (`#606 <https://github.com/git-cola/git-cola/issues/606>`_)
1507 * `git dag` now properly updates itself when launched from the menubar.
1508 (`#613 <https://github.com/git-cola/git-cola/pull/613>`_)
1510 * If git-cola is invoked on Windows using `start pythonw git-cola`,
1511 a console window will briefly flash on the screen each time
1512 `git cola` invokes `git`. The console window is now suppressed.
1514 * We now avoid some problematic Popen flags on Windows which were
1515 breaking the `git rebase` feature on Windows.
1517 * The `Save` button in `git dag`'s "Grab File..." feature now properly
1518 prompts for a filename when saving files.
1519 (`#617 <https://github.com/git-cola/git-cola/pull/617>`_)
1523 * The `qtpy` symlink in the source tree has been removed to allow for easier
1524 development on Windows.
1525 (`#626 <https://github.com/git-cola/git-cola/issues/626>`_)
1533 Usability, bells and whistles
1534 -----------------------------
1535 * `git cola push` learned to configure upstream branches.
1536 (`#563 <https://github.com/git-cola/git-cola/issues/563>`_)
1540 * The diffstat view is now properly updated when notifications are
1541 received via inotify filesystem monitoring.
1542 (`#577 <https://github.com/git-cola/git-cola/issues/577>`_)
1544 * Python3 with PyQt5 had a bug that prevented `git cola` from starting.
1545 (`#589 <https://github.com/git-cola/git-cola/pull/589>`_)
1556 * When repositories stored in non-ASCII, UTF-8-encoded filesystem paths
1557 were operated upon with `LC_ALL=C` set in the environment, unicode errors
1558 would occur when using `python2`. `git cola` was made more robust and will
1559 now operate correctly within this environment.
1560 (`#581 <https://github.com/git-cola/git-cola/issues/581>`_)
1562 * Support for the `GIT_WORK_TREE` environment variable was fixed.
1563 (`#582 <https://github.com/git-cola/git-cola/pull/582>`_)
1568 * The `unittest.mock` module is now used instead of the original `mock` module
1569 when running the `git cola` test suite using Python3.
1570 (`#569 <https://github.com/git-cola/git-cola/issues/569>`_)
1575 * `git cola` is now compatible with *PyQt5*, *PyQt4*, and *Pyside*.
1576 `git cola` previously supported *PyQt4* only, but will now use whichever
1577 library is available. Users are not required to upgrade at this time,
1578 but *PyQt5* support can be enabled anytime by making its python
1580 (`#232 <https://github.com/git-cola/git-cola/issues/232>`_)
1582 *NOTE*: We do not yet recommend using *PyQt5* because there are known
1583 exit-on-segfault bugs in *Qt5* that have not yet been addressed.
1584 `git cola` is sensitive to this bug and is known to crash on exit
1585 when using `git dag` or the interactive rebase feature on *PyQt5*.
1587 https://bugreports.qt.io/browse/QTBUG-52988
1589 *PyQt4* is stable and there are no known issues when using it so
1590 we recommend using it until the Qt5 bugs have been resolved.
1592 * `git cola` now depends on *QtPy* and includes a bundled copy of the
1593 `qtpy` library. If you are packaging `git cola` and would prefer to use
1594 `qtpy` from your distribution instead of the built-in version then use
1595 `make NO_VENDOR_LIBS=1` when building `git cola`. This will prevent
1596 vendored libraries from being installed.
1604 Usability, bells and whistles
1605 -----------------------------
1607 * A new "Reset" sub-menu provides access to running "git reset --mixed"
1608 when resetting branch heads and "git reset --merge" when resetting
1610 (`#542 <https://github.com/git-cola/git-cola/issues/542>`_)
1612 * `git cola` now supports linked worktrees, i.e. worktrees created by
1614 (`#554 <https://github.com/git-cola/git-cola/issues/554>`_)
1619 * Diff highlighting is now robust to the user having
1620 diff.supressBlankEmpty=true in their git config.
1621 (`#541 <https://github.com/git-cola/git-cola/issues/541>`_)
1623 * The filesystem monitor now properly handles repositories that use
1624 `.git`-files, e.g. when using submodules.
1625 (`#545 <https://github.com/git-cola/git-cola/issues/545>`_)
1626 (`#546 <https://github.com/git-cola/git-cola/pulls/546>`_)
1628 * Per-repository git configuration is now properly detected when launching
1629 `git cola` from an application launcher.
1630 (`#548 <https://github.com/git-cola/git-cola/issues/548>`_)
1632 * `git cola` now cleans up after itself immediately to avoid leaving behind
1633 empty `/tmp/git-cola-XXXXXX` directories when the user uses `Ctrl+C`
1635 (`#566 <https://github.com/git-cola/git-cola/issues/566>`_)
1640 * It is now possible to install `git cola` to and from utf8-encoded filesystem
1641 paths. Previously, Python's stdlib would throw an encoding error during
1642 installation. We workaround the stdlib by forcing python2 to use utf-8,
1643 thus fixing assumptions in the stdlib library code.
1644 (`#551 <https://github.com/git-cola/git-cola/issues/551>`_)
1652 Usability, bells and whistles
1653 -----------------------------
1655 * The icon for untracked files was adjusted to better differentiate
1656 between files and the "Untracked" header.
1657 (`#509 <https://github.com/git-cola/git-cola/issues/509>`_)
1659 * Ctrl+O was added as a hotkey for opening repositories.
1660 (`#507 <https://github.com/git-cola/git-cola/pull/507>`_)
1662 * `git dag` now uses consistent edge colors across updates.
1663 (`#512 <https://github.com/git-cola/git-cola/issues/512>`_)
1665 * `git cola`'s Bookmarks widget can now be used to set a "Default Repository".
1666 Under the hood, we set the `cola.defaultrepo` configuration variable.
1667 The default repository is used whenever `git cola` is launched outside of
1668 a Git repository. When unset, or when set to a bogus value, `git cola`
1669 will prompt for a repository, as it previously did.
1670 (`#513 <https://github.com/git-cola/git-cola/issues/513>`_)
1672 * `git cola`'s Russian and Spanish translations were improved
1673 thanks to Vaiz and Zeioth.
1674 (`#514 <https://github.com/git-cola/git-cola/pull/514>`_)
1675 (`#515 <https://github.com/git-cola/git-cola/pull/515>`_)
1676 (`#523 <https://github.com/git-cola/git-cola/pull/523>`_)
1678 * `git cola` was translated to Turkish thanks to Barış ÇELİK.
1679 (`#520 <https://github.com/git-cola/git-cola/pull/520>`_)
1681 * The status view now supports launching `git gui blame`. It can be
1682 configured to use a different command by setting `cola.blameviewer`.
1683 (`#521 <https://github.com/git-cola/git-cola/pull/521>`_)
1685 * `git dag` now allows selecting non-contiguous ranges in the log widget.
1686 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1688 * Any font can now be chosen for the diff editor, not just monospace fonts.
1689 (`#525 <https://github.com/git-cola/git-cola/issues/525>`_)
1694 * `xfce4-terminal` and `gnome-terminal` are now supported when launching
1695 `git mergetool` to resolve merges. These terminals require that the command
1696 to execute is shell-quoted and passed as a single string argument to `-e`
1697 rather than as additional command line arguments.
1698 (`#524 <https://github.com/git-cola/git-cola/issues/524>`_)
1700 * Fixed a unicode problem when formatting the error message that is shown
1701 when `gitk` is not installed. We now handle unicode data in tracebacks
1702 generated by python itself.
1703 (`#528 <https://github.com/git-cola/git-cola/issues/528>`_)
1705 * The `New repository` feature was fixed.
1706 (`#533 <https://github.com/git-cola/git-cola/pull/533>`_)
1708 * We now use omit the extended description when creating "fixup!" commits,
1709 for consistency with the Git CLI. We now include only the one-line summary
1710 in the final commit message.
1711 (`#522 <https://github.com/git-cola/git-cola/issues/522>`_)
1719 Usability, bells and whistles
1720 -----------------------------
1722 * The user interface is now HiDPI-capable. git-cola now uses SVG
1723 icons, and its interface can be scaled by setting the `GIT_COLA_SCALE`
1724 environment variable.
1726 * `git dag` now supports the standard editor, difftool, and history hotkeys.
1727 It is now possible to invoke these actions from file widget's context
1728 menu and through the standard hotkeys.
1729 (`#473 <https://github.com/git-cola/git-cola/pull/473>`_)
1731 * The `Status` tool also learned about the history hotkey.
1732 Additionally, the `Alt-{j,k}` aliases are also supported in the `Status`
1733 tool for consistency with the other tools where the non-Alt hotkeys are not
1735 (`#488 <https://github.com/git-cola/git-cola/pull/488>`_)
1737 * The `File Browser` tool now has better default column sizes,
1738 and remembers its window size and placement.
1740 * The `File Browser` now supports the refresh hotkey, and has better
1741 behavior when refreshing. The selection is now retained, and new and
1742 removed files are found when refreshing.
1744 * A new `git-cola-completion.bash` completion script is provided in the
1745 `contrib/` directory. It must be used alongside Git's completion script.
1746 Source it from your `~/.bashrc` (or `~/.zshrc`, etc) after sourcing
1747 the `git-completion.bash` script and you will have command-line completion
1748 support for the `git cola` and `git dag` sub-commands.
1750 * The "checkout" dialog now offers completion for remote branches and other
1751 git refs. This makes it easier to checkout remote branches in a detached
1752 head state. Additionally, the checkout dialog also offers completion for
1753 remote branches that have not yet been checked out, which makes it easier to
1754 create a local tracking branch by just completing for that potential name.
1755 (`#390 <https://github.com/git-cola/git-cola/issues/390>`_)
1757 * The "create branch" and "create tag" dialogs now save and restore their
1760 * The "status" widget can now be configured to use a bold font with a darker
1761 background for the header items.
1762 (`#506 <https://github.com/git-cola/git-cola/pull/506>`_)
1764 * The "status" widget now remembers its horizontol scrollbar position across
1765 updates. This is helpful when working on projects with long paths.
1766 (`#494 <https://github.com/git-cola/git-cola/issues/494>`_)
1771 * When using *Git for Windows*, a `git` window would appear
1772 when running *Windows 8*. We now pass additional flags to
1773 `subprocess.Popen` to prevent a `git` window from appearing.
1774 (`#477 <https://github.com/git-cola/git-cola/issues/477>`_)
1775 (`#486 <https://github.com/git-cola/git-cola/pull/486>`_)
1777 * Launching difftool with `.PY` in `$PATHEXT` on Windows was fixed.
1778 (`#492 <https://github.com/git-cola/git-cola/issues/492>`_)
1780 * Creating a local branch tracking a remote branch that contains
1781 slashes in its name is now properly handled.
1782 (`#496 <https://github.com/git-cola/git-cola/issues/496>`_)
1784 * The "Browse Other Branch" feature was broken by Python3, and is now fixed.
1785 (`#501 <https://github.com/git-cola/git-cola/issues/501>`_)
1787 * We now avoid `long` for better Python3 compatibility.
1788 (`#502 <https://github.com/git-cola/git-cola/issues/502>`_)
1790 * We now use Git's default merge message when merging branches.
1791 (`#508 <https://github.com/git-cola/git-cola/issues/508>`_)
1793 * Miscellaneous fixes
1794 (`#485 <https://github.com/git-cola/git-cola/pull/485>`_)
1799 * git-cola's documentation no longer uses an intersphinx link mapping
1800 to docs.python.org. This fixes warnings when building rpms using koji,
1801 where network access is prevented.
1803 https://bugzilla.redhat.com/show_bug.cgi?id=1231812
1811 Usability, bells and whistles
1812 -----------------------------
1814 * The Interactive Rebase feature now works on Windows!
1815 (`#463 <https://github.com/git-cola/git-cola/issues/463>`_)
1817 * The `diff` editor now understands vim-style `hjkl` navigation hotkeys.
1818 (`#476 <https://github.com/git-cola/git-cola/issues/476>`_)
1820 * `Alt-{j,k}` navigation hotkeys were added to allow changing to the
1821 next/previous file from the diff and commit editors.
1823 * The `Rename branch` menu action is now disabled in empty repositories.
1824 (`#475 <https://github.com/git-cola/git-cola/pull/475>`_)
1825 (`#459 <https://github.com/git-cola/git-cola/issues/459>`_)
1827 * `git cola` now checks unmerged files for conflict markers before
1828 staging them. This feature can be disabled in the preferences.
1829 (`#464 <https://github.com/git-cola/git-cola/issues/464>`_)
1831 * `git dag` now remembers which commits were selected when refreshing
1832 so that it can restore the selection afterwards.
1833 (`#480 <https://github.com/git-cola/git-cola/issues/480>`_)
1835 * "Launch Editor", "Launch Difftool", "Stage/Unstage",
1836 and "Move Up/Down" hotkeys now work when the commit message
1838 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1840 * The diff editor now supports the `Ctrl+u` hotkey for reverting
1841 diff hunks and selected lines.
1843 * The `core.commentChar` Git configuration value is now honored.
1844 Commit messages and rebase instruction sheets will now use
1845 the configured character for comments. This allows having
1846 commit messages that start with `#` when `core.commentChar`
1847 is configured to its non-default value.
1848 (`#446 <https://github.com/git-cola/git-cola/issues/446>`_)
1853 * Diff syntax highlighting was improved to handle more edge cases
1854 and false positives.
1855 (`#467 <https://github.com/git-cola/git-cola/pull/467>`_)
1857 * Setting commands in the interactive rebase editor was fixed.
1858 (`#472 <https://github.com/git-cola/git-cola/issues/472>`_)
1860 * git-cola no longer clobbers the Ctrl+Backspace text editing shortcut
1861 in the commit message editor.
1862 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1864 * The copy/paste clipboard now persists after `git cola` exits.
1865 (`#484 <https://github.com/git-cola/git-cola/issues/484>`_)
1875 * Fixed the "Sign off" feature in the commit message editor.
1883 Usability, bells and whistles
1884 -----------------------------
1885 * Double-click will now choose a commit in the "Select commit" dialog.
1887 * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the
1888 commit message when a merge is in-progress. Upon refresh, `git cola` will
1889 now detect when a merge has completed and reset the commit message back to
1890 its previous state. It is only reset if the editor contains a message
1891 that was read from the file and has not been manually edited by the user.
1893 * The commit message editor's context menu now has a "Clear..." action for
1894 clearing the message across both the summary and description fields.
1896 * Traditional Chinese (Taiwan) translation updates.
1898 * The system theme's icons are now used wherever possible.
1899 (`#458 <https://github.com/git-cola/git-cola/pull/458>`_)
1903 * The stash viewer now uses ``git show --no-ext-diff`` to avoid running
1904 user-configured diff tools.
1906 * `git cola` now uses the `setsid()` system call to ensure that the
1907 `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing
1908 changes using `git`. The askpass helpers will now be used even when
1909 `git cola` is launched from a terminal.
1911 The behavior without `setsid()` is that `git cola` can appear to hang while
1912 pushing changes. The hang happens when `git` prompts the user for a
1913 password using the terminal, but the user never sees the prompt. `setsid()`
1914 detaches the terminal, which ensures that the askpass helpers are used.
1915 (`#218 <https://github.com/git-cola/git-cola/issues/218>`_)
1916 (`#262 <https://github.com/git-cola/git-cola/issues/262>`_)
1917 (`#377 <https://github.com/git-cola/git-cola/issues/377>`_)
1919 * `git dag`'s file list tool was updated to properly handle unicode paths.
1921 * `gnome-terminal` is no longer used by default when `cola.terminal` is unset.
1922 It is broken, as was detailed in #456.
1923 (`#456 <https://github.com/git-cola/git-cola/issues/456>`_)
1925 * The interactive rebase feature was not always setting `$GIT_EDITOR`
1926 to the value of `gui.editor`, thus there could be instances where rebase
1927 will seem to not stop, or hang, when performing "reword" actions.
1929 We now set the `$GIT_EDITOR` environment variable when performing the
1930 "Continue", "Skip", and "Edit Todo" rebase actions so that the correct
1931 editor is used during the rebase.
1932 (`#445 <https://github.com/git-cola/git-cola/issues/445>`_)
1936 * `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y"
1937 version number. Most of our releases tend to contain new features.
1944 Usability, bells and whistles
1945 -----------------------------
1946 * Updated zh_TW translations.
1948 * `git cola rebase` now defaults to `@{upstream}`, and generally uses the same
1949 CLI syntax as `git rebase`.
1951 * The commit message editor now allows you to bypass commit hooks by selecting
1952 the "Bypass Commit Hooks" option. This is equivalent to passing the
1953 `--no-verify` option to `git commit`.
1954 (`#357 <https://github.com/git-cola/git-cola/issues/357>`_)
1956 * We now prevent the "Delete Files" action from creating a dialog that does
1958 (`#378 <https://github.com/git-cola/git-cola/issues/378>`_)
1960 * `git xbase` learned to edit rebase instruction sheets that contain
1963 * The diff colors are now configurable. `cola.color.{text,add,remove,header}`
1964 can now be set with 6-digit hexadecimal colors.
1965 See the `git cola manual <https://git-cola.readthedocs.io/en/latest/git-cola.html#configuration-variables>_`
1968 * Improved hotkey documentation.
1972 * `git cola` will now allow starting an interactive rebase with a dirty
1973 worktree when `rebase.autostash` is set.
1974 (`#360 <https://github.com/git-cola/git-cola/issues/360>`_)
1981 Usability, bells and whistles
1982 -----------------------------
1983 * A new "Find files" widget was added, and can be activated by
1984 using the `Ctrl+t` or `t` hotkeys.
1986 * A new `git cola find` sub-command was added for finding files.
1988 * `git cola` now remembers the text cursor's position when staging
1989 interactively with the keyboard. This makes it easier to use the keyboard
1990 arrows to select and stage lines.
1992 * The completion widgets will now select the top completion item
1993 when `Enter` or `Return` are pressed.
1995 * You can now refresh using `F5` in addition to the existing `Ctrl+R` hotkey.
1999 * `git cola` now passes `--no-abbrev-commit` to `git log` to override
2000 having `log.abbrevCommit = true` set in `.gitconfig`.
2007 Usability, bells and whistles
2008 -----------------------------
2009 * `git dag` now forwards all unknown arguments along to `git log`.
2010 (`#389 <https://github.com/git-cola/git-cola/issues/389>`_)
2012 * Line-by-line interactive staging was made more robust.
2013 (`#399 <https://github.com/git-cola/git-cola/pull/399>`_)
2015 * "Bookmarks" was renamed to "Favorites".
2016 (`#392 <https://github.com/git-cola/git-cola/issues/392>`_)
2018 * Untracked files are now displayed using a unique icon.
2019 (`#388 <https://github.com/git-cola/git-cola/pull/388>`_)
2023 * `git dag` was triggering a traceback on Fedora when parsing Git logs.
2024 (`bz #181676 <https://bugzilla.redhat.com/show_bug.cgi?id=1181686>`_)
2026 * inotify expects unicode paths on Python3.
2027 (`#393 <https://github.com/git-cola/git-cola/pull/393>`_)
2029 * Untracked files are now assumed to be utf-8 encoded.
2030 (`#401 <https://github.com/git-cola/git-cola/issues/401>`_)
2037 Usability, bells and whistles
2038 -----------------------------
2039 * `git cola` can now create GPG-signed commits and merges.
2040 See the documentation for details about setting up a GPG agent.
2041 (`#149 <https://github.com/git-cola/git-cola/issues/149>`_)
2043 * The status widget learned to copy relative paths when `Ctrl+x` is pressed.
2044 (`#358 <https://github.com/git-cola/git-cola/issues/358>`_)
2046 * Custom GUI actions can now define their own keyboard shortcuts by
2047 setting `guitool.$name.shortcut` to a string understood by Qt's
2048 `QAction::setShortcut()` API, e.g. `Alt+X`.
2050 `Qt docs <http://qt-project.org/doc/qt-4.8/qkeysequence.html#QKeySequence-2>`_
2051 for more details about the supported values.
2053 * `git cola` learned to rename branches.
2054 (`#364 <https://github.com/git-cola/git-cola/pull/364>`_)
2055 (`#278 <https://github.com/git-cola/git-cola/issues/278>`_)
2057 * `git dag` now has a "Show history" context menu which can be used to filter
2058 history using the selected paths.
2062 * `sphinxtogithub.py` was fixed for Python3.
2063 (`#353 <https://github.com/git-cola/git-cola/pull/353>`_)
2065 * The commit that changed how we read remotes from `git remote`
2066 to parsing `git config` was reverted since it created problems
2069 * Fixed a crash when using the `rebase edit` feature.
2070 (`#351 <https://github.com/git-cola/git-cola/issues/351>`_)
2072 * Better drag-and-drop behavior when dropping into gnome-terminal.
2073 (`#373 <https://github.com/git-cola/git-cola/issues/373>`_)
2077 * The `git-cola-folder-handler.desktop` file handler was fixed
2078 to pass validation by `desktop-file-validate`.
2079 (`#356 <https://github.com/git-cola/git-cola/issues/356>`_)
2081 * The `git.svg` icon was renamed to `git-cola.svg`, and `git cola` was taught
2082 to prefer icons from the desktop theme when available.
2089 Usability, bells and whistles
2090 -----------------------------
2091 * New hotkey: `Ctrl+Shift+M` merges branches.
2093 * New hotkey: `Ctrl+R` refreshes the DAG viewer.
2094 (`#347 <https://github.com/git-cola/git-cola/issues/347>`_)
2098 * We now use `git config` to parse the list of remotes
2099 instead of parsing the output of `git remote`, which
2100 is a Git porcelain and should not be used by scripts.
2102 * Avoid "C++ object has been deleted" errors from PyQt4.
2103 (`#346 <https://github.com/git-cola/git-cola/issues/346>`_)
2107 * The `make install` target now uses `install` instead of `cp`.
2114 Usability, bells and whistles
2115 -----------------------------
2116 * Updated Brazilian Portuguese translation.
2118 * The status and browse widgets now allow drag-and-drop into
2119 external applications.
2120 (`#335 <https://github.com/git-cola/git-cola/issues/335>`_)
2122 * We now show a progress bar when cloning repositories.
2123 (`#312 <https://github.com/git-cola/git-cola/issues/312>`_)
2125 * The bookmarks widget was simplified to not need a
2127 (`#289 <https://github.com/git-cola/git-cola/issues/289>`_)
2129 * Updated Traditional Chinese translation.
2131 * We now display a warning when trying to rebase with uncommitted changes.
2132 (`#338 <https://github.com/git-cola/git-cola/issues/338>`_)
2134 * The status widget learned to filter paths.
2135 `Ctrl+Shift+S` toggles the filter widget.
2136 (`#337 <https://github.com/git-cola/git-cola/issues/337>`_)
2137 (`#339 <https://github.com/git-cola/git-cola/pull/339>`_)
2139 * The status widget learned to move files to the trash
2140 when the `send2trash <https://github.com/hsoft/send2trash>`_
2141 module is installed.
2142 (`#341 <https://github.com/git-cola/git-cola/issues/341>`_)
2144 * "Recent repositories" is now a dedicated widget.
2145 (`#342 <https://github.com/git-cola/git-cola/issues/342>`_)
2147 * New Spanish translation thanks to Pilar Molina Lopez.
2148 (`#344 <https://github.com/git-cola/git-cola/pull/344>`_)
2152 * Newly added remotes are now properly seen by the fetch/push/pull dialogs.
2153 (`#343 <https://github.com/git-cola/git-cola/issues/343>`_)
2160 Usability, bells and whistles
2161 -----------------------------
2162 * New Brazilian Portuguese translation thanks to Vitor Lobo.
2164 * New Indonesian translation thanks to Samsul Ma'arif.
2166 * Updated Simplified Chinese translation thanks to Zhang Han.
2168 * `Ctrl+Backspace` is now a hotkey for "delete untracked files" in
2171 * Fetch/Push/Pull dialogs now use the configured remote of the current
2173 (`#324 <https://github.com/git-cola/git-cola/pull/324>`_)
2177 * We now use `os.getcwd()` on Python3.
2178 (`#316 <https://github.com/git-cola/git-cola/pull/316>`_)
2179 (`#326 <https://github.com/git-cola/git-cola/pull/326>`_)
2181 * The `Ctrl+P` hotkey was overloaded to both "push" and "cherry-pick",
2182 so "cherry-pick" was moved to `Ctrl+Shift+C`.
2184 * Custom GUI tools with mixed-case names are now properly supported.
2186 * "Diff Region" is now referred to as "Diff Hunk" for consistency
2187 with common terminology from diff/patch tools.
2188 (`#328 <https://github.com/git-cola/git-cola/issues/328>`_)
2190 * git-cola's test suite is now portable to MS Windows.
2191 (`#332 <https://github.com/git-cola/git-cola/pull/332>`_)
2198 Usability, bells and whistles
2199 -----------------------------
2200 * We now handle the case when inotify `add_watch()` fails
2201 and display instructions on how to increase the number of watches.
2202 (`#263 <https://github.com/git-cola/git-cola/issues/263>`_)
2204 * New and improved zh_TW localization thanks to V字龍(Vdragon).
2205 (`#265 <https://github.com/git-cola/git-cola/pull/265>`_)
2206 (`#267 <https://github.com/git-cola/git-cola/pull/267>`_)
2207 (`#268 <https://github.com/git-cola/git-cola/pull/268>`_)
2208 (`#269 <https://github.com/git-cola/git-cola/issues/269>`_)
2209 (`#270 <https://github.com/git-cola/git-cola/pull/270>`_)
2210 (`#271 <https://github.com/git-cola/git-cola/pull/271>`_)
2211 (`#272 <https://github.com/git-cola/git-cola/pull/272>`_)
2213 * New hotkeys: `Ctrl+F` for fetch, `Ctrl+P` for push,
2214 and `Ctrl+Shift+P` for pull.
2216 * The bookmarks widget's context menu actions were made clearer.
2217 (`#281 <https://github.com/git-cola/git-cola/issues/281>`_)
2219 * The term "Staging Area" is used consistently in the UI
2220 to allow for better localization.
2221 (`#283 <https://github.com/git-cola/git-cola/issues/283>`_)
2223 * The "Section" term is now referred to as "Diff Region"
2225 (`#297 <https://github.com/git-cola/git-cola/issues/297>`_)
2227 * The localization documentation related to the LANGUAGE
2228 environment variable was improved.
2229 (`#293 <https://github.com/git-cola/git-cola/pull/293>`_)
2231 * The "Actions" panel now contains tooltips for each button
2232 in case the button labels gets truncated by Qt.
2233 (`#292 <https://github.com/git-cola/git-cola/issues/292>`_)
2235 * Custom `git config`-defined actions can now be run in the
2236 background by setting `guitool.<name>.background` to `true`.
2240 * We now use bold fonts instead of SmallCaps to avoid
2241 artifacts on several configurations.
2243 * We now pickup `user.email`, `cola.tabwidth`, and similar settings
2244 when defined in /etc/gitconfig.
2245 (`#259 <https://github.com/git-cola/git-cola/issues/259>`_)
2247 * Better support for unicode paths when using inotify.
2248 (`bz #1104181 <https://bugzilla.redhat.com/show_bug.cgi?id=1104181>`_)
2250 * Unicode fixes for non-ascii locales.
2251 (`#266 <https://github.com/git-cola/git-cola/issues/266>`_)
2252 (`#273 <https://github.com/git-cola/git-cola/issues/273>`_)
2253 (`#276 <https://github.com/git-cola/git-cola/issues/276>`_)
2254 (`#282 <https://github.com/git-cola/git-cola/issues/282>`_)
2255 (`#298 <https://github.com/git-cola/git-cola/issues/298>`_)
2256 (`#302 <https://github.com/git-cola/git-cola/issues/302>`_)
2257 (`#303 <https://github.com/git-cola/git-cola/issues/303>`_)
2258 (`#305 <https://github.com/git-cola/git-cola/issues/305>`_)
2260 * Viewing history from the file browser was fixed for Python3.
2261 (`#274 <https://github.com/git-cola/git-cola/issues/274>`_)
2263 * setup.py was fixed to install the `*.rst` documentation.
2264 (`#279 <https://github.com/git-cola/git-cola/issues/279>`_)
2266 * Patch export was fixed for Python3.
2267 (`#290 <https://github.com/git-cola/git-cola/issues/290>`_)
2269 * Fixed adding a bookmark with trailing slashes.
2270 (`#295 <https://github.com/git-cola/git-cola/pull/295>`_)
2272 * The default `git dag` layout is now setup so that its widgets
2273 can be freely resized on Linux.
2274 (`#299 <https://github.com/git-cola/git-cola/issues/299>`_)
2276 * Invalid tag names are now reported when creating tags.
2277 (`#296 <https://github.com/git-cola/git-cola/pull/296>`_)
2284 Usability, bells and whistles
2285 -----------------------------
2286 * `git cola` no longer prompts after successfully creating a new branch.
2287 (`#251 <https://github.com/git-cola/git-cola/pull/251>`_)
2289 * Hitting enter on simple dialogs now accepts them.
2290 (`#255 <https://github.com/git-cola/git-cola/pull/255>`_)
2294 * `git dag` no longer relies on `sys.maxint`, which is
2295 not available in Python3.
2296 (`#249 <https://github.com/git-cola/git-cola/issues/249>`_)
2298 * Python3-related fixes.
2299 (`#254 <https://github.com/git-cola/git-cola/pull/254>`_)
2301 * Python3-on-Windows-related fixes.
2302 (`#250 <https://github.com/git-cola/git-cola/pull/250>`_)
2303 (`#252 <https://github.com/git-cola/git-cola/pull/252>`_)
2304 (`#253 <https://github.com/git-cola/git-cola/pull/253>`_)
2306 * Switching repositories using the bookmarks widget was not
2307 refreshing the inotify watcher.
2308 (`#256 <https://github.com/git-cola/git-cola/pull/256>`_)
2310 * Special commit messages trailers (e.g. "Acked-by:") are now special-cased to
2311 fix word wrapping lines that start with "foo:".
2312 (`#257 <https://github.com/git-cola/git-cola/issues/257>`_)
2314 * `git dag` sometimes left behind selection artifacts.
2315 We now refresh the view to avoid them.
2316 (`#204 <https://github.com/git-cola/git-cola/issues/204>`_)
2323 Usability, bells and whistles
2324 -----------------------------
2325 * Better inotify support for file creation and deletion.
2326 (`#240 <https://github.com/git-cola/git-cola/issues/240>`_)
2328 * `git cola` now supports the X11 Session Management Protocol
2329 and remembers its state across logout/reboot.
2330 (`#164 <https://github.com/git-cola/git-cola/issues/164>`_)
2332 * `git cola` has a new icon.
2333 (`#190 <https://github.com/git-cola/git-cola/issues/190>`_)
2337 * Building the documentation no longer requires `asciidoc`.
2338 We now use `Sphinx <http://sphinx-doc.org/>`_ for building
2339 html documentation and man pages.
2343 * Reworked the git-dag gravatar icon code to avoid a unicode
2346 * Commit message line-wrapping was made to better match the GUI editor.
2347 (`#242 <https://github.com/git-cola/git-cola/issues/242>`_)
2349 * Better support for Python3 on Windows
2350 (`#246 <https://github.com/git-cola/git-cola/issues/246>`_)
2354 * git-cola no longer depends on Asciidoc for building its documentation
2355 and man-pages. We now depend on [Sphinx](http://sphinx-doc.org/) only.
2362 Usability, bells and whistles
2363 -----------------------------
2364 * Some context menu actions are now hidden when selected
2366 (`#238 <https://github.com/git-cola/git-cola/issues/238>`_)
2370 * The build-git-cola.sh contrib script was improved.
2371 (`#235 <https://github.com/git-cola/git-cola/pull/235>`_)
2373 * Non-ascii worktrees work properly again.
2374 (`#234 <https://github.com/git-cola/git-cola/issues/234>`_)
2376 * The browser now guards itself against missing files.
2377 (`bz #1041378 <https://bugzilla.redhat.com/show_bug.cgi?id=1071378>`_)
2379 * Saving widget state now works under Python3.
2380 (`#236 <https://github.com/git-cola/git-cola/pull/236>`_)
2389 * git-cola now runs on Python 3 thanks to Virgil Dupras.
2390 (`#233 <https://github.com/git-cola/git-cola/pull/233>`_)
2392 * Python 2.6, 2.7, and 3.2+ are now supported.
2393 Python 2.5 is no longer supported.
2397 * i18n test fixes thanks to Virgil Dupras.
2398 (`#231 <https://github.com/git-cola/git-cola/pull/231>`_)
2400 * git-cola.app build fixes thanks to Maicon D. Filippsen.
2401 (`#230 <https://github.com/git-cola/git-cola/pull/230>`_)
2403 * Lots of pylint improvements thanks to Alex Chernetz.
2404 (`#229 <https://github.com/git-cola/git-cola/pull/229>`_)
2411 Usability, bells and whistles
2412 -----------------------------
2413 * The new `Bookmarks` tool makes it really easy to switch between repositories.
2415 * There is now a dedicated dialog for applying patches.
2416 See the ``File -> Apply Patches`` menu item.
2417 (`#215 <https://github.com/git-cola/git-cola/issues/215>`_)
2419 * A new `git cola am` sub-command was added for applying patches.
2423 * Fixed a typo that caused inotify events to be silently ignored.
2425 * Fixed the sys.path setup for Mac OS X (Homebrew).
2426 (`#221 <https://github.com/git-cola/git-cola/issues/221>`_)
2428 * Lots of pylint fixes thanks to Alex Chernetz.
2435 Usability, bells and whistles
2436 -----------------------------
2437 * `git cola --amend` now starts the editor in `amend` mode.
2438 (`#187 <https://github.com/git-cola/git-cola/issues/187>`_)
2440 * Multiple lines of text can now be pasted into the `summary` field.
2441 All text beyond the first newline will be automatically moved to the
2442 `extended description` field.
2443 (`#212 <https://github.com/git-cola/git-cola/issues/212>`_)
2447 * Stray whitespace in `.git` files is now ignored.
2448 (`#213 <https://github.com/git-cola/git-cola/issues/213>`_)
2450 * Fix "known incorrect sRGB profile" in `staged-item.png`.
2451 (`gentoo-devel message #85066
2452 <http://comments.gmane.org/gmane.linux.gentoo.devel/85066>`_)
2461 * Fix a traceback when `git push` fails.
2462 (`bz #1034778 <https://bugzilla.redhat.com/show_bug.cgi?id=1034778>`_)
2466 * Most of the git-cola sub-packages have been removed.
2467 The only remaining packages are `cola`, `cola.models`,
2470 * The translation file for Simplified Chinese was renamed
2472 (`#209 <https://github.com/git-cola/git-cola/issues/209>`_)
2481 * `git cola version --brief` now prints the brief version number.
2485 * Resurrected the "make dist" target, for those that prefer to create
2488 * Fixed the typo that broke the preferences dialog.
2495 Usability, bells and whistles
2496 -----------------------------
2497 * We now ship a full-featured interactive `git rebase` editor.
2498 The rebase todo file is edited using the `git xbase` script which
2499 is provided at `$prefix/share/git-cola/bin/git-xbase`.
2500 This script can be used standalone by setting the `$GIT_SEQUENCE_EDITOR`
2501 before running `git rebase --interactive`.
2502 (`#1 <https://github.com/git-cola/git-cola/issues/1>`_)
2504 * Fixup commit messages can now be loaded from the commit message editor.
2506 * Tool widgets can be locked in place by using the "Tools/Lock Layout"
2508 (`#202 <https://github.com/git-cola/git-cola/issues/202>`_)
2510 * You can now push to several remotes simultaneously by selecting
2511 multiple remotes in the "Push" dialog.
2512 (`#148 <https://github.com/git-cola/git-cola/issues/148>`_)
2514 * The `grep` tool learned to search using three different modes:
2515 basic regular expressions (default), extended regular expressions,
2520 * `git cola` now depends on the `argparse` Python module.
2521 This module is part of the stdlib in Python 2.7 and must
2522 be installed separately when using Python 2.6 and below.
2526 * Support unicode in the output from `fetch`, `push`, and `pull`.
2533 Usability, bells and whistles
2534 -----------------------------
2535 * We now detect when the editor or history browser are misconfigured.
2536 (`#197 <https://github.com/git-cola/git-cola/issues/197>`_)
2537 (`bz #886826 <https://bugzilla.redhat.com/show_bug.cgi?id=886826>`_)
2539 * Display of untracked files can be disabled from the Preferences dialog
2540 or by setting the `gui.displayuntracked` configuration variable to `false`.
2541 (`Git Mailing List on 2013-08-21
2542 <https://public-inbox.org/git/20130821032913.GA6092@wheezy.local/>`_)
2546 * Unicode stash names are now supported
2547 (`#198 <https://github.com/git-cola/git-cola/issues/198>`_)
2549 * The diffs produced when reverting workspace changes were made more robust.
2556 Usability, bells and whistles
2557 -----------------------------
2558 * Brand new German translation thanks to Sven Claussner.
2560 * The "File" menu now provides a "New Repository..." menu action.
2562 * `git dag` now uses a dock-widget interface so that its widgets can
2563 be laid-out and arranged. Customizations are saved and restored
2564 the next time `git dag` is launched.
2566 * `git dag` now has a "Zoom Best Fit" button next alongside the
2567 "Zoom In" and "Zoom Out" buttons.
2569 * `Ctrl+L` now focuses the "Search" field in the `git dag` tool.
2571 * Right-clicking in the "diff" viewer now updates the cursor position
2572 before performing actions, which makes it much easier to click around
2573 and selectively stage sections. Previously, the current cursor position
2574 was used which meant that it required two clicks (left-click to update
2575 the position followed by right-click to get the context menu) for the
2576 desired section to be used. This is now a single right-click operation.
2578 * The `Ctrl+D` "Launch Diff Tool" action learned to automatically choose
2579 between `git difftool` and `git mergetool`. If the file is unmerged then
2580 we automatically launch `git mergetool` on the path, otherwise we use
2581 `git difftool`. We do this because `git difftool` is not intended to
2582 be used on unmerged paths. Automatically using `git mergetool` when
2583 appropriate is the most intuitive and muscle-memory-friendly thing to do.
2585 * You can now right-click on folders in your standard file browser
2586 and choose "Open With -> Git Cola" (Linux-only).
2590 * Python 2.6 on Mac OS X Snow Leopard does not provide a namedtuple
2591 at `sys.version_info`. We now avoid using that variable for better
2594 * We now read the user's Git configuration from `~/.config/git/config`
2595 if that file is available, otherwise we use the traditional `~/.gitconfig`
2596 path, just like Git itself.
2598 * Some edge cases were fixed when applying partial/selected diffs.
2600 * The diff viewer is now properly cleared when refreshing.
2601 (`#194 <https://github.com/git-cola/git-cola/issues/194>`_)
2608 Usability, bells and whistles
2609 -----------------------------
2610 * The diff viewer now has an "Options" menu which can be
2611 used to set "git diff" options. This can be used to
2612 ignore whitespace changes or to show a change with its
2613 surrounding function as context.
2614 (`#150 <https://github.com/git-cola/git-cola/issues/150>`_)
2616 * `git cola` now remembers your commit message and will restore it
2617 when `git cola` is restarted.
2618 (`#175 <https://github.com/git-cola/git-cola/pull/175>`_)
2620 * `Ctrl+M` can now be used to toggle the "Amend last commit"
2621 checkbox in the commit message editor.
2622 (`#161 <https://github.com/git-cola/git-cola/pull/161>`_)
2624 * Deleting remote branches can now be done from the "Branch" menu.
2625 (`#152 <https://github.com/git-cola/git-cola/issues/152>`_)
2627 * The commit message editor now has a built-in spell checker.
2631 * We now avoid invoking external diffs when showing diffstats.
2632 (`#163 <https://github.com/git-cola/git-cola/pull/163>`_)
2634 * The `Status` tool learned to reselect files when refreshing.
2635 (`#165 <https://github.com/git-cola/git-cola/issues/165>`_)
2637 * `git cola` now remembers whether it has been maximized and will restore the
2638 maximized state when `git cola` is restarted.
2639 (`#172 <https://github.com/git-cola/git-cola/issues/172>`_)
2641 * Performance is now vastly improved when staging hundreds or
2644 * `git cola` was not correctly saving repo-specific configuration.
2645 (`#174 <https://github.com/git-cola/git-cola/issues/174>`_)
2647 * Fix a UnicodeDecode in sphinxtogithub when building from source.
2655 Usability, bells and whistles
2656 -----------------------------
2657 * We now automatically remove missing repositories from the
2658 "Select Repository" dialog.
2659 (`#145 <https://github.com/git-cola/git-cola/issues/145>`_)
2661 * A new `git cola diff` sub-command was added for diffing changed files.
2665 * The inotify auto-refresh feature makes it difficult to select text in
2666 the "diff" editor when files are being continually modified by another
2667 process. The auto-refresh causes it to lose the currently selected text,
2668 which is not wanted. We now avoid this problem by saving and restoring
2669 the selection when refreshing the editor.
2670 (`#155 <https://github.com/git-cola/git-cola/issues/155>`_)
2672 * More strings have been marked for l10n.
2673 (`#157 <https://github.com/git-cola/git-cola/issues/157>`_)
2675 * Fixed the Alt+D Diffstat shortcut.
2676 (`#159 <https://github.com/git-cola/git-cola/issues/159>`_)
2680 * Better error handling when cloning repositories.
2682 We were not handling the case where a git URL has
2683 no basename, e.g. `https://git.example.com/`.
2684 `git cola` originally rejected these URLs instead of
2685 allowing users to clone them. It now allows these URLs
2686 when they point to valid git repositories.
2688 Additionally, `git cola` learned to echo the errors
2689 reported by `git clone` when it fails.
2690 (`#156 <https://github.com/git-cola/git-cola/issues/156>`_)
2698 Usability, bells and whistles
2699 -----------------------------
2700 * `git dag` got a big visual upgrade.
2702 * `Ctrl+G` now launches the "Grep" tool.
2704 * `Ctrl+D` launches difftool and `Ctrl+E` launches your editor
2705 when in the diff panel.
2707 * git-cola can now be told to use an alternative language.
2708 For example, if the native language is German and we want git-cola to
2709 use English then we can create a `~/.config/git-cola/language` file with
2710 "en" as its contents: ``echo en >~/.config/git-cola/language``
2711 (`#140 <https://github.com/git-cola/git-cola/issues/140>`_)
2713 * A new `git cola merge` sub-command was added for merging branches.
2715 * Less blocking in the main UI
2719 * Autocomplete issues on KDE
2720 (`#144 <https://github.com/git-cola/git-cola/issues/144>`_)
2722 * The "recently opened repositories" startup dialog did not
2723 display itself in the absence of bookmarks.
2724 (`#139 <https://github.com/git-cola/git-cola/issues/139>`_)
2732 Usability, bells and whistles
2733 -----------------------------
2734 * `git cola` learned to honor `.gitattributes` when showing and
2735 interactively applying diffs. This makes it possible to store
2736 files in git using a non-utf-8 encoding and `git cola` will
2737 properly accept them. This must be enabled by settings
2738 `cola.fileattributes` to true, as it incurs a small performance
2740 (`#96 <https://github.com/git-cola/git-cola/issues/96>`_)
2742 * `git cola` now wraps commit messages at 72 columns automatically.
2743 This is configurable using the `cola.linebreak` variable to enable/disable
2744 the feature, and `cola.textwidth` to configure the limit.
2745 (`#133 <https://github.com/git-cola/git-cola/issues/133>`_)
2747 * A new "Open Recent" sub-menu was added to the "File" menu.
2748 This makes it easy to open a recently-edited repository.
2749 (`#135 <https://github.com/git-cola/git-cola/issues/135>`_)
2751 * We now show a preview for untracked files when they are clicked
2752 using the `Status` tool.
2753 * A new "Open Using Default Application" action was added to the
2754 `Status` tool. It is activated using either `Spacebar` or through
2755 the context menu. This action uses `xdg-open` on Linux and
2757 * A new "Open Parent Directory" action was added to the `Status` tool.
2758 It is activated using either `Shift+Spacebar` or through the
2760 * `git dag` learned to honor the `log.date` git configuration variable.
2761 This makes the date display follow whatever format the user has
2763 * A new `git cola config` sub-command was added for quickly
2764 tweaking `git cola`'s git configuration settings.
2765 * Some small usability tweaks -- some user confirmation prompts
2766 were defaulting to "Cancel" when they should have been defaulting
2767 to the affirmative option instead.
2771 * Properly handle arbitrarily-named branches.
2772 * We went back to launching `git mergetool` using an xterm.
2773 The reason is that there are a couple of places where `git mergetool`
2774 requires a terminal for user interaction not covered by `--no-prompt`.
2775 * We now properly handle an edge case when applying short diffs at
2776 the start of a file.
2784 Usability, bells and whistles
2785 -----------------------------
2786 * New and improved `grep` mode lets you instantly find and edit files.
2787 * New `git cola grep` standalone mode.
2788 * Support for passing arguments to the configured editors, e.g. `gvim -p`
2789 This makes it possible to select multiple files in the status
2790 window and use `Ctrl-e` to edit them all at once.
2791 * Remote operations now prompt on errors only.
2792 * The `Tab` key now jumps to the extended description when editing the summary.
2793 * More shortcut key labels and misc. UX improvements.
2797 * Selecting an item no longer copies its filename to the copy/paste buffer.
2798 `Ctrl-c` or the "Copy" context-menu action can be used instead.
2799 * The repository monitoring feature on Windows learned to ignore
2800 changes within the ".git" directory. Thanks to Andreas Sommer.
2801 (`#120 <https://github.com/git-cola/git-cola/issues/120>`_)
2809 Usability, bells and whistles
2810 -----------------------------
2811 * `git dag` learned to color-code branchy edges.
2812 The edge colors change when a new branch is detected,
2813 which makes the history much easier to follow.
2814 A huge thanks to Uri Okrent for making it happen.
2816 * New GUI for editing remote repositories.
2818 * New `git cola archive` and `git cola remote` sub-commands.
2820 * `git cola browser` learned an 'Untrack' command.
2822 * The diff editor learned to staged/unstaged while amending.
2824 * The status tool can now scroll horizontally.
2826 * New git repositories can be created by clicking 'New' on the
2827 `git cola --prompt` startup screen.
2835 Usability, bells and whistles
2836 -----------------------------
2837 * Auto-completion was added to more tools.
2839 * `git dag` is easier to use on smaller displays -- the author
2840 field elides its text which allows for a more compact display.
2842 * Selected commits in `git dag` were made more prominent and
2845 * 'Create Branch' learned to fetch remote branches and uses a
2846 background thread to do so.
2848 * User-configured GUI tools are listed alphabetically in the 'Actions' menu.
2850 * The 'Pull' dialog remembers the value of the 'Rebase' checkbox
2851 between invocations.
2861 * Detect Homebrew so that OS X users do not need to set PYTHONPATH.
2863 * `git dag` can export patches again.
2871 Usability, bells and whistles
2872 -----------------------------
2873 * The 'Classic' tool was renamed to 'Browser' and learned to
2874 limit history to the current branch.
2876 * `git dag` learned about gravatar and uses it to show images
2879 * `git dag` learned to use OpenGL for rendering resulting in
2880 much faster rendering.
2882 * More dialogs learned vim-style keyboard shortcuts.
2884 * The commit message editor learned better arrow key navigation.
2892 Usability, bells and whistles
2893 -----------------------------
2894 * `git cola` learned a few new sub commands:
2902 * `Return` in the summary field jumps to the extended description.
2904 * `Ctrl+Return` is now a shortcut for 'Commit'.
2906 * Better French translation for 'Sign-off'.
2908 * The 'Search' widget now has a much simpler and streamlined
2911 * vim-style `h,j,k,l` navigation shortcuts were added to the DAG widget.
2913 * `git dag` no longer prompts for files when diffing commits if the
2914 text field contains paths.
2916 * General user interface and performance improvements.
2920 * The diff viewer no longer changes font size when holding `Control`
2921 while scrolling with the mouse wheel.
2923 * Files with a typechange (e.g. symlinks that become files, etc.)
2924 are now correctly identified as being modified.
2928 * The `cola.controllers` and `cola.views` packages were removed.
2936 Usability, bells and whistles
2937 -----------------------------
2938 * `git cola` can now launch sub commands, e.g.:
2949 * `git dag` is more responsive when gathering auto-completions.
2951 * Keyboard shortcuts are displayed when the '?' key is pressed.
2953 * Various keyboard shortcuts were added for improved usability.
2955 * The status widget now lists unmerged files before modified files.
2957 * vim-style `h,j,k,l` navigation shortcuts were added to the status widget.
2959 * A 'Recently Modified Files...' tool was added.
2961 * Tools can now be hidden with `Alt + #` (where `#` is a keyboard number)
2962 and focused with `Alt + Shift + #`.
2964 * The syntax highlighting colors for diffs was made less intrusive.
2966 * The commit message editor was redesigned to have a more compact
2967 and keyboard-convenient user interface.
2969 * Keyboard shortcuts for adding a Signed-off-by (`Ctrl + i`)
2970 and creating a commit (`Ctrl + m`) were added.
2972 * The status widget was adjusted to use less screen real-estate.
2976 * Avoid updating the index when responding to inotify events.
2977 This avoids interfering with operations such as `git rebase --interactive`.
2978 (`#99 <https://github.com/git-cola/git-cola/issues/99>`_)
2982 * Create `git-dag.pyw` in the win32 installer.
2984 * win32 shortcuts now contain explicit calls to `pythonw.exe` instead of
2985 calling the `.pyw` file directly.
2989 * The 'Apply Changes from Branch...' feature was removed.
2990 `git dag`'s 'Grab File...' feature used alongside the index/worktree editor
2991 is a simpler alternative.
3001 * Further enhanced the staging/unstaging behavior in the status widget.
3002 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
3004 * Unmerged files are no longer listed as modified.
3008 The `cola-$version` tarballs on github were originally setup to
3009 have the same contents as the old tarballs hosted on tuxfamily.
3010 The `make dist` target was changed to write files to a
3011 `git-cola-$version` subdirectory and tarball.
3013 This makes the filenames consistent for the source tarball,
3014 the darwin .app tarball, and the win32 .exe installer.
3022 Usability, bells and whistles
3023 -----------------------------
3024 * Refined the staging/unstaging behavior for code reviews.
3025 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
3027 * Added more styling and icons to menus and buttons.
3029 * Adjusted some terminology to more closely match the git CLI.
3033 * Boolean `git config` settings with no value are now supported
3034 (these are not created by git these days but exist in legacy repositories).
3036 * Unicode branches and tags are supported in the "branch diff" tool.
3038 * Guard against low-memory conditions and more interrupted system calls.
3042 * Added desktop launchers for git-cola.desktop and git-dag.desktop.
3043 This replaces the old cola.desktop, so some adjustments to RPM .spec
3044 and debian/ files will be needed.
3046 * Fixed the darwin app-tarball Makefile target to create relative paths.
3050 * The `--style` option was removed. `git cola` follows the system theme
3051 so there's no need for this option these days.
3059 Usability, bells and whistles
3060 -----------------------------
3061 * Export a patch series from `git dag` into a `patches/` directory.
3063 * `git dag` learned to diff commits, slice history along paths, etc.
3065 * Added instant-preview to the `git stash` widget.
3067 * A simpler preferences editor is used to edit `git config` values.
3068 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
3069 (`#89 <https://github.com/git-cola/git-cola/issues/89>`_)
3071 * Previous commit messages can be re-loaded from the message editor.
3072 (`#33 <https://github.com/git-cola/git-cola/issues/33>`_)
3076 * Display commits with no file changes.
3077 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
3079 * Improved the diff editor's copy/paste behavior
3080 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
3084 * Bumped version number to ceil(minimum git version).
3085 `git cola` now requires `git` >= 1.6.3.
3087 * Simplified git-cola's versioning when building from tarballs
3088 outside of git. We no longer check for a 'version' file at
3089 the root of the repository. We instead keep a default version
3090 in `cola/version.py` and use it when `git cola`'s `.git` repository
3099 Usability, bells and whistles
3100 -----------------------------
3101 * inotify is much snappier and available on Windows
3102 thanks to Karl Bielefeldt.
3104 * New right-click command to add untracked files to .gitignore
3105 thanks to Audrius Karabanovas.
3107 * Stash, fetch, push, and pull usability improvements
3109 * General usability improvements
3111 * stderr is logged when applying partial diffs.
3115 * Files can be unstaged when amending.
3116 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
3118 * Show the configured remote.$remote.pushurl in the GUI
3119 (`#83 <https://github.com/git-cola/git-cola/issues/83>`_)
3121 * Removed usage of the "user" module.
3122 (`#86 <https://github.com/git-cola/git-cola/issues/86>`_)
3124 * Avoids an extra `git update-index` call during startup.
3132 Usability, bells and whistles
3133 -----------------------------
3134 * We now provide better feedback when `git push` fails.
3135 (`#69 <https://github.com/git-cola/git-cola/issues/69>`_)
3137 * The Fetch, Push, and Pull dialogs now give better feedback
3138 when interacting with remotes. The dialogs are modal and
3139 a progress dialog is used.
3143 * More unicode fixes, again. It is now possible to have
3144 unicode branch names, repository paths, home directories, etc.
3145 This continued the work initiated by Redhat's bugzilla #694806.
3147 https://bugzilla.redhat.com/show_bug.cgi?id=694806
3155 Usability, bells and whistles
3156 -----------------------------
3157 * The `git cola` desktop launchers now prompt for a repo
3158 by default. This is done by using the new `--prompt`
3159 flag which tells `git cola` to ignore any git repositories
3160 in the current directory and prompt for one instead.
3164 * More Unicode fixes for repositories and home directories with
3165 embedded unicode characters. Thanks to Christian Jann for
3166 patience and helpful bug reports.
3168 * Fix the 'Clone' button in the startup dialog.
3176 Usability, bells and whistles
3177 -----------------------------
3178 * Faster startup time! `git cola` now offloads initialization
3179 to a background thread so that the GUI appears almost instantly.
3181 * Specialized diff options for p4merge, vimdiff, araxis, emerge,
3182 and ecmerge in difftool (backported from git.git).
3186 * Fix launching commands in the background on Windows
3187 (e.g. when launching `git difftool`).
3189 * Fix unicode errors when home or repository directories contain
3191 (`#74 <https://github.com/git-cola/git-cola/issues/74>`_)
3192 (`bz #694806 <https://bugzilla.redhat.com/show_bug.cgi?id=694806>`_)
3200 Usability, bells and whistles
3201 -----------------------------
3202 * The `cola classic` tool can be now configured to be dockable.
3203 (`#56 <https://github.com/git-cola/git-cola/issues/56>`_)
3205 * The `cola classic` tool now uses visual sigils to indicate a file's status.
3206 The idea and icons were provided by Uri Okrent.
3208 * Include the 'Rescan' button in the 'Actions' widget regardless
3209 of whether inotify is installed.
3213 * Fix installation of translations per Fedora
3214 This incorporates Fedora's fix for the translations path
3215 which originally appeared in cola-1.4.3-translations.patch.
3217 * Mac OS X git-cola developers can now generate git-cola.app
3218 application bundles using 'make app-bundle'.
3222 * Fixed a stacktrace when trying to use "Get Commit Message Template"
3223 with an unconfigured "commit.template" git config variable.
3224 (`bz #67521 <https://bugzilla.redhat.com/show_bug.cgi?id=675721>`_)
3225 (`#72 <https://github.com/git-cola/git-cola/issues/72>`_)
3227 * Properly raise the main window on Mac OS X.
3229 * Properly handle staging a huge numbers of files at once.
3231 * Speed up 'git config' usage by fixing cola's caching proxy.
3233 * Guard against damaged ~/.cola files.
3241 Usability, bells and whistles
3242 -----------------------------
3243 * `git dag` now has a separate display area
3244 for displaying commit metadata. This area will soon
3245 grow additional functionality such as cherry-picking,
3250 * Fixed tests from a previous refactoring.
3252 * Guard against 'diff.external' configuration by always
3253 calling 'git diff' with the '--no-ext-diff' option.
3254 (`#67 <https://github.com/git-cola/git-cola/issues/67>`_)
3256 * Respect 'gui.diffcontext' so that cola's diff display
3257 shows the correct number of context lines.
3259 * Raise the GUI so that it is in the foreground on OS X.
3263 * We now allow distutils to rewrite cola's shebang line.
3264 This allows us to run on systems where "which python"
3265 is Python3k. This is exposed by setting the `PYTHON`
3266 Makefile variable to the location of python2.x.
3268 * git-cola.app is now a tiny download because it no longer
3269 contains Qt and PyQt. These libraries are provided as a
3271 (`Link <http://code.google.com/p/git-cola/downloads/list>`_)
3279 Usability, bells and whistles
3280 -----------------------------
3281 * Clicking on paths in the status widget copies them into the
3282 copy/paste buffer for easy middle-clicking into terminals.
3284 * `Ctrl+C` in diff viewer copies the selected diff to the clipboard.
3288 * Fixed the disappearing actions buttons on PyQt 4.7.4
3289 as reported by Arch and Ubuntu 10.10.
3290 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3292 * Fixed mouse interaction with the status widget where some
3293 items could not be de-selected.
3297 * Removed hard-coded reference to lib/ when calculating Python's
3298 site-packages directory.
3306 Usability, bells and whistles
3307 -----------------------------
3308 * Removed "single-click to (un)stage" in the status view.
3309 This is a usability improvement since we no longer perform
3310 different actions depending on where a row is clicked.
3312 * Added ability to create unsigned, annotated tags.
3316 * Updated documentation to use `cola.git` instead of `cola.gitcmd`.
3324 Usability, bells and whistles
3325 -----------------------------
3326 * Allow un/staging by right-clicking top-level items
3327 (`#57 <https://github.com/git-cola/git-cola/issues/57>`_)
3329 * Running 'commit' with no staged changes prompts to allow
3331 (`#55 <https://github.com/git-cola/git-cola/issues/55>`_)
3333 * Fetch, Push, and Pull are now available via the menus
3334 (`#58 <https://github.com/git-cola/git-cola/issues/58>`_)
3338 * Simplified the actions widget to work around a regression
3340 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3348 Usability, bells and whistles
3349 -----------------------------
3350 * `git dag` interaction was made faster.
3354 * Added '...' indicators to the buttons for
3355 'Fetch...', 'Push...', 'Pull...', and 'Stash...'.
3356 (`#51 <https://github.com/git-cola/git-cola/issues/51>`_)
3358 * Fixed a hang-on-exit bug in the cola-provided
3359 'ssh-askpass' implementation.
3367 Usability, bells and whistles
3368 -----------------------------
3369 * Staging and unstaging is faster.
3370 (`#48 <https://github.com/git-cola/git-cola/issues/48>`_)
3372 * `git dag` reads history in a background thread.
3376 * Added :data:`cola.compat.hashlib` for `Python 2.4` compatibility
3377 * Improved `PyQt 4.1.x` compatibility.
3381 * Configured menu actions use ``sh -c`` for Windows portability.
3389 Usability, bells and whistles
3390 -----------------------------
3391 * Added support for the configurable ``guitool.<tool>.*``
3392 actions as described in the ``git config`` documentation.
3393 (`git-config(1) <https://git-scm.com/docs/git-config>`_)
3394 (`#44 <https://github.com/git-cola/git-cola/issues/44>`_)
3396 This makes it possible to add new actions to `git cola`
3397 by simply editing ``~/.gitconfig``. This implements the
3398 same guitool support as `git gui`.
3400 * Introduced a stat cache to speed up `git config` and
3401 repository status checks.
3403 * Added Alt-key shortcuts to the main `git cola` interface.
3405 * The `Actions` dock widget switches between a horizontal
3406 and vertical layout when resized.
3408 * We now use ``git diff --submodule`` for submodules
3409 (used when git >= 1.6.6).
3411 * The context menu for modified submodules includes an option
3412 to launch `git cola`.
3413 (`#17 <https://github.com/git-cola/git-cola/issues/17>`_)
3415 * Prefer ``$VISUAL`` over ``$EDITOR`` when both are defined.
3416 These are used to set a default editor in lieu of `core.editor`
3419 * Force the editor to be ``gvim`` when we see ``vim``.
3420 This prevents us from launching an editor in the (typically
3421 unattached) parent terminal and creating zombie editors
3422 that cannot be easily killed.
3424 * Selections are remembered and restored across updates.
3425 This makes the `partial-staging` workflow easier since the
3426 diff view will show the updated diff after staging.
3428 * Show the path to the current repository in a tooltip
3429 over the commit message editor.
3430 (`#45 <https://github.com/git-cola/git-cola/issues/45>`_)
3432 * Log internal ``git`` commands when ``GIT_COLA_TRACE`` is defined.
3433 (`#39 <https://github.com/git-cola/git-cola/issues/39>`_)
3437 * Improved backwards compatibility for Python 2.4.
3439 * `Review mode` can now review the current branch; it no longer
3440 requires you to checkout the branch into which the reviewed
3441 branch will be merged.
3443 * Guard against `color.ui = always` configuration when using
3444 `git log` by passing ``--no-color``.
3446 * ``yes`` and ``no`` are now supported as valid booleans
3447 by the `git config` parser.
3449 * Better defaults are used for `fetch`, `push`, and `pull`..
3450 (`#43 <https://github.com/git-cola/git-cola/issues/43>`_)
3454 * Removed colon (`:`) from the applilcation name on Windows
3455 (`#41 <https://github.com/git-cola/git-cola/issues/41>`_)
3457 * Fixed bugs with the Windows installer
3458 (`#40 <https://github.com/git-cola/git-cola/issues/40>`_)
3460 * Added a more standard i18n infrastructure. The install
3461 tree now has the common ``share/locale/$lang/LC_MESSAGES/git-cola.mo``
3462 layout in use by several projects.
3464 * Started trying to accommodate Mac OSX 10.6 (Snow Leopard)
3465 in the ``darwin/`` build scripts but our tester is yet to
3466 report success building a `.app` bundle.
3468 * Replaced use of ``perl`` in Sphinx/documentation Makefile
3469 with more-portable ``sed`` constructs. Thanks to
3470 Stefan Naewe for discovering the portability issues and
3471 providing msysgit-friendly patches.
3479 Usability, bells and whistles
3480 -----------------------------
3481 * It is now possible to checkout from the index as well
3482 as from `HEAD`. This corresponds to the
3483 `Removed Unstaged Changes` action in the `Repository Status` tool.
3485 * The `remote` dialogs (fetch, push, pull) are now slightly
3488 * Bookmarks can be selected when `git cola` is run outside of a git repository.
3490 * Added more user documentation. We now include many links to
3491 external git resources.
3493 * Added `git dag` to the available tools.
3494 `git dag` is a node-based DAG history browser.
3495 It doesn't do much yet, but it's been merged so that we can start
3496 building and improving upon it.
3500 * Fixed a missing ``import`` when showing `right-click` actions
3501 for unmerged files in the `Repository Status` tool.
3503 * ``git update-index --refresh`` is no longer run every time
3504 ``git cola version`` is run.
3506 * Don't try to watch non-existent directories when using `inotify`.
3508 * Use ``git rev-parse --symbolic-full-name`` plumbing to find
3509 the name of the current branch.
3513 * The ``Makefile`` will now conditionally include a ``config.mak``
3514 file located at the root of the project. This allows for user
3515 customizations such as changes to the `prefix` variable
3516 to be stored in a file so that custom settings do not need to
3517 be specified every time on the command-line.
3519 * The build scripts no longer require a ``.git`` directory to
3520 generate the ``builtin_version.py`` module. The release tarballs
3521 now include a ``version`` file at the root of the project which
3522 is used in lieu of having the git repository available.
3523 This allows for ``make clean && make`` to function outside of
3526 * Added maintainer's ``make dist`` target to the ``Makefile``.
3528 * The built-in `simplejson` and `jsonpickle` libraries can be
3529 excluded from ``make install`` by specifying the ``standalone=true``
3530 `make` variable. For example, ``make standalone=true install``.
3531 This corresponds to the ``--standalone`` option to ``setup.py``.
3539 Usability, bells and whistles
3540 -----------------------------
3541 * We now use patience diff by default when it is available via
3542 `git diff --patience`.
3544 * Allow closing the `cola classic` tool with `Ctrl+W`.
3548 * Fixed an unbound variable error in the `push` dialog.
3552 * Don't include `simplejson` in MANIFEST.in.
3554 * Update desktop entry to read `Cola Git GUI`.
3562 This feature release adds two new features directly from
3563 `git cola`'s github issues backlog. On the developer
3564 front, further work was done towards modularizing the code base.
3566 Usability, bells and whistles
3567 -----------------------------
3568 * Dragging and dropping patches invokes `git am`
3569 (`#3 <https://github.com/git-cola/git-cola/issues/3>`_)
3571 * A dialog to allow opening or cloning a repository
3572 is presented when `git cola` is launched outside of a git repository.
3573 (`#22 <https://github.com/git-cola/git-cola/issues/22>`_)
3575 * Warn when `push` is used to create a new branch
3576 (`#35 <https://github.com/git-cola/git-cola/issues/35>`_)
3578 * Optimized startup time by removing several calls to `git`.
3583 * `git cola` is once again compatible with PyQt 4.3.x.
3587 * `cola.gitcmds` was added to factor out git command-line utilities
3589 * `cola.gitcfg` was added for interacting with `git config`
3591 * `cola.models.browser` was added to factor out repobrowser data
3603 * Fix launching external applications on Windows
3605 * Ensure that the `amend` checkbox is unchecked when switching modes
3607 * Update the status tree when amending commits
3617 * Fix Lintian warnings
3627 * Fix X11 warnings on application startup
3637 * Added missing 'Exit Diff Mode' button for 'Diff Expression' mode
3638 (`#31 <https://github.com/git-cola/git-cola/issues/31>`_)
3640 * Fix a bug when initializing fonts on Windows
3641 (`#32 <https://github.com/git-cola/git-cola/issues/32>`_)
3651 * Keep entries in sorted order in the `cola classic` tool
3653 * Fix staging untracked files
3654 (`#27 <https://github.com/git-cola/git-cola/issues/27>`_)
3656 * Fix the `show` command in the Stash dialog
3657 (`#29 <https://github.com/git-cola/git-cola/issues/29>`_)
3659 * Fix a typo when loading merge commit messages
3660 (`#30 <https://github.com/git-cola/git-cola/issues/30>`_)
3668 This release focuses on a redesign of the git-cola user interface,
3669 a tags interface, and better integration of the `cola classic` tool.
3670 A flexible interface based on configurable docks is used to manage the
3671 various cola widgets.
3673 Usability, bells and whistles
3674 -----------------------------
3675 * New GUI is flexible and user-configurable
3677 * Individual widgets can be detached and rearranged arbitrarily
3679 * Add an interface for creating tags
3681 * Provide a fallback `SSH_ASKPASS` implementation to prompt for
3682 SSH passwords on fetch/push/pull
3684 * The commit message editor displays the current row/column and
3685 warns when lines get too long
3687 * The `cola classic` tool displays upstream changes
3689 * `git cola --classic` launches `cola classic` in standalone mode
3691 * Provide more information in log messages
3695 * Inherit the window manager's font settings
3697 * Miscellaneous PyQt4 bug fixes and workarounds
3701 * Removed all usage of Qt Designer `.ui` files
3703 * Simpler model/view architecture
3705 * Selection is now shared across tools
3707 * Centralized notifications are used to keep views in sync
3709 * The `cola.git` command class was made thread-safe
3711 * Less coupling between model and view actions
3713 * The status view was rewritten to use the MVC architecture
3715 * Added more documentation and tests
3723 Usability, bells and whistles
3724 -----------------------------
3725 * Added a `cola classic` tool for browsing the entire repository
3727 * Handle diff expressions with spaces
3729 * Handle renamed files
3733 * Handle carat `^` characters in diff expressions on Windows
3735 * Worked around a PyQt 4.5/4.6 QThreadPool bug
3739 * Added a keyboard shortcuts reference page
3741 * Added developer API documentation
3745 * Fix the diff expression used when reviewing branches
3747 * Fix a bug when pushing branches
3749 * Fix X11 warnings at startup
3751 * Fix more interrupted system calls on Mac OS X
3759 Usability, bells and whistles
3760 -----------------------------
3761 * Fresh and tasty SVG logos
3763 * Added `Branch Review` mode for reviewing topic branches
3765 * Added diff modes for diffing between tags, branches,
3766 or arbitrary `git diff` expressions
3768 * The push dialog selects the current branch by default.
3769 This is in preparation for `git 1.7.0` where unconfigured `git push`
3770 will refuse to push when run without specifying the remote name
3771 and branch. See the `git` release notes for more information
3773 * Support `open` and `clone` commands on Windows
3775 * Allow saving cola UI layouts
3777 * Re-enabled `double-click-to-stage` for unmerged entries.
3778 Disabling it for unmerged items was inconsistent, though safer.
3780 * Show diffs when navigating the status tree with the keyboard
3784 * Worked around `pyuic4` bugs in the `setup.py` build script
3786 * Added Mac OSX application bundles to the download page
3796 * `git difftool` became an official git command in `git 1.6.3`.
3798 * `git difftool` learned `--no-prompt` / `-y` and a corresponding
3799 `difftool.prompt` configuration variable
3801 Usability, bells and whistles
3802 -----------------------------
3803 * Warn when `non-fast-forward` is used with fetch, push or pull
3805 * Allow `Ctrl+C` to exit cola when run from the command line
3809 * Support Unicode font names
3811 * Handle interrupted system calls
3815 * `PEP-8`-ified more of the cola code base
3821 * All resources are now installed into `$prefix/share/git-cola`.
3822 Closed Debian bug #519972
3824 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519972
3834 * Added support for Kompare in `git difftool`
3836 * Added a separate configuration namespace for `git difftool`
3838 * Added the `diff.tool` configuration variable to define the default diff tool
3840 Usability, bells and whistles
3841 -----------------------------
3842 * The stash dialog allows passing the `--keep-index` option to `git stash`
3844 * Amending a published commit warns at commit time
3846 * Simplified the file-across-revisions comparison dialog
3848 * `origin` is selected by default in fetch/push/pull
3850 * Removed the search field from the log widget
3852 * The log window moved into a drawer widget at the bottom of the UI
3854 * Log window display can be configured with
3855 `cola.showoutput` = `{never, always, errors}`. `errors` is the default.
3857 * `NOTE` -- `cola.showoutput` was removed with the GUI rewrite in 1.4.0.
3861 * Improved nose unittest usage
3865 * Added a Windows/msysGit installer
3867 * Included private versions of `simplejson` and `jsonpickle`
3868 for ease of installation and development