6 Usability, bells and whistles
7 -----------------------------
8 * Git Cola now preserves `# commentary` in commit messages by default.
9 The `commit.cleanup` Git configuration variable can be used to
10 customize this behavior. For example, if you want Git Cola to
11 strip comments (the old behavior before v4.4.0) then
12 you can run `git config --global commit.cleanup strip` or configure
13 the "Commit Message Cleanup" setting in the Preferences window.
14 (`#1330 <https://github.com/git-cola/git-cola/issues/1330>`_)
16 * `git dag` now includes completions for `git log` options in the text input field.
18 * `git dag` now provides convenient search filters when right-clicking in the
21 * A `1.25 x` Hi-DPI magnification option mode is now available in the Appearance settings.
22 (`#1313 <https://github.com/git-cola/git-cola/issues/1313>`_)
26 * `git dag` was not displaying history when refspecs were specified.
27 (`#1334 <https://github.com/git-cola/git-cola/issues/1334>`_)
31 * `brunette <https://pypi.org/project/brunette/>`_ is now being used to enforce
32 Git Cola's python code style. We were previously disabling quote normalization
33 when using `black`. Use of `brunette` allows us to enable quote normalization
34 using the single-quotes mode.
36 * The test suite now works on Windows.
37 (`#1331 <https://github.com/git-cola/git-cola/issues/1331>`_)
38 (`#1332 <https://github.com/git-cola/git-cola/pull/1332>`_)
40 * Pre-commits hooks and code modernization.
41 (`#1333 <https://github.com/git-cola/git-cola/pull/1333>`_)
51 * The pypi wheel was fixed to include `entry_points.txt`.
53 * The "Revert" command was throwing an exception after succesfully completing.
61 Usability, bells and whistles
62 -----------------------------
63 * `git dag` now displays commit metadata more similarly to `git log`.
64 The commit date is now displayed and the subject field is displayed
65 directly above the extended description.
67 * `git dag` now supports a `cola.logdate` configuration for controlling
68 the date format. The configured value is passed to `git log --date=<format>`.
69 (`#1319 <https://github.com/git-cola/git-cola/pull/1319>`_)
70 (`#1312 <https://github.com/git-cola/git-cola/issues/1312>`_)
72 * The default `patches` directory that is used when exporting patches
73 is now configurable using the `cola.patchesdirectory` configuration
74 variable and the Preferences dialog.
76 * The Diff Editor can now export the diff selection, or the current
77 diff hunk, to a `*.patch` file from the `Patches` context menu action.
79 * Existing patches can be appended to by choosing a patch file from
80 the `Append Patch` sub-menu in the `Patches` context menu action.
82 * Patches can now be applied by dragging and dropping patches files from
83 a file browser onto the diff editor. The "Apply Patches" dialog is
84 launched with the drag-and-dropped patch files.
86 * Shell completions for zsh are now provided in the source distribution.
87 See the `contrib/_git-cola` zsh completion file for more details
91 * ``QApplication::desktop()`` is no longer available on PyQt6.
92 Git Cola no longer relies on this method.
96 * Git Cola can now be installed on Windows using `winget`.
97 See the ``README.md`` file for more details.
98 (`#1318 <https://github.com/git-cola/git-cola/pull/1318>`_)
108 * Diffs for repositories with a single commit have been fixed.
109 (`#1306 <https://github.com/git-cola/git-cola/issues/1306>`_)
111 * The toolbars follow the Qt toolbar style, as they did prior to `v4.2.0`.
112 (`#1307 <https://github.com/git-cola/git-cola/issues/1307>`_)
114 * The "Checkout Branch" dialog was fixed to display all completions when first shown.
115 (`#1308 <https://github.com/git-cola/git-cola/issues/1308>`_)
123 Usability, bells and whistles
124 -----------------------------
125 * The Diff Editor can now send diffs to your favorite editor before the diffs are applied.
126 The right-click "Edit Diff ..." menu actions and the `Ctrl + Shift + S` /
127 `Ctrl + Shift + U` hotkeys send the current diff hunk, or the selected diff, to your
128 editor before they are applied to the worktree / staging area.
129 (`#1290 <https://github.com/git-cola/git-cola/pull/1290>`_)
130 (`#794 <https://github.com/git-cola/git-cola/issues/794>`_)
132 * The Diff Editor and DAG viewer can now search within their diffs using
133 `Ctrl + F` and `Ctrl + G` hotkeys.
134 (`#1116 <https://github.com/git-cola/git-cola/issues/1116>`_)
136 * A new *Diff Mode* can be used to diff and unstage edits relative to any commit.
137 (`#816 <https://github.com/git-cola/git-cola/issues/816>`_)
139 * The Commit Message Editor can now spell-check the summary field. Previously only the
140 "Extended Description..." field supported spell checking.
141 (`#633 <https://github.com/git-cola/git-cola/issues/633>`_)
142 (`#1070 <https://github.com/git-cola/git-cola/issues/1070>`_)
144 * Repositories in your "Recents" and "Favorites" can now be searched using the new
145 "Search" tool button. Quickly switch between these repositories using the `Alt + P`
146 hotkey and "Quick Open..." File menu action.
147 (`#1282 <https://github.com/git-cola/git-cola/pull/1282>`_)
149 * "Favorites", "Recents" and the startup dialog now display a case-insensitively
150 sorted list of repositories.
151 (`#1047 <https://github.com/git-cola/git-cola/issues/1047>`_)
153 * The startup dialog now has a right-click context menu that allows you to prune
154 stale entries and other actions that were not previously accessible from
156 (`#1199 <https://github.com/git-cola/git-cola/issues/1199>`_)
157 (`#1280 <https://github.com/git-cola/git-cola/pull/1280>`_)
159 * The "Copy Leading Paths" action in the Status tool's right-click "Copy" sub-menu
160 can now strip off an arbitrary number of leading paths.
161 (`#784 <https://github.com/git-cola/git-cola/issues/784>`_)
163 * The "Cherry-Pick" action now reports errors when "git cherry-pick" fails.
164 A new "Abort Cherry-Pick" action has been added for aborting a failed cherry-pick.
165 (`#1062 <https://github.com/git-cola/git-cola/issues/1062>`_)
167 * The diff text can now be quickly zoomed using `Ctrl + Mouse wheel` scroll.
168 This will quickly change the text size within the current session only.
169 (`#1029 <https://github.com/git-cola/git-cola/issues/1029>`_)
171 * The Console and Diff widgets learned to open URLs. Right-click on a line
172 that contains http URLs and context-menu actions for opening each URL
173 using your default web browser will be displayed.
174 (`#1139 <https://github.com/git-cola/git-cola/issues/1139>`_)
176 * Drag-and-drop has been improved when dragging filenames from the Status tool.
177 Dragging multiple files requires special handling to improve usability.
178 Some terminals (such as `kitty`) consume multiple file URLs by separating paths with
179 newlines. This is useful when you'd like to capture raw filenames but is less
180 convenient when dropping filenames onto a command-line. Drag with the `Alt`-modifier
181 held down to drag-and-drop filenames for command-line use. Using the `Alt` modifier
182 omits URLs so that the drag-and-drop payload includes only space-delimited,
184 (`#719 <https://github.com/git-cola/git-cola/issues/719>`_)
186 * The DAG viewer now displays the diff between the start and end commits when
187 multiple commits are selected. The diffs are displayed in the DAG's diff viewer.
188 (`#552 <https://github.com/git-cola/git-cola/issues/552>`_)
190 * The DAG viewer learned to checkout branches and initiate rebases from its right-click menu.
191 (`#1113 <https://github.com/git-cola/git-cola/issues/1113>`_)
193 * The DAG diff viewer learned to word-wrap the diff text.
194 (`#1242 <https://github.com/git-cola/git-cola/issues/1242>`_)
196 * The spelling dictionaries are now discovered dynamically at runtime.
197 `dict/words` and `dict/propernames` are now discovered via `$XDG_DATA_DIRS`
198 by the spell checker. This allows a spelling dictionary to be placed in eg.
199 `~/.local/share/dict/words` to override the default `/usr/share/dict/words`.
200 (`#873 <https://github.com/git-cola/git-cola/issues/873>`_)
202 * The File menu now has a "Patches" sub-menu with a full set of "git am" Patch actions.
204 * The Diff Editor and various Diff widgets now have a "Copy Diff" action with an
205 `Alt + Shift + C` hotkey that copies the selected diff text to the clipboard with the
206 `+`, `-` and `<Space>` diff prefix characters removed.
207 (`#1288 <https://github.com/git-cola/git-cola/issues/1288>`_)
209 * The "Revert" action for reverting commits from the DAG tool now displays error
210 messages when ``git revert`` fails.
211 (`#885 <https://github.com/git-cola/git-cola/issues/885>`_)
213 * The Diff Editor now uses an easier-to-see *block cursor* by default.
214 Disable `cola.blockcursor <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-blockcursor>`_
215 to continue using original *line cursor* by running
216 ``git config --global cola.blockcursor false``, or by editing the settings in the menu.
218 * The "Unmerged" header item in the Status tool now displays a summary list of unmerged files.
220 * The hotkeys documentation has been updated to clarify that the "Copy Commit ID"
221 action is available in several tools.
222 (`#779 <https://github.com/git-cola/git-cola/issues/779>`_)
224 * Saving files when using "Browse Other Branch" now displays errors from
225 ``git show`` when saving files from arbitrary commits.
226 (`#1065 <https://github.com/git-cola/git-cola/issues/1065>`_)
228 * The Apply Patches dialog now reports errors when patches fail to apply.
229 (`#673 <https://github.com/git-cola/git-cola/issues/673>`_)
231 * The "Status" tool now disables "Copy" actions in its context menu when no
232 files have been selected.
233 (`#697 <https://github.com/git-cola/git-cola/issues/697>`_)
235 * The "Unstage" menu item in the Status tool now uses a "Remove" icon.
236 (`#1289 <https://github.com/git-cola/git-cola/pull/1289>`_)
240 * The vendored `qtpy` module was modified to sever its dependency on the
241 `packaging.version` module. This mostly affects users that want to run
242 Git Cola directly from the the source tree outside of any virtualenv.
243 (`#1286 <https://github.com/git-cola/git-cola/issues/1286>`_)
251 Usability, bells and whistles
252 -----------------------------
253 * The rebase editor was taught to handle stacked branch workflows enabled by
254 ``git rebase --update-refs``. The ``git cola rebase`` sub-command now has
255 an ``--update-refs`` option and the menu actions display a prompt that allows
256 you to enable the updating of stacked branches.
257 (`#1261 <https://github.com/git-cola/git-cola/pull/1261>`_)
258 (`#571 <https://github.com/git-cola/git-cola/issues/571>`_)
260 * The status widget now respects `diff.ignoreSubmodules`.
261 (`#1269 <https://github.com/git-cola/git-cola/issues/1269>`_)
263 Packaging and Dependencies
264 --------------------------
265 * PyQt6 is now officially supported.
266 (`#1211 <https://github.com/git-cola/git-cola/issues/1211>`_)
267 (`#1273 <https://github.com/git-cola/git-cola/issues/1273>`_)
269 * The vendored `qtpy` library was updated to `v2.3.0`.
273 * Fixes and updates to Git Cola's CI actions.
274 (`#1278 <https://github.com/git-cola/git-cola/pull/1278>`_)
275 (`#1277 <https://github.com/git-cola/git-cola/issues/1277>`_)
285 * The "T" hotkey for "Find Files" was removed to avoid issues in some configurations.
286 (`#1270 <https://github.com/git-cola/git-cola/issues/1270>`_)
288 * Some context menus entries were erroring out on binary files.
289 (`#1271 <https://github.com/git-cola/git-cola/pull/1271>`_)
297 Usability, bells and whistles
298 -----------------------------
299 * The branches widget no longer loses its selection state in response to
300 notifications and UI actions.
301 (`#1221 <https://github.com/git-cola/git-cola/issues/1221>`_)
303 * The use of ``gravatar.com`` to fetch icons associated with author emails
304 can now be disabled by setting `git config --global cola.gravatar false`.
305 (`#933 <https://github.com/git-cola/git-cola/issues/933>`_)
309 * The config reader has been revamped to better read settings when git config
310 files are located in unexpected locations.
311 (`#927 <https://github.com/git-cola/git-cola/issues/927>`_)
312 (`#1264 <https://github.com/git-cola/git-cola/issues/1264>`_)
314 * The preferences dialog no longer throws an error when the editor has not
316 (`#1263 <https://github.com/git-cola/git-cola/issues/1263>`_)
318 * Context menu actions for staging files has been added when diffing images.
319 (`#1265 <https://github.com/git-cola/git-cola/issues/1265>`_)
321 * The stash editor now properly displays stashes with slashes ("/") in
322 their names or messsages.
323 (`#1267 <https://github.com/git-cola/git-cola/pull/1267>`_)
325 * The settings file is now written-to and read-from in a robust manner to avoid data
326 loss when doing an ACPI shutdown or forced shutdown of a machine.
327 (`#1241 <https://github.com/git-cola/git-cola/issues/1241>`_)
329 * Git Cola now displays an error message when attempting to open a repository that
330 cannot be accessed due to the new `safe.directory` protections in Git v2.30.3.
331 (`#1243 <https://github.com/git-cola/git-cola/issues/1243>`_)
335 * The .po and .pot files now contain location information.
336 (`#880 <https://github.com/git-cola/git-cola/issues/880>`_)
344 Usability, bells and whistles
345 -----------------------------
346 * The Rebase editor (`git-cola-sequence-editor`) now supports multi-select.
347 Use `Shift-{Up,Down}` to select multiple lines and the keyboard hotkeys
348 listed in the `?` dialog to drive the UI.
349 (`#1257 <https://github.com/git-cola/git-cola/pull/1257>`_)
351 * The `$GIT_VISUAL` and `$VISUAL` environment variable are now consulted in addition
352 to `$GIT_EDITOR` and `$EDITOR` when the `gui.editor` configuration is unset.
353 (`#1237 <https://github.com/git-cola/git-cola/pull/1237>`_)
355 * The application window icon is now enabled when running on Wayland.
356 (`#1240 <https://github.com/git-cola/git-cola/pull/1240>`_)
358 * The Status widget now has an "Open Worktree" action.
359 (`#1245 <https://github.com/git-cola/git-cola/pull/1245>`_)
361 * The "Open Using Default Application", "Open Directory",
362 "Open Parent Directory" and "Open Worktree" actions are now available on Windows.
364 * The dialog for opening repositories is now a read-only dialog that omits the
365 ability to create folders and modify the filesystem.
366 (`#1168 <https://github.com/git-cola/git-cola/issues/1168>`_)
368 * A few more `git` calls have been eliminated from the startup sequence.
369 This further improved the startup time for Git Cola.
370 (`#1259 <https://github.com/git-cola/git-cola/pull/1259>`_)
374 * Documentation rendering errors have been fixed.
375 (`#1256 <https://github.com/git-cola/git-cola/pull/1256>`_)
377 * Use of a `~/.config/git-cola/language` file to override the language has been fixed.
378 (`#1246 <https://github.com/git-cola/git-cola/issues/1246>`_)
380 * We no longer write the `cola.spellcheck` configuration value on launch.
381 (`#1238 <https://github.com/git-cola/git-cola/pull/1238>`_)
385 * Updated Spanish translation.
386 (`#1244 <https://github.com/git-cola/git-cola/pull/1244>`_)
388 * Updated Japanese translation.
389 (`#1249 <https://github.com/git-cola/git-cola/pull/1249>`_)
393 * Building documentation offline is supported again.
394 (`#1250 <https://github.com/git-cola/git-cola/issues/1250>`_)
396 * The Appstream Metadata files were missing in the v4.0.0 release are included again.
397 (`#1254 <https://github.com/git-cola/git-cola/pull/1254>`_)
398 (`#1253 <https://github.com/git-cola/git-cola/issues/1253>`_)
406 Usability, bells and whistles
407 -----------------------------
408 * Double-clicking dock widgets no longer creates sub-windows when the layout is locked.
409 (`#1176 <https://github.com/git-cola/git-cola/issues/1176>`_)
410 (`#1198 <https://github.com/git-cola/git-cola/pull/1198>`_)
414 * We now guard against `locale.getdefaultlocale()` returning `None` in some
415 configurations, notably on macOS if none of 'LC_ALL', 'LC_CTYPE', 'LANG' or 'LANGUAGE'
417 (`#1234 <https://github.com/git-cola/git-cola/issues/1234>`_)
419 * The preferences dialog has been fixed to properly handle booleans.
420 (`#1235 <https://github.com/git-cola/git-cola/issues/1235>`_)
422 * The `docs/` directory was restructured to avoid missing `setup.py` errors.
423 `share/doc/git-cola` is now a symlink pointing to `docs/`.
424 (`#1230 <https://github.com/git-cola/git-cola/issues/1230>`_)
426 * Message boxes could sometimes display off-screen or using geometry that is larger
427 than the current desktop. Message box sizes are now clamped to the desktop size.
428 (`#1228 <https://github.com/git-cola/git-cola/issues/1228>`_)
438 These changes are primarily breaking changes for packagers of Git Cola.
439 For example, Linux distribution and Homebrew package maintainers may need to
440 be aware of these changes.
442 Changes have been made build infrastructure and the resulting filesystem artifacts.
444 * The build system is now Python3-only and has been modernized for PEP-517/518.
445 While Git Cola still builds and runs under Python2, it is no longer officially
446 supported and may stop working in a future release without notice.
447 (`#1201 <https://github.com/git-cola/git-cola/issues/1201>`_)
449 * The `#!/usr/bin/env python` shebang lines in the `git-cola` and `git-dag` wrapper
450 scripts have been updated to use `python3`.
451 (`#1204 <https://github.com/git-cola/git-cola/pull/1204>`_)
453 * The build system was switched to `setuptools` and no longer depends on `distutils`.
454 ``python setup.py {build,install,build_pot,build_mo}`` are no longer provided.
455 Use the https://pypa-build.readthedocs.io/en/stable/installation.html
456 ``python -m build`` tool to generate sdist and wheel distributions,
457 and ``pip install .`` to install Git Cola from source.
458 (`#1204 <https://github.com/git-cola/git-cola/pull/1204>`_)
460 * The `git-cola`, `git-dag` and `git-cola-sequence-editor` commands are now installed
461 using setuptools entry points.
463 * The `bin/` wrapper scripts in the source tree continue to be provided for convenience
464 but they are not the scripts that get installed.
466 * The `qtpy` Python package is no longer installed alongside the `cola` Python package.
468 * The `cola` package is now installed into the standard Python site-packages location.
470 * The `share/git-cola/lib` private Python modules directory no longer exists.
472 * The `NO_VENDOR_LIBS` and `NO_PRIVATE_LIBS` Makefile options are no longer necessary.
474 * The `share/git-cola` filesystem namespace no longer exists. All of cola's package data
475 is distributed alongside the `cola` module as package data.
477 * Building the Sphinx documentation now also requires the `jaraco.packaging` and
478 `rst.linker` packages. See `requirements/requirements-dev.txt` for the package
481 Usability, bells and whistles
482 -----------------------------
484 <https://git-cola.readthedocs.io/en/latest/git-cola.html#custom-themes>`_
485 can be used by adding `*.qss` Qt stylesheet files to `~/.config/git-cola/themes/`.
486 (`#1222 <https://github.com/git-cola/git-cola/pull/1222>`_)
487 (`#1226 <https://github.com/git-cola/git-cola/pull/1226>`_)
489 * Git Cola now keeps track of child Browser windows and will close all of them when
490 the main window is closed.
491 (`#1200 <https://github.com/git-cola/git-cola/pull/1200>`_)
495 * Staging conflicted binary files has been fixed to avoid Unicode decoding errors.
496 (`#1189 <https://github.com/git-cola/git-cola/issues/1189>`_)
498 * Ensure that secure permissions are used when creating temporary files.
499 (`#1209 <https://github.com/git-cola/git-cola/pull/1209>`_)
501 * The line numbering in the diff viewer was corrected when displaying merge diffs.
502 (`#1208 <https://github.com/git-cola/git-cola/pull/1208>`_)
504 * Documentation typofixes.
505 (`#1193 <https://github.com/git-cola/git-cola/pull/1193>`_)
507 * Git Cola was revamped to use Qt signals and slots for all of its notifications.
508 This made its notification system more robust.
509 (`#1202 <https://github.com/git-cola/git-cola/pull/1202>`_)
510 (`#1203 <https://github.com/git-cola/git-cola/pull/1203>`_)
511 (`#1205 <https://github.com/git-cola/git-cola/pull/1205>`_)
512 (`#1206 <https://github.com/git-cola/git-cola/pull/1206>`_)
516 * `vcruntime140.dll` and `msvcp140.dll` are now included in the Windows installation.
517 (`#1207 <https://github.com/git-cola/git-cola/pull/1207>`_)
525 Usability, bells and whistles
526 -----------------------------
527 * The git config guitool action can now be grouped under user-defined menus.
528 This is done by using slash (``/``) delimiters in the action name.
529 Entries before the final slash are treated like submenus inside the
530 top-level ``Actions`` menu.
531 (`#1150 <https://github.com/git-cola/git-cola/issues/1150>`_)
533 * Toolbars now have a full set of icons. The icons follow the system theme
534 and can be configured to display text, just icons, or text and icons.
535 (`#1177 <https://github.com/git-cola/git-cola/pull/1177>`_)
537 * The startup dialog will now open the selected repository when the "enter"
539 (`#1162 <https://github.com/git-cola/git-cola/issues/1162>`_)
541 * ``Shift+S`` will stage selected lines (in addition to ``s``).
542 (`#1187 <https://github.com/git-cola/git-cola/issues/1187>`_)
546 * The vendored qtpy library was patched to retain Python2 compatibility.
548 * The "Unstage" toolbar action was fixed.
549 (`#1178 <https://github.com/git-cola/git-cola/issues/1178>`_)
551 * We now avoid `setWidth(float)` for compatibility with newer Qt versions.
552 (`#1183 <https://github.com/git-cola/git-cola/pull/1183>`_)
554 * Documentation typofixes.
555 (`#1185 <https://github.com/git-cola/git-cola/pull/1185>`_)
559 * Updated Polish translation.
560 (`#1184 <https://github.com/git-cola/git-cola/pull/1184>`_)
564 * Git Cola now uses Github Actions for running its continuous integration tests.
565 (`#1179 <https://github.com/git-cola/git-cola/pull/1179>`_)
573 Usability, bells and whistles
574 -----------------------------
575 * The Status tool was improved to better retain selected files when
576 the state changes and the display is refreshed.
577 (`#1130 <https://github.com/git-cola/git-cola/issues/1130>`_)
578 (`#1131 <https://github.com/git-cola/git-cola/pull/1131>`_)
580 * The Diff editor can now stage selected lines for untracked files.
581 Git Cola will detect when a file is untracked and will allow you to
582 partially stage it, just like existing tracked files.
583 (`#1146 <https://github.com/git-cola/git-cola/pull/1146>`_)
584 (`#1084 <https://github.com/git-cola/git-cola/issues/1084>`_)
586 * Diffing of staged files has been implemented for repositories that contain
588 (`#1149 <https://github.com/git-cola/git-cola/pull/1149>`_)
589 (`#1110 <https://github.com/git-cola/git-cola/issues/1110>`_)
591 * Documentation improvements and typofixes.
592 (`#1163 <https://github.com/git-cola/git-cola/pull/1163>`_)
593 (`#1164 <https://github.com/git-cola/git-cola/pull/1164>`_)
597 * The `FIPS security mode
598 <https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/FIPS_Mode_-_an_explanation>`_
599 is now supported by Git Cola when running on FIPS-enabled Python
600 (Python 3.9+ or centos8/rhel8's patched Python 3.6).
601 (`#1157 <https://github.com/git-cola/git-cola/issues/1157>`_)
605 * The `argparse` usage was adjusted to remain compatible with older Pythons.
606 (`#1155 <https://github.com/git-cola/git-cola/issues/1155>`_)
608 * The window restoration logic was fixed to properly save/restore settings
609 when different languages are used.
610 (`#1071 <https://github.com/git-cola/git-cola/issues/1071>`_)
611 (`#1161 <https://github.com/git-cola/git-cola/issues/1161>`_)
612 (`#382 <https://github.com/git-cola/git-cola/issues/382>`_)
614 * `git dag` no longer passes floats to `QPen::setWidth()` for better compatibility.
615 (`bz #2014950 <https://bugzilla.redhat.com/show_bug.cgi?id=2014950>`_)
619 * The Windows installer was slimmed down by removing unused Qt DLLs.
620 (`#1152 <https://github.com/git-cola/git-cola/pull/1152>`_)
630 * Patch release to fix a typo in the Interactive Rebase feature.
637 Usability, bells and whistles
638 -----------------------------
639 * The git config reader now supports the `include.path` directive
640 for including config files.
641 (`#1136 <https://github.com/git-cola/git-cola/issues/1136>`_)
642 (`#1137 <https://github.com/git-cola/git-cola/pull/1137>`_)
644 * The dialog for selecting commits now support filtering.
645 (`#1121 <https://github.com/git-cola/git-cola/pull/1121>`_)
647 * The diff editor now wraps long lines by default. The diff options
648 menu can be used to enable/disable line wrapping.
649 (`#1123 <https://github.com/git-cola/git-cola/pull/1123>`_)
651 * Git Cola now honors `core.hooksPath` for configuring custom Git hooks,
652 which was introduced in Git v2.9.
653 (`#1118 <https://github.com/git-cola/git-cola/issues/1118>`_)
655 * A new `Ctrl + Shift + S` hotkey was added for staging/unstaging all
656 files, both modified and untracked.
658 * The `Status` tool now supports `Ctrl + A` for selecting all files and
659 it behaves more predictably when performing operations when multiple
660 categories of files are selected (eg. when both modified and untracked
661 header items are selected).
662 (`#1117 <https://github.com/git-cola/git-cola/issues/1117>`_)
666 * Updated Hungarian translation.
667 (`#1135 <https://github.com/git-cola/git-cola/pull/1135>`_)
671 * The "Interactive Rebase" feature was updated to work with Windows.
673 * `make install-man` was updated to support Sphinx 4.0.
674 (`#1141 <https://github.com/git-cola/git-cola/issues/1141>`_)
676 * `git cola --help-commands` was updated for newer versions of argparse.
677 (`#1133 <https://github.com/git-cola/git-cola/issues/1133>`_)
681 * Git Cola can now be started as a Python module.
682 (`#1119 <https://github.com/git-cola/git-cola/pull/1119>`_)
690 Usability, bells and whistles
691 -----------------------------
692 * The startup dialog now detects when Recent and Favorite repositories no
693 longer exist on disk, and offers to remove these entries when selected.
694 (`#1089 <https://github.com/git-cola/git-cola/pull/1089>`_)
696 * The startup dialog now includes a simpler and more condensed folder view
697 that can be used for selecting Favorites and Recent repositories.
698 (`#1086 <https://github.com/git-cola/git-cola/pull/1086>`_)
700 * The "Commit" menu now includes an "Undo Last Commit" action.
701 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
703 * The "Reset" menu was revamped to expose all of Git's reset modes alongside a
704 new "Restore Worktree" action that updates the worktree using "git read-tree".
705 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
709 * Updated Polish translation.
710 (`#1107 <https://github.com/git-cola/git-cola/pull/1107>`_)
712 * Updated Japanese translation.
713 (`#1098 <https://github.com/git-cola/git-cola/pull/1098>`_)
715 * Updated Brazilian translation.
716 (`#1091 <https://github.com/git-cola/git-cola/pull/1091>`_)
720 * The ``--use-env-python`` option for ``setup.py`` is now Python3 compatible.
721 (`#1102 <https://github.com/git-cola/git-cola/issues/1102>`_)
729 Usability, bells and whistles
730 -----------------------------
731 * The submodules widget can now be used to add submodules.
732 Submodules are now updated recursively.
733 (`#534 <https://github.com/git-cola/git-cola/issues/534>`_)
735 * The image diff viewer can now be toggled between text and image modes.
736 This is helpful when, for example, diffing .svg files where it can be useful
737 to see diffs in both an image and text representation.
738 (`#859 <https://github.com/git-cola/git-cola/issues/859>`_)
739 (`#1035 <https://github.com/git-cola/git-cola/pull/1035>`_)
741 * The default `ssh-askpass` username + password dialog included with Git Cola
742 can now toggle between showing and masking the password input field.
743 (`#1069 <https://github.com/git-cola/git-cola/pull/1069>`_)
747 * Updated Polish translation.
748 (`#1076 <https://github.com/git-cola/git-cola/pull/1076>`_)
750 * Updated Hungarian translation.
751 (`#1067 <https://github.com/git-cola/git-cola/pull/1067>`_)
755 * The `share/appdata` AppStream data was renamed to `share/metainfo`
756 in accordance with `AppStream standard changes from 2016
757 <https://github.com/ximion/appstream/blob/master/NEWS#L1363>`_.
758 (`#1079 <https://github.com/git-cola/git-cola/pull/1079>`_)
760 * The ``cola`` modules are now installed into the Python ``site-packages``
761 directory by default. This allows distributions to package ``git-cola`` for
762 multiple versions of Python. See the PACKAGING NOTES section in the README
763 for details about suppressing the installation of the private
764 ``share/git-cola/lib/cola`` modules when building cola.
765 (`#181 <https://github.com/git-cola/git-cola/issues/181>`_)
767 * Git Cola's rebase / sequence editor, formerly known as ``git-xbase`` and
768 installed as ``share/git-cola/bin/git-xbase``, has been renamed to
769 ``git-cola-sequence-editor`` and is now installed into the default
770 ``bin/git-cola-sequence-editor`` executable location to enable external
771 reuse of this general-purpose tool.
773 * A workaround used by the pynsist installer preamble script was obsoleted by
774 `takluyver/pynsist#149 <https://github.com/takluyver/pynsist/pull/149>`_
775 and has now been removed.
776 (`#1073 <https://github.com/git-cola/git-cola/pull/1073>`_)
780 * `git dag` now uses integer widths when initializing its brushes.
781 (`#1080 <https://github.com/git-cola/git-cola/pull/1080>`_)
789 Usability, bells and whistles
790 -----------------------------
791 * The ``git-xbase`` rebase editor now includes a file list for filtering
792 the changes displayed in the diff view.
793 (`#1051 <https://github.com/git-cola/git-cola/pull/1051>`_)
795 * The fallback `ssh-askpass` script, which provides the Username/Password
796 login dialog when performing remote operations, previously presented both
797 the username and password input fields with ``***`` asterisks.
798 The dialog now uses asterisks for the password field only.
799 (`#1026 <https://github.com/git-cola/git-cola/pull/1026>`_)
801 * Stashes can now be applied using the `Ctrl + Enter` hotkey, popped with the
802 `Ctrl + Backspace` hotkey, and dropped with the `Ctrl + Shift + Backspace`
803 hotkey when inside the stash dialog. This enables a keyboard-centric
804 mouse-free workflow when using the stash dialog.
806 * When amending a commit, `git cola` will check whether the commit has been
807 published to a remote branch using ``git branch -r --contains HEAD``.
808 This command can be slow when operating on a repository with many
809 remote branches. The new `cola.checkpublishedcommits` configuration
810 variable allows you to opt-out of this check, which improves performance
811 when amending a commit. The settings widget exposes this variable as,
812 "Check Published Commits when Amending".
813 (`#1021 <https://github.com/git-cola/git-cola/issues/1021>`_)
814 (`#1027 <https://github.com/git-cola/git-cola/pull/1027>`_)
818 * Updated Polish translation.
819 (`#1033 <https://github.com/git-cola/git-cola/pull/1033>`_)
823 * ``git-dag.appdata.xml`` was updated to allow network access for author icons.
824 (`#1050 <https://github.com/git-cola/git-cola/pull/1050>`_)
826 * The inotify filesystem monitor now handles
827 `OSError: [Errno 24] Too many open files` errors by disabling inotify.
828 (`#1015 <https://github.com/git-cola/git-cola/issues/1015>`_)
830 * Typos in various documentation files have been fixed.
831 (`#1025 <https://github.com/git-cola/git-cola/pull/1025>`_)
833 * The "Recent Repositories" limit was off by one, and now correctly
834 remembers the configured number of repositories in the menu.
835 (`#1024 <https://github.com/git-cola/git-cola/pull/1024>`_)
837 * The "revert" action in the DAG and other tools now uses
838 ``git revert --no-edit``, which avoids launching an editor
839 when reverting the commit. Use `Ctrl+m` in the commit message
840 editor after reverting a commit to rewrite its commit message.
841 (`#1020 <https://github.com/git-cola/git-cola/issues/1020>`_)
849 Usability, bells and whistles
850 -----------------------------
851 * The remote editor is much faster since it no longer queries
852 remotes, and uses the cached information instead.
853 (`#986 <https://github.com/git-cola/git-cola/issues/986>`_)
855 * Commit message templates can now be loaded automatically by setting
856 ``git config cola.autoloadcommittemplate true``.
857 (`#1013 <https://github.com/git-cola/git-cola/pull/1013>`_)
858 (`#735 <https://github.com/git-cola/git-cola/pull/735>`_)
860 * The UI layout can now be reset back to its initial state by selecting
861 the "Reset Layout" action. This reverts the layout to the same state
862 as when the app first launched.
863 (`#1008 <https://github.com/git-cola/git-cola/pull/1008>`_)
864 (`#994 <https://github.com/git-cola/git-cola/issues/994>`_)
866 * Files can now be ignored in either the project's `.gitignore`, or in the
867 repository's private local `.git/info/exclude` ignore file.
868 (`#1006 <https://github.com/git-cola/git-cola/pull/1006>`_)
869 (`#1000 <https://github.com/git-cola/git-cola/issues/1000>`_)
871 * New remotes are now selected when they are added in the "Edit Remotes" tool.
872 (`#1002 <https://github.com/git-cola/git-cola/pull/1002>`_)
874 * The "Recent" repositories list is now saved to disk when opening a
875 repository. Previously, this list was only updated when exiting the app.
876 (`#1001 <https://github.com/git-cola/git-cola/pull/1001>`_)
878 * The bookmarks tool now has a "Delete" option in its right-click menu.
879 (`#999 <https://github.com/git-cola/git-cola/pull/999>`_)
881 * The current repository is no longer listed in the "File/Open Recent" menu.
882 (`#998 <https://github.com/git-cola/git-cola/pull/998>`_)
886 * Updated Hungarian translation.
887 (`#1005 <https://github.com/git-cola/git-cola/pull/1005>`_)
888 (`#1018 <https://github.com/git-cola/git-cola/pull/1018>`_)
890 * Updated Turkish translation.
891 (`#1003 <https://github.com/git-cola/git-cola/pull/1003>`_)
892 (`#1011 <https://github.com/git-cola/git-cola/pull/1011>`_)
896 * Better support for Python 3.8's line buffering modes.
897 (`#1014 <https://github.com/git-cola/git-cola/pull/1014>`_)
899 * The default `ssh-askpass` script now uses a more generic `#!` shebang line.
900 (`#1012 <https://github.com/git-cola/git-cola/pull/1012>`_)
902 * Fetch, push, and pull operations will now refresh the model and display when
904 (`#996 <https://github.com/git-cola/git-cola/issues/996>`_)
906 * The branches widget now refreshes its display when changing branches.
907 (`#992 <https://github.com/git-cola/git-cola/pull/992>`_)
911 * The `share/git-cola/bin/git-xbase` script will now have its `#!` lines
912 updated during installation.
913 (`#991 <https://github.com/git-cola/git-cola/pull/991>`_)
917 * The unit tests were made more platform-independent.
918 (`#993 <https://github.com/git-cola/git-cola/pull/993>`_)
926 Usability, bells and whistles
927 -----------------------------
928 * Auto-completion for filenames can now be disabled. This speeds up
929 revision completion when working in large repositories with many files.
930 (`#981 <https://github.com/git-cola/git-cola/pull/981>`_)
932 * The Stash dialog now shows the stash date as a tooltip when hovering
933 over a stashed change.
934 (`#982 <https://github.com/git-cola/git-cola/pull/982>`_)
936 * Qt HiDPI settings are overridden by the `git cola` HiDPI appearance settings.
937 These overrides can now be disabled by selecting the "Disable" mode.
938 This allows users to control Qt's HiDPI settings through environment
939 variables. Additionally, the "Auto" mode now detects the presence of
940 the Qt HiDPI variables and no longer overrides them when the user has
941 configured their environment explicitly.
942 (`#963 <https://github.com/git-cola/git-cola/issues/963>`_)
944 * Confirmation dialogs can now focus buttons using the Tab key.
945 Previously, the "Y" and "N" keys could be used to confirm or deny
946 using the keyboard, but "Tab" is more familiar.
947 (`#965 <https://github.com/git-cola/git-cola/issues/965>`_)
949 * Error dialogs (for example, when a commit hook fails) will now always
950 show the details. The details were previously hidden behind a toggle.
951 (`#968 <https://github.com/git-cola/git-cola/issues/968>`_)
955 * Updated Japanese translation.
956 (`#973 <https://github.com/git-cola/git-cola/pull/973>`_)
957 (`#974 <https://github.com/git-cola/git-cola/pull/974>`_)
959 * Updated Simplified Chinese translation.
960 (`#950 <https://github.com/git-cola/git-cola/pull/950>`_)
964 * The filesystem monitor no longer logs that it has been enabled after the
965 inotify watch limit is reached on Linux.
966 (`#984 <https://github.com/git-cola/git-cola/pull/984>`_)
968 * Better unicode robustness.
969 (`#990 <https://github.com/git-cola/git-cola/issues/990>`_)
970 (`#910 <https://github.com/git-cola/git-cola/issues/991>`_)
972 * The "Branches" widget did not always update itself when deleting branches
973 (for example, when inotify is disabled or unavailable).
974 (`#978 <https://github.com/git-cola/git-cola/issues/978>`_)
976 * Non-ascii unicode byte strings are more robustly handled by the log widget.
977 (`#977 <https://github.com/git-cola/git-cola/issues/977>`_)
979 * Non-unicode results from the `gettext` library are more robustly handled.
980 (`#969 <https://github.com/git-cola/git-cola/issues/969>`_)
982 * Launching `git cola` from within a directory that has since been deleted
983 would previously result in a traceback, and is now robustly handled.
984 (`#961 <https://github.com/git-cola/git-cola/issues/961>`_)
988 * The vendored `qtpy` library was updated to `v1.9`.
996 Usability, bells and whistles
997 -----------------------------
998 * The file browser now includes "Blame" in its context menu.
999 (`#953 <https://github.com/git-cola/git-cola/issues/953>`_)
1001 * The "Push" action now uses "git push --force-with-lease" when using
1002 the "Force" option with Git v1.8.5 and newer.
1003 (`#946 <https://github.com/git-cola/git-cola/issues/946>`_)
1005 * Updated German translation.
1006 (`#936 <https://github.com/git-cola/git-cola/pull/936>`_)
1008 * The `Status` widget learned to optionally display file counts in its
1009 category headers, and indent the files displayed in each category.
1010 (`#931 <https://github.com/git-cola/git-cola/pull/931>`_)
1012 * The `Branches` widget can now sort branches by their most recent commit.
1013 (`#930 <https://github.com/git-cola/git-cola/pull/930>`_)
1015 * `git cola` now includes configurable GUI themes that can be used to style
1016 the user interface. Enable the new themes by configuring `cola.theme`
1017 in the preferences window. See the
1018 `cola.theme documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-theme>`_
1019 for more details. (`#924 <https://github.com/git-cola/git-cola/pull/924>`_)
1021 * `git cola` now has built-in support for HiDPI displays by enabling
1022 Qt's 5.6's `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
1023 (`#938 <https://github.com/git-cola/git-cola/issues/938>`_)
1025 * `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
1026 icons have been updated to look sharp when displayed in HiDPI.
1027 (`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
1031 * `git cola`'s "Revert Unstaged Edits" previously checked out from "HEAD^",
1032 when in "Amend" mode, and removing staged changes. This behavior has been
1033 changed to always checkout from the index, which avoids data loss.
1034 (`#947 <https://github.com/git-cola/git-cola/issues/947>`_)
1036 * `git cola` has been updated to work with newer versions of `gnome-terminal`
1037 and no longer shell-quotes its arguments when launching `gnome-terminal`.
1038 The `cola.terminalshellquote` configuration variable can be set to `true` to
1039 get the old behavior, or to handle other terminals that take the command to run
1040 as a single string instead of as arguments to `execv()`.
1041 (`#935 <https://github.com/git-cola/git-cola/pull/935>`_)
1043 * `git dag` now properly handles arbitrary input on Python3.
1044 Previously, an exception would be raised when entering `--grep=xxx` where
1045 `xxx` is a quoted string with a missing end-quote.
1046 (`#941 <https://github.com/git-cola/git-cola/pull/941>`_)
1050 * The contribution guidelines for contributors has been updated to mention
1051 how to regenerate the `*.mo` message files.
1052 (`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
1060 Usability, bells and whistles
1061 -----------------------------
1062 * `git dag` improved how it renders parent commits.
1063 (`#921 <https://github.com/git-cola/git-cola/pull/921>`_)
1065 * The `Branches` widget now checks out branches when double-clicked.
1066 (`#920 <https://github.com/git-cola/git-cola/pull/920>`_)
1068 * The new `Submodules` widget makes it easy to interact with submodules.
1069 Additionally, submodules can now be updated using the `Status` widget.
1070 (`#916 <https://github.com/git-cola/git-cola/pull/916>`_)
1072 * Updated Japanese translation.
1073 (`#914 <https://github.com/git-cola/git-cola/pull/914>`_)
1075 * The "Open Terminal" action now launches a Git Bash shell on Windows.
1076 (`#913 <https://github.com/git-cola/git-cola/pull/913>`_)
1078 * New menu actions for updating all submodules.
1079 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
1081 * The status widget can now update submodules.
1082 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
1084 * The "Apply Patch" `git cola am` dialog now includes a diff viewer
1085 to display the contents of the selected patch.
1087 * The "Alt+D" diffstat hotkey now selects the staged/modified/etc.
1088 header in the Status widget, which shows the totality of everything
1089 that will be committed.
1090 (`#771 <https://github.com/git-cola/git-cola/issues/771>`_)
1092 * Running "Launch Editor" from the diff editor now opens the editor at the
1094 (`#898 <https://github.com/git-cola/git-cola/pull/898>`_)
1096 * The textwidth and tabwidth configuration values can now be set
1097 per-repository, rather than globally only.
1099 * Text entry widgets switched to using a block cursor in `v3.2`.
1100 This has been reverted to the original line cursor for consistency
1101 with other applications and user expectations.
1102 (`#889 <https://github.com/git-cola/git-cola/issues/889>`_)
1104 * The "edit at line" feature, used by the "Grep" tool, now supports
1105 the Sublime text editor.
1106 (`#894 <https://github.com/git-cola/git-cola/pull/894>`_)
1110 * Launching external programs has been improved on Windows.
1111 (`#925 <https://github.com/git-cola/git-cola/pull/925>`_)
1113 * Improve compatibility when using PySide2.
1114 (`#912 <https://github.com/git-cola/git-cola/pull/912>`_)
1116 * The Diff Editor was not honoring the configured tab width on startup.
1117 (`#900 <https://github.com/git-cola/git-cola/issues/900>`_)
1119 * The "Delete Files" feature was creating an unreadable display when
1120 many files were selected. Word-wrap the list of files so that the
1121 display stays within a sensible size.
1122 (`#895 <https://github.com/git-cola/git-cola/issues/895>`_)
1124 * Spelling and grammar fixes.
1125 (`#915 <https://github.com/git-cola/git-cola/pull/915>`_)
1126 (`#891 <https://github.com/git-cola/git-cola/pull/891>`_)
1130 * The logo was run through `tidy` to give it a consistent style.
1131 Some technical issues with the logo were improved.
1132 (`#877 <https://github.com/git-cola/git-cola/issues/877>`_)
1134 * The entire codebase is now checked by `flake8`, rather than just
1135 the module and test directories. This catches things like
1136 the pynsist installer scripts.
1137 (`#884 <https://github.com/git-cola/git-cola/issues/884>`_)
1138 (`#882 <https://github.com/git-cola/git-cola/issues/882>`_)
1139 (`#879 <https://github.com/git-cola/git-cola/pull/879>`_)
1143 * The vendored `qtpy` library was updated to `v1.6`.
1145 * The Windows installer's wrapper scripts were missing an import.
1146 (`#878 <https://github.com/git-cola/git-cola/issues/878>`_)
1154 Usability, bells and whistles
1155 -----------------------------
1156 * The `git cola dag` DAG window now supports `git revert`.
1157 (`#843 <https://github.com/git-cola/git-cola/issues/843>`_)
1159 * `git stash pop` is now supported by the stash dialog.
1160 (`#844 <https://github.com/git-cola/git-cola/issues/844>`_)
1162 * The status widget now ensures that each item is visible when selection
1163 changes. Previously, if you scrolled to the right to see the name of
1164 a long filename, and then selected a short filename above it, the widget
1165 may not have shown the short filename in the viewport. We now ensure
1166 that the filenames are visible when the selection changes.
1167 (`#828 <https://github.com/git-cola/git-cola/pull/828>`_)
1169 * The `git xbase` rebase editor no longer displays an error when
1170 cancelling an interactive rebase.
1171 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
1173 * The dialog shown when renaming remotes has been simplified.
1174 (`#840 <https://github.com/git-cola/git-cola/pull/840>`_)
1175 (`#838 <https://github.com/git-cola/git-cola/issues/838>`_)
1177 * The help dialog in the `git-xbase` Rebase editor is now scrollable.
1178 (`#855 <https://github.com/git-cola/git-cola/issues/855>`_)
1182 * Updated Brazilian translation.
1183 (`#845 <https://github.com/git-cola/git-cola/pull/845>`_)
1185 * Updated Czech translation.
1186 (`#854 <https://github.com/git-cola/git-cola/pull/854>`_)
1187 (`#853 <https://github.com/git-cola/git-cola/pull/853>`_)
1188 (`#835 <https://github.com/git-cola/git-cola/pull/835>`_)
1189 (`#813 <https://github.com/git-cola/git-cola/pull/813>`_)
1191 * Update Spanish translation.
1192 (`#862 <https://github.com/git-cola/git-cola/pull/862>`_)
1193 (`#867 <https://github.com/git-cola/git-cola/pull/867>`_)
1197 * The original `#!/usr/bin/env python` shebang lines can now be
1198 retained by passing `USE_ENV_PYTHON=1` to `make` when installing.
1199 (`#850 <https://github.com/git-cola/git-cola/issues/850>`_)
1201 * The Makefile is now resilient to DESTDIR and prefix containing whitespace.
1202 (`#858 <https://github.com/git-cola/git-cola/pull/858>`_)
1204 * The vendored `qtpy` library was updated to `v1.4.2`.
1206 * `python3-distutils` is needed to build cola on Debian.
1207 (`#837 <https://github.com/git-cola/git-cola/issues/837>`_)
1211 * The "C" key no longer closes the message dialogs, for example the
1212 one that is shown when a commit fails its pre-commit hooks.
1213 This allows "Ctrl+C" copy to work, rather than closing the dialog.
1214 (`#734 <https://github.com/git-cola/git-cola/issues/734>`_)
1216 * Dock widgets sizes are now properly saved and restored when the main
1217 window is maximized.
1218 (`#848 <https://github.com/git-cola/git-cola/issues/848>`_)
1220 * The spellcheck feature was broken under Python3.
1221 (`#857 <https://github.com/git-cola/git-cola/issues/857>`_)
1223 * A regression when saving stashes was fixed.
1224 (`#847 <https://github.com/git-cola/git-cola/issues/847>`_)
1226 * Diffing image files was not updating the available context menus,
1227 which prevented the "Stage" action from being present in the menu.
1228 (`#841 <https://github.com/git-cola/git-cola/issues/841>`_)
1230 * `git cola` now detects when `git lfs uninstall` has been run. This allows
1231 you to re-initialize "Git LFS" in an existing repository where it had been
1232 previously uninstalled.
1233 (`#842 <https://github.com/git-cola/git-cola/issues/842>`_)
1235 * Custom color values that did not contain any hexadecimal digits in the
1236 `a-f` range were being converted into integers by the config reader. This
1237 then caused the configured colors to be ignored.
1239 These color values are now interpreted correctly. Additionally, color
1240 values can now use an optional HTML-like `#` prefix.
1242 Example `.gitconfig` snippet::
1247 (`#836 <https://github.com/git-cola/git-cola/pull/836>`_)
1248 (`#849 <https://github.com/git-cola/git-cola/issues/849>`_)
1250 * We now display an error message graphically when `Git` is not installed.
1251 Previously, the message went to stderr only.
1252 (`#830 <https://github.com/git-cola/git-cola/issues/830>`_)
1254 * Changing diff options was causing resulting in an exception.
1255 (`#833 <https://github.com/git-cola/git-cola/issues/833>`_)
1256 (`#834 <https://github.com/git-cola/git-cola/pull/834>`_)
1258 * The DAG window now updates itself when branches and tags are created.
1259 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
1261 * The user's `$PATH` environment variable can now contain utf-8
1262 encoded paths. Previously, launching external commands could
1264 (`#807 <https://github.com/git-cola/git-cola/issues/807>`_)
1266 * Git Cola development sandboxes can now be stored on utf-8 encoded
1267 filesystem paths. Previously, the interactive rebase feature
1268 could be broken when running in that environment.
1269 (`#825 <https://github.com/git-cola/git-cola/issues/825>`_)
1271 * The log window now uses an ISO-8601 timestamp, which
1272 avoids localized output in the log window.
1273 (`#817 <https://github.com/git-cola/git-cola/issues/817>`_)
1277 * The code base has been thoroughly sanitized using `pylint`, and
1278 travis is now running pylint over the entire project.
1280 * Miscellaneous improvements and code improvements.
1281 (`#874 <https://github.com/git-cola/git-cola/issues/874>`_)
1289 Usability, bells and whistles
1290 -----------------------------
1291 * The "Browser" widget learned to rename files using "git mv".
1292 (`#239 <https://github.com/git-cola/git-cola/issues/239>`_)
1294 * The "Diff" widget learned to diff images. Side-by-side and pixel diff
1295 modes allow you to inspect changes to common images formats.
1296 (`#444 <https://github.com/git-cola/git-cola/issues/444>`_)
1297 (`#803 <https://github.com/git-cola/git-cola/pull/803>`_)
1299 * Git LFS and Git Annex are natively supported by the image diff viewer.
1301 * Git Annex operations are now included. `git annex init` can be performed on
1302 repositories, and `git annex add` can be run on untracked files from the
1303 status widget. Install `git-annex` to activate this feature.
1305 * Git LFS operations are now included. `git lfs install` can be performed on
1306 repositories, and `git lfs track` can be run on untracked files from the
1307 status widget. Install `git-lfs` to activate this feature.
1309 * The "Stash" tool learned to stash staged changes only. Select the
1310 "Stage Index" option and only staged changes will be stashed away.
1311 (`#413 <https://github.com/git-cola/git-cola/issues/413>`_)
1313 * The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
1314 shows error messages when things go wrong, and now saves the "Stash Index"
1315 and "Keep Index" options across sessions.
1317 * The Edit menu's "Copy" and "Select All" actions now forward to either the
1318 diff, status, recent, or favorites widgets, based on which widget has focus.
1320 * The "File" and "Edit" menu can now be activated using `Alt + {F,E}` hotkeys.
1321 (`#759 <https://github.com/git-cola/git-cola/issues/759>`_)
1323 * It was easy to accidentally trigger the first action in the `Status` tool's
1324 context menu when using a quick right-click to bring up the menu.
1325 A short sub-second delay was added to ensure that the top-most action is not
1326 triggered unless enough time has passed. This prevents accidental
1327 activation of the first item (typically "Stage" or "Unstage") without
1328 burdening common use cases.
1329 (`#755 <https://github.com/git-cola/git-cola/pull/755>`_)
1330 (`#643 <https://github.com/git-cola/git-cola/issues/643>`_)
1332 * The "Ctrl+S" hotkey now works for the header items in the Status tool.
1333 Selected the "Modified" header item and activating the "Stage" hotkey,
1334 for example, will stage all modified files. This works for the "Staged",
1335 "Modified", and "Untracked" headers. This is not enabled for the
1336 "Unmerged" header by design.
1337 (`#772 <https://github.com/git-cola/git-cola/issues/772>`_)
1339 * The list of "Recent" repositories previously capped the number of
1340 repositories shown to 8 repositories. This can be set to a higher
1341 value by setting the `cola.maxrecent` configuration variable.
1342 (`#752 <https://github.com/git-cola/git-cola/issues/752>`_)
1344 * The "Create Branch" dialog now prevents invalid branch names.
1345 (`#765 <https://github.com/git-cola/git-cola/issues/765>`_)
1347 * Updated Turkish translation.
1348 (`#756 <https://github.com/git-cola/git-cola/pull/756>`_)
1350 * Updated Ukrainian translation.
1351 (`#753 <https://github.com/git-cola/git-cola/pull/753>`_)
1353 * Updated German translation.
1354 (`#802 <https://github.com/git-cola/git-cola/pull/802>`_)
1356 * Updated Czech translation
1357 (`#792 <https://github.com/git-cola/git-cola/pull/792>`_)
1358 (`#806 <https://github.com/git-cola/git-cola/pull/806>`_)
1360 * The window title can be configured to not display the absolute path of the
1362 (`#775 <https://github.com/git-cola/git-cola/issues/775>`_)
1364 * The "Edit Remotes" editor learned to edit remote URLS.
1366 * Bare repositories can now be created by selecting the
1367 "New Bare Repository..." action from the `File` menu.
1369 * The "Branches" widget learned to configure upstream branches.
1371 * A new `git cola clone` sub-command was added for cloning repositories.
1375 * The vendored `qtpy` library was updated to `v1.3.1`.
1377 * The macOS installation was made simpler for better compatibility with
1379 (`#636 <https://github.com/git-cola/git-cola/issues/636>`_)
1381 * The Windows installer is now much simpler. Git Cola now bundles
1382 Python and PyQt5, so users need only install the "Git for Windows"
1383 and "Git Cola" installers to get things working.
1387 * Uninitialized difftool errors will now be displayed graphically.
1388 They were previously going to the shell.
1389 (`#457 <https://github.com/git-cola/git-cola/issues/457>`_)
1391 * Translations marked "fuzzy" will no longer be used when translating strings.
1392 (`#782 <https://github.com/git-cola/git-cola/issues/782>`_)
1394 * Deleted unmerged files will now correctly use a deleted icon.
1395 (`#479 <https://github.com/git-cola/git-cola/issues/479>`_)
1397 * The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
1398 (`#767 <https://github.com/git-cola/git-cola/issues/767>`_)
1400 * The "Create Tag" dialog did not correctly handle the case when a signed
1401 tag is requested, but no message is provided, and the user chooses to
1402 create an unannotated tag instead. This convenience fallback will now
1403 properly create an unsigned, unannotated tag.
1404 (`#696 <https://github.com/git-cola/git-cola/issues/696>`_)
1406 * `.gitconfig` and `.git/config` values editable by the Preferences dialog
1407 (aka `git cola config`) will now get unset when set to an empty value.
1408 For example, setting a different `user.email` in the current repository,
1409 followed by a subsequent emptying of that field, would previously result in
1410 an empty string getting stored in the config. This has been fixed so that
1411 the value will now get unset in the config instead.
1412 (`#406 <https://github.com/git-cola/git-cola/issues/406>`_)
1414 * Spelling and typofixes.
1415 (`#748 <https://github.com/git-cola/git-cola/pull/748>`_)
1417 * `core.commentChar` is now honored when set in the local repository
1419 (`#766 <https://github.com/git-cola/git-cola/issues/766>`_)
1421 * The log window was using a format string that did not display
1422 correctly in all locales. A locale-aware format is now used.
1423 (`#800 <https://github.com/git-cola/git-cola/pull/800>`_)
1425 * The dialog displayed when prompting for a reference could sometimes
1427 (`#804 <https://github.com/git-cola/git-cola/pull/804>`_)
1435 Usability, bells and whistles
1436 -----------------------------
1437 * Updated Simplified Chinese translation.
1438 (`#726 <https://github.com/git-cola/git-cola/pull/726>`_)
1440 * Updated Ukrainian translation.
1441 (`#723 <https://github.com/git-cola/git-cola/pull/723>`_)
1443 * New Czech translation.
1444 (`#736 <https://github.com/git-cola/git-cola/pull/736>`_)
1445 (`#737 <https://github.com/git-cola/git-cola/pull/737>`_)
1446 (`#740 <https://github.com/git-cola/git-cola/pull/740>`_)
1447 (`#743 <https://github.com/git-cola/git-cola/pull/743>`_)
1449 * The "name" field in the "Create Tag" dialog now includes autocompletion,
1450 which makes it easy to see which tags currently exist.
1452 * `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
1453 menu item to add a toolbar.
1455 * Setting `cola.expandtab` to `true` will now expand tabs into spaces
1456 in the commit message editor. The number of spaces to insert is determined
1457 by consulting `cola.tabwidth`, which defaults to `8`.
1459 * The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
1460 ability to copy text from the DAG window.
1461 (`#705 <https://github.com/git-cola/git-cola/pull/705>`_)
1463 * The "Prepare Commit Message" action can now be invoked via the
1464 `Ctrl+Shift+Return` shortcut.
1465 (`#707 <https://github.com/git-cola/git-cola/pull/707>`_)
1467 * The `Branches` pane now has a filter field that highlights branches whose
1468 names match the string entered into its text field.
1469 (`#713 <https://github.com/git-cola/git-cola/pull/713>`_)
1471 * Actions that are triggered in response to button presses were being
1472 triggered when the button was pressed, rather than when it was released,
1473 which was a usability flaw. All buttons now respond when clicked
1474 rather than when pressed.
1475 (`#715 <https://github.com/git-cola/git-cola/pull/715>`_)
1477 * The DAG window will now only refresh when object IDs change.
1478 Previously, the DAG would redraw itself in response to inotify events,
1479 such as filesystem operations, which was disruptive when inspecting a large
1480 diff in its diff viewer. The DAG will now only redraw when the object IDs
1481 corresponding to its query input changes. Furthermore, when redrawing, the
1482 scrollbar positions are retained to minimize disruption to the viewport
1484 (`#620 <https://github.com/git-cola/git-cola/issues/620>`_)
1485 (`#724 <https://github.com/git-cola/git-cola/issues/724>`_)
1487 * The "About" dialog now includes the SHA-1 where Git Cola was built.
1488 (`#530 <https://github.com/git-cola/git-cola/issues/530>`_)
1490 * The "Status" widget now has "Copy Leading Path to Clipboard" and
1491 "Copy Basename to Clipboard" actions.
1492 (`#435 <https://github.com/git-cola/git-cola/issues/435>`_)
1493 (`#436 <https://github.com/git-cola/git-cola/issues/436>`_)
1495 * The "Status" widget now supports custom "Copy ... to Clipboard" actions.
1496 (`#437 <https://github.com/git-cola/git-cola/issues/437>`_)
1498 * The main menu now has an "Edit" menu.
1499 (`#725 <https://github.com/git-cola/git-cola/issues/725>`_)
1501 * `git dag` learned to checkout commits into a detached HEAD state.
1502 (`#698 <https://github.com/git-cola/git-cola/issues/698>`_)
1504 * The `status` widget's context menus now omit actions selection-dependent
1505 actions when no file is selected.
1506 (`#731 <https://github.com/git-cola/git-cola/pull/731>`_)
1508 * The startup dialog now focuses the repository list so that repositories
1509 can be selected with the keyboard without mouse intervention.
1510 (`#741 <https://github.com/git-cola/git-cola/issues/741>`_)
1514 * `git dag` now prevents nodes from overlapping in more situations.
1515 (`#689 <https://github.com/git-cola/git-cola/pull/689>`_)
1517 * Adding untracked Git submodule repo directories previously ran
1518 `git add submodule/` but we now call `git add submodule` without
1519 the trailing slash (`/`) to avoid staging files that belong to the
1520 submodule (which is possibly a `git` bug). By working around the
1521 buggy behavior we allow users to recover by issuing the appropriate
1522 `git submodule add` command to properly register the submodule.
1523 (`#681 <https://github.com/git-cola/git-cola/pull/681>`_)
1525 * We now avoid `git for-each-ref --sort=version:refname` on versions
1526 of `git` older than `v2.7.0`. Previously we only avoided it for
1527 versions older than `v2.0.0`, which was a mistake.
1528 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
1530 * The error message displayed when `git` is not installed has been fixed.
1531 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
1533 * Adding new remotes was silently broken.
1534 (`#684 <https://github.com/git-cola/git-cola/issues/684>`_)
1535 (`#685 <https://github.com/git-cola/git-cola/pull/685>`_)
1537 * The repo selection dialog had errors during startup when the
1538 `cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
1539 (`#690 <https://github.com/git-cola/git-cola/issues/690>`_)
1541 * Restored support for PyQt 4.6 (Centos 6.8)
1542 (`#692 <https://github.com/git-cola/git-cola/issues/692>`_)
1544 * Switching repositories now resets the "Amend Mode" and other settings
1546 (`#710 <https://github.com/git-cola/git-cola/issues/710>`_)
1548 * `git rebase` error messages now displayed when rebasing fails or stops
1549 via the standalone `git cola rebase` front-end.
1550 (`#721 <https://github.com/git-cola/git-cola/issues/721>`_)
1552 * `git cola` learned to stage broken symlinks.
1553 (`#727 <https://github.com/git-cola/git-cola/issues/727>`_)
1555 * The "View History" feature in the `Browser` tool was fixed, and now
1556 disambiguates between refs and paths.
1557 (`#732 <https://github.com/git-cola/git-cola/issues/732>`_)
1559 * The diff editor now has better support for files with CRLF `\r\n`
1561 (`#730 <https://github.com/git-cola/git-cola/issues/730>`_)
1563 * `cola.inotify` in a repo-local config is now honored
1564 when `git cola` is launched from a desktop entry (`git cola --prompt`).
1565 (`#695 <https://github.com/git-cola/git-cola/issues/695>`_)
1573 Usability, bells and whistles
1574 -----------------------------
1575 * New Ukrainian translation.
1576 (`#670 <https://github.com/git-cola/git-cola/pull/670>`_)
1577 (`#672 <https://github.com/git-cola/git-cola/pull/672>`_)
1579 * New and improved French translations.
1581 * The new `Branches` widget makes it easier to checkout, merge, push,
1582 and pull branches from a single interface.
1584 * `git cola` now includes a dark icon theme. The dark icon theme can be
1585 activated either by setting the `GIT_COLA_ICON_THEME` environment variable
1586 to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
1587 `--icon-theme=dark` on the command line.
1588 (`#638 <https://github.com/git-cola/git-cola/pull/638>`_)
1590 * Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.
1592 * The commit message editor now remembers the "Spellcheck" setting
1594 (`#645 <https://github.com/git-cola/git-cola/pull/645>`_)
1596 * `git dag` now uses an improved algorithm for laying out the graph,
1597 which avoids collisions under certain graph configurations, and
1598 avoids overlapping tag with commits.
1599 (`#648 <https://github.com/git-cola/git-cola/pull/648>`_)
1600 (`#651 <https://github.com/git-cola/git-cola/pull/651>`_)
1601 (`#654 <https://github.com/git-cola/git-cola/pull/654>`_)
1602 (`#656 <https://github.com/git-cola/git-cola/pull/656>`_)
1603 (`#659 <https://github.com/git-cola/git-cola/pull/659>`_)
1605 * `git dag` now remembers its column sizes across sessions.
1606 (`#674 <https://github.com/git-cola/git-cola/issues/674>`_)
1608 * `Grep` now shows a preview of the selected file's content in a split window
1609 below the grep results.
1611 * `Grep` now includes line numbers in the preview pane's output.
1613 * `Edit Remotes` now remembers its window settings after exiting.
1615 * `Diff` now has an option to display line numbers in the editor.
1616 (`#136 <https://github.com/git-cola/git-cola/issues/136>`_)
1618 * `Amend Last Commit` can now be triggered via the `Commit` menu in addition
1619 to the commit message editor's options.
1620 (`#640 <https://github.com/git-cola/git-cola/issues/640>`_)
1622 * The `File Browser` tool was made much faster and can now operate on
1623 much larger repositories.
1624 (`#499 <https://github.com/git-cola/git-cola/issues/499>`_)
1626 * A new "turbo" mode was added that allows you to opt-out of operations
1627 that can slow `git cola` on large repositories. The turbo mode is
1628 enabled by configuring `git config cola.turbo true`. Turbo mode
1629 disables the background loading of Git commit messages and other
1630 details in the `File Browser` widget.
1632 * A new GitIgnore dialog allows adding custom gitignore patterns.
1633 (`#653 <https://github.com/git-cola/git-cola/pull/653>`_)
1635 * The spellchecker in `git cola` can now use an additional dictionary
1636 by configuring `cola.dictionary` to the path to a file containing
1637 a newline-separated list of words.
1638 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1640 * The stash, export patches, diff, and gitignore dialogs now remember
1643 * A new `git cola recent` sub-command was added for finding recently
1646 * The `Fetch` dialog now allows pruning remote branches.
1647 (`#639 <https://github.com/git-cola/git-cola/issues/639>`_)
1648 (`#680 <https://github.com/git-cola/git-cola/pull/680>`_)
1652 * `git cola`'s spellchecker now supports the new `dict-common` filesystem
1653 layout, and prefers the `/usr/share/dict/cracklib-small` file over the
1654 `/usr/share/dict/words` provided on older distributions.
1655 This makes the spellchecker compatible with Arch, which does not provide
1656 a `words` symlink like Debian.
1657 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1659 * Properly handle the case where an existing file is untracked using
1662 * Fix a quirk where the "Create Branch" dialog sometimes required clicking
1663 twice on the radio buttons.
1664 (`#662 <https://github.com/git-cola/git-cola/pull/662>`_)
1666 * Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
1667 be executed with the press of a single enter key after being shown.
1668 (`#661 <https://github.com/git-cola/git-cola/issues/661>`_)
1670 * Committing is now allowed in when resolving a merge results in no
1671 changes. This state was previously prevented by the commit message editor,
1672 which prevented users from resolving merges that result in no changes.
1673 (`#679 <https://github.com/git-cola/git-cola/pull/679>`_)
1675 * The filesystem monitor would sometimes emit backtraces when directories
1676 are modified. This has been fixed.
1677 (`bz #1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)
1679 * Absolute paths are now returned when querying for `.git`-relative paths
1680 from within a submodule, which uses `.git`-files.
1681 This fixes launching `git cola` from within a subdirectory of a submodule.
1682 (`#675 <https://github.com/git-cola/git-cola/pull/675>`_)
1690 Usability, bells and whistles
1691 -----------------------------
1692 * `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
1693 hook to update the commit message. This hook takes the same parameters
1694 as Git's `prepare-commit-message` hook. The default path to this hook
1695 can be overridden by setting the `cola.prepareCommitMessageHook`
1696 configuration variable.
1697 (`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)
1699 * `git cola diff` (and the corresponding `Diff` menu actions) can now
1700 launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
1701 also added for launching an editor.
1703 * Traditional Chinese (Taiwan) translation updates.
1707 * `git cola` now works when installed in non-ascii, utf8-encoded paths.
1708 (`#629 <https://github.com/git-cola/git-cola/issues/629>`_)
1710 * Styling issues that caused black backgrounds in various widgets when using
1711 PyQ5 on Mac OS X have been fixed.
1712 (`#624 <https://github.com/git-cola/git-cola/issues/624>`_)
1714 * The "Open Recent" menu action was broken and has been fixed.
1715 (`#634 <https://github.com/git-cola/git-cola/issues/634>`_)
1717 * Exiting `git cola` with a maximized main window would hang when reopened
1719 (`#641 <https://github.com/git-cola/git-cola/issues/641>`_)
1723 * `appdata.xml` files are now provided at
1724 `share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
1725 for use by the Linux software gallery.
1726 (`#627 <https://github.com/git-cola/git-cola/pull/627>`_)
1727 (`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)
1737 * The "Open Recent" menu was updated to new bookmarks format.
1738 (`#628 <https://github.com/git-cola/git-cola/issues/628>`_)
1746 Usability, bells and whistles
1747 -----------------------------
1748 * New Polish translation thanks to Łukasz Wojniłowicz
1749 (`#598 <https://github.com/git-cola/git-cola/pull/598>`_)
1751 * The `Bypass Commit Hooks` feature now disables itself automatically
1752 when a new commit is created. The new behavior turns the option into a
1753 single-use flag, which helps prevent users from accidentally leaving it
1754 active longer than intended.
1755 (`#595 <https://github.com/git-cola/git-cola/pull/595>`_)
1757 * `git dag` learned to launch an external diff viewer on selected commits.
1758 The standard `Ctrl+D` shortcut can be used to view diffs.
1759 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1761 * `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
1762 The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
1763 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1765 * Items in the "Favorites" list can now be renamed, which makes it
1766 easier to differentiate between several checkouts of the same repository.
1767 (`#599 <https://github.com/git-cola/git-cola/issues/599>`_)
1768 (`#601 <https://github.com/git-cola/git-cola/pull/601>`_)
1770 * The startup screen now includes a logo and `git cola` version information.
1771 (`#526 <https://github.com/git-cola/git-cola/issues/526>`_)
1773 * The `About` page was revamped to contain multiple tabs. A new tab was added
1774 that provides details about `git cola`''s dependencies. New tabs were also
1775 added for giving credit to `git cola`'s authors and translators.
1777 * The `About` page can now be accessed via `git cola about`.
1779 * The "Fast-forward only" and "No fast-forward" options supported by
1780 `git pull` are now accessible via `git cola pull`.
1782 * Doing a forced push no longer requires selecting the remote branch.
1783 (`#618 <https://github.com/git-cola/git-cola/pull/618>`_)
1785 * `git cola push` now has an option to suppress the prompt that is shown
1786 when pushing would create new remote branches.
1787 (`#605 <https://github.com/git-cola/git-cola/issues/605>`_)
1789 * `git dag` now shows commit messages in a more readable color.
1790 (`#574 <https://github.com/git-cola/git-cola/issues/574>`_)
1792 * `git cola browse` and the `status` widget learned to launch the OS-specified
1793 default action for a file. When used on directories via `git cola browse`,
1794 or when "Open Parent Directory" is used on files, the OS-specified
1795 file browser will typically be used.
1797 * `git cola browse` and the `status` widget learned to launch terminals.
1801 * `git cola browse` was not updating when expanding items.
1802 (`#588 <https://github.com/git-cola/git-cola/issues/588>`_)
1804 * Typofixes in comments, naming, and strings have been applied.
1805 (`#593 <https://github.com/git-cola/git-cola/pull/593>`_)
1807 * The inotify and win32 filesystem monitoring no longer refreshes
1808 when updates are made to ignored files.
1809 (`#517 <https://github.com/git-cola/git-cola/issues/517>`_)
1810 (`#516 <https://github.com/git-cola/git-cola/issues/516>`_)
1812 * The `Refresh` button on the actions panel no longer raises an
1813 exception when using PyQt5.
1814 (`#604 <https://github.com/git-cola/git-cola/issues/604>`_)
1816 * Fixed a typo in the inotify backend that is triggered when files are removed.
1817 (`#607 <https://github.com/git-cola/git-cola/issues/607>`_)
1819 * Fixed a typo when recovering from a failed attempt to open a repository.
1820 (`#606 <https://github.com/git-cola/git-cola/issues/606>`_)
1822 * `git dag` now properly updates itself when launched from the menubar.
1823 (`#613 <https://github.com/git-cola/git-cola/pull/613>`_)
1825 * If git-cola is invoked on Windows using `start pythonw git-cola`,
1826 a console window will briefly flash on the screen each time
1827 `git cola` invokes `git`. The console window is now suppressed.
1829 * We now avoid some problematic Popen flags on Windows which were
1830 breaking the `git rebase` feature on Windows.
1832 * The `Save` button in `git dag`'s "Grab File..." feature now properly
1833 prompts for a filename when saving files.
1834 (`#617 <https://github.com/git-cola/git-cola/pull/617>`_)
1838 * The `qtpy` symlink in the source tree has been removed to allow for easier
1839 development on Windows.
1840 (`#626 <https://github.com/git-cola/git-cola/issues/626>`_)
1848 Usability, bells and whistles
1849 -----------------------------
1850 * `git cola push` learned to configure upstream branches.
1851 (`#563 <https://github.com/git-cola/git-cola/issues/563>`_)
1855 * The diffstat view is now properly updated when notifications are
1856 received via inotify filesystem monitoring.
1857 (`#577 <https://github.com/git-cola/git-cola/issues/577>`_)
1859 * Python3 with PyQt5 had a bug that prevented `git cola` from starting.
1860 (`#589 <https://github.com/git-cola/git-cola/pull/589>`_)
1871 * When repositories stored in non-ASCII, UTF-8-encoded filesystem paths
1872 were operated upon with `LC_ALL=C` set in the environment, unicode errors
1873 would occur when using `python2`. `git cola` was made more robust and will
1874 now operate correctly within this environment.
1875 (`#581 <https://github.com/git-cola/git-cola/issues/581>`_)
1877 * Support for the `GIT_WORK_TREE` environment variable was fixed.
1878 (`#582 <https://github.com/git-cola/git-cola/pull/582>`_)
1883 * The `unittest.mock` module is now used instead of the original `mock` module
1884 when running the `git cola` test suite using Python3.
1885 (`#569 <https://github.com/git-cola/git-cola/issues/569>`_)
1890 * `git cola` is now compatible with *PyQt5*, *PyQt4*, and *Pyside*.
1891 `git cola` previously supported *PyQt4* only, but will now use whichever
1892 library is available. Users are not required to upgrade at this time,
1893 but *PyQt5* support can be enabled anytime by making its python
1895 (`#232 <https://github.com/git-cola/git-cola/issues/232>`_)
1897 *NOTE*: We do not yet recommend using *PyQt5* because there are known
1898 exit-on-segfault bugs in *Qt5* that have not yet been addressed.
1899 `git cola` is sensitive to this bug and is known to crash on exit
1900 when using `git dag` or the interactive rebase feature on *PyQt5*.
1902 https://bugreports.qt.io/browse/QTBUG-52988
1904 *PyQt4* is stable and there are no known issues when using it so
1905 we recommend using it until the Qt5 bugs have been resolved.
1907 * `git cola` now depends on *QtPy* and includes a bundled copy of the
1908 `qtpy` library. If you are packaging `git cola` and would prefer to use
1909 `qtpy` from your distribution instead of the built-in version then use
1910 `make NO_VENDOR_LIBS=1` when building `git cola`. This will prevent
1911 vendored libraries from being installed.
1919 Usability, bells and whistles
1920 -----------------------------
1922 * A new "Reset" sub-menu provides access to running "git reset --mixed"
1923 when resetting branch heads and "git reset --merge" when resetting
1925 (`#542 <https://github.com/git-cola/git-cola/issues/542>`_)
1927 * `git cola` now supports linked worktrees, i.e. worktrees created by
1929 (`#554 <https://github.com/git-cola/git-cola/issues/554>`_)
1934 * Diff highlighting is now robust to the user having
1935 diff.supressBlankEmpty=true in their git config.
1936 (`#541 <https://github.com/git-cola/git-cola/issues/541>`_)
1938 * The filesystem monitor now properly handles repositories that use
1939 `.git`-files, e.g. when using submodules.
1940 (`#545 <https://github.com/git-cola/git-cola/issues/545>`_)
1941 (`#546 <https://github.com/git-cola/git-cola/pulls/546>`_)
1943 * Per-repository git configuration is now properly detected when launching
1944 `git cola` from an application launcher.
1945 (`#548 <https://github.com/git-cola/git-cola/issues/548>`_)
1947 * `git cola` now cleans up after itself immediately to avoid leaving behind
1948 empty `/tmp/git-cola-XXXXXX` directories when the user uses `Ctrl+C`
1950 (`#566 <https://github.com/git-cola/git-cola/issues/566>`_)
1955 * It is now possible to install `git cola` to and from utf8-encoded filesystem
1956 paths. Previously, Python's stdlib would throw an encoding error during
1957 installation. We workaround the stdlib by forcing python2 to use utf-8,
1958 thus fixing assumptions in the stdlib library code.
1959 (`#551 <https://github.com/git-cola/git-cola/issues/551>`_)
1967 Usability, bells and whistles
1968 -----------------------------
1970 * The icon for untracked files was adjusted to better differentiate
1971 between files and the "Untracked" header.
1972 (`#509 <https://github.com/git-cola/git-cola/issues/509>`_)
1974 * Ctrl+O was added as a hotkey for opening repositories.
1975 (`#507 <https://github.com/git-cola/git-cola/pull/507>`_)
1977 * `git dag` now uses consistent edge colors across updates.
1978 (`#512 <https://github.com/git-cola/git-cola/issues/512>`_)
1980 * `git cola`'s Bookmarks widget can now be used to set a "Default Repository".
1981 Under the hood, we set the `cola.defaultrepo` configuration variable.
1982 The default repository is used whenever `git cola` is launched outside of
1983 a Git repository. When unset, or when set to a bogus value, `git cola`
1984 will prompt for a repository, as it previously did.
1985 (`#513 <https://github.com/git-cola/git-cola/issues/513>`_)
1987 * `git cola`'s Russian and Spanish translations were improved
1988 thanks to Vaiz and Zeioth.
1989 (`#514 <https://github.com/git-cola/git-cola/pull/514>`_)
1990 (`#515 <https://github.com/git-cola/git-cola/pull/515>`_)
1991 (`#523 <https://github.com/git-cola/git-cola/pull/523>`_)
1993 * `git cola` was translated to Turkish thanks to Barış ÇELİK.
1994 (`#520 <https://github.com/git-cola/git-cola/pull/520>`_)
1996 * The status view now supports launching `git gui blame`. It can be
1997 configured to use a different command by setting `cola.blameviewer`.
1998 (`#521 <https://github.com/git-cola/git-cola/pull/521>`_)
2000 * `git dag` now allows selecting non-contiguous ranges in the log widget.
2001 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
2003 * Any font can now be chosen for the diff editor, not just monospace fonts.
2004 (`#525 <https://github.com/git-cola/git-cola/issues/525>`_)
2009 * `xfce4-terminal` and `gnome-terminal` are now supported when launching
2010 `git mergetool` to resolve merges. These terminals require that the command
2011 to execute is shell-quoted and passed as a single string argument to `-e`
2012 rather than as additional command line arguments.
2013 (`#524 <https://github.com/git-cola/git-cola/issues/524>`_)
2015 * Fixed a unicode problem when formatting the error message that is shown
2016 when `gitk` is not installed. We now handle unicode data in tracebacks
2017 generated by python itself.
2018 (`#528 <https://github.com/git-cola/git-cola/issues/528>`_)
2020 * The `New repository` feature was fixed.
2021 (`#533 <https://github.com/git-cola/git-cola/pull/533>`_)
2023 * We now use omit the extended description when creating "fixup!" commits,
2024 for consistency with the Git CLI. We now include only the one-line summary
2025 in the final commit message.
2026 (`#522 <https://github.com/git-cola/git-cola/issues/522>`_)
2034 Usability, bells and whistles
2035 -----------------------------
2037 * The user interface is now HiDPI-capable. git-cola now uses SVG
2038 icons, and its interface can be scaled by setting the `GIT_COLA_SCALE`
2039 environment variable.
2041 * `git dag` now supports the standard editor, difftool, and history hotkeys.
2042 It is now possible to invoke these actions from file widget's context
2043 menu and through the standard hotkeys.
2044 (`#473 <https://github.com/git-cola/git-cola/pull/473>`_)
2046 * The `Status` tool also learned about the history hotkey.
2047 Additionally, the `Alt + {J,K}` aliases are also supported in the `Status`
2048 tool for consistency with the other tools where the non-Alt hotkeys are not
2050 (`#488 <https://github.com/git-cola/git-cola/pull/488>`_)
2052 * The `File Browser` tool now has better default column sizes,
2053 and remembers its window size and placement.
2055 * The `File Browser` now supports the refresh hotkey, and has better
2056 behavior when refreshing. The selection is now retained, and new and
2057 removed files are found when refreshing.
2059 * A new `git-cola-completion.bash` completion script is provided in the
2060 `contrib/` directory. It must be used alongside Git's completion script.
2061 Source it from your `~/.bashrc` (or `~/.zshrc`, etc) after sourcing
2062 the `git-completion.bash` script and you will have command-line completion
2063 support for the `git cola` and `git dag` sub-commands.
2065 * The "checkout" dialog now offers completion for remote branches and other
2066 git refs. This makes it easier to checkout remote branches in a detached
2067 head state. Additionally, the checkout dialog also offers completion for
2068 remote branches that have not yet been checked out, which makes it easier to
2069 create a local tracking branch by just completing for that potential name.
2070 (`#390 <https://github.com/git-cola/git-cola/issues/390>`_)
2072 * The "create branch" and "create tag" dialogs now save and restore their
2075 * The "status" widget can now be configured to use a bold font with a darker
2076 background for the header items.
2077 (`#506 <https://github.com/git-cola/git-cola/pull/506>`_)
2079 * The "status" widget now remembers its horizontol scrollbar position across
2080 updates. This is helpful when working on projects with long paths.
2081 (`#494 <https://github.com/git-cola/git-cola/issues/494>`_)
2086 * When using *Git for Windows*, a `git` window would appear
2087 when running *Windows 8*. We now pass additional flags to
2088 `subprocess.Popen` to prevent a `git` window from appearing.
2089 (`#477 <https://github.com/git-cola/git-cola/issues/477>`_)
2090 (`#486 <https://github.com/git-cola/git-cola/pull/486>`_)
2092 * Launching difftool with `.PY` in `$PATHEXT` on Windows was fixed.
2093 (`#492 <https://github.com/git-cola/git-cola/issues/492>`_)
2095 * Creating a local branch tracking a remote branch that contains
2096 slashes in its name is now properly handled.
2097 (`#496 <https://github.com/git-cola/git-cola/issues/496>`_)
2099 * The "Browse Other Branch" feature was broken by Python3, and is now fixed.
2100 (`#501 <https://github.com/git-cola/git-cola/issues/501>`_)
2102 * We now avoid `long` for better Python3 compatibility.
2103 (`#502 <https://github.com/git-cola/git-cola/issues/502>`_)
2105 * We now use Git's default merge message when merging branches.
2106 (`#508 <https://github.com/git-cola/git-cola/issues/508>`_)
2108 * Miscellaneous fixes
2109 (`#485 <https://github.com/git-cola/git-cola/pull/485>`_)
2114 * git-cola's documentation no longer uses an intersphinx link mapping
2115 to docs.python.org. This fixes warnings when building rpms using koji,
2116 where network access is prevented.
2118 https://bugzilla.redhat.com/show_bug.cgi?id=1231812
2126 Usability, bells and whistles
2127 -----------------------------
2129 * The Interactive Rebase feature now works on Windows!
2130 (`#463 <https://github.com/git-cola/git-cola/issues/463>`_)
2132 * The `diff` editor now understands vim-style `hjkl` navigation hotkeys.
2133 (`#476 <https://github.com/git-cola/git-cola/issues/476>`_)
2135 * `Alt + {J,K}` navigation hotkeys were added to allow changing to the
2136 next/previous file from the diff and commit editors.
2138 * The `Rename branch` menu action is now disabled in empty repositories.
2139 (`#475 <https://github.com/git-cola/git-cola/pull/475>`_)
2140 (`#459 <https://github.com/git-cola/git-cola/issues/459>`_)
2142 * `git cola` now checks unmerged files for conflict markers before
2143 staging them. This feature can be disabled in the preferences.
2144 (`#464 <https://github.com/git-cola/git-cola/issues/464>`_)
2146 * `git dag` now remembers which commits were selected when refreshing
2147 so that it can restore the selection afterwards.
2148 (`#480 <https://github.com/git-cola/git-cola/issues/480>`_)
2150 * "Launch Editor", "Launch Difftool", "Stage/Unstage",
2151 and "Move Up/Down" hotkeys now work when the commit message
2153 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
2155 * The diff editor now supports the `Ctrl+u` hotkey for reverting
2156 diff hunks and selected lines.
2158 * The `core.commentChar` Git configuration value is now honored.
2159 Commit messages and rebase instruction sheets will now use
2160 the configured character for comments. This allows having
2161 commit messages that start with `#` when `core.commentChar`
2162 is configured to its non-default value.
2163 (`#446 <https://github.com/git-cola/git-cola/issues/446>`_)
2168 * Diff syntax highlighting was improved to handle more edge cases
2169 and false positives.
2170 (`#467 <https://github.com/git-cola/git-cola/pull/467>`_)
2172 * Setting commands in the interactive rebase editor was fixed.
2173 (`#472 <https://github.com/git-cola/git-cola/issues/472>`_)
2175 * git-cola no longer clobbers the Ctrl+Backspace text editing shortcut
2176 in the commit message editor.
2177 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
2179 * The copy/paste clipboard now persists after `git cola` exits.
2180 (`#484 <https://github.com/git-cola/git-cola/issues/484>`_)
2190 * Fixed the "Sign off" feature in the commit message editor.
2198 Usability, bells and whistles
2199 -----------------------------
2200 * Double-click will now choose a commit in the "Select commit" dialog.
2202 * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the
2203 commit message when a merge is in-progress. Upon refresh, `git cola` will
2204 now detect when a merge has completed and reset the commit message back to
2205 its previous state. It is only reset if the editor contains a message
2206 that was read from the file and has not been manually edited by the user.
2208 * The commit message editor's context menu now has a "Clear..." action for
2209 clearing the message across both the summary and description fields.
2211 * Traditional Chinese (Taiwan) translation updates.
2213 * The system theme's icons are now used wherever possible.
2214 (`#458 <https://github.com/git-cola/git-cola/pull/458>`_)
2218 * The stash viewer now uses ``git show --no-ext-diff`` to avoid running
2219 user-configured diff tools.
2221 * `git cola` now uses the `setsid()` system call to ensure that the
2222 `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing
2223 changes using `git`. The askpass helpers will now be used even when
2224 `git cola` is launched from a terminal.
2226 The behavior without `setsid()` is that `git cola` can appear to hang while
2227 pushing changes. The hang happens when `git` prompts the user for a
2228 password using the terminal, but the user never sees the prompt. `setsid()`
2229 detaches the terminal, which ensures that the askpass helpers are used.
2230 (`#218 <https://github.com/git-cola/git-cola/issues/218>`_)
2231 (`#262 <https://github.com/git-cola/git-cola/issues/262>`_)
2232 (`#377 <https://github.com/git-cola/git-cola/issues/377>`_)
2234 * `git dag`'s file list tool was updated to properly handle unicode paths.
2236 * `gnome-terminal` is no longer used by default when `cola.terminal` is unset.
2237 It is broken, as was detailed in #456.
2238 (`#456 <https://github.com/git-cola/git-cola/issues/456>`_)
2240 * The interactive rebase feature was not always setting `$GIT_EDITOR`
2241 to the value of `gui.editor`, thus there could be instances where rebase
2242 will seem to not stop, or hang, when performing "reword" actions.
2244 We now set the `$GIT_EDITOR` environment variable when performing the
2245 "Continue", "Skip", and "Edit Todo" rebase actions so that the correct
2246 editor is used during the rebase.
2247 (`#445 <https://github.com/git-cola/git-cola/issues/445>`_)
2251 * `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y"
2252 version number. Most of our releases tend to contain new features.
2259 Usability, bells and whistles
2260 -----------------------------
2261 * Updated zh_TW translations.
2263 * `git cola rebase` now defaults to `@{upstream}`, and generally uses the same
2264 CLI syntax as `git rebase`.
2266 * The commit message editor now allows you to bypass commit hooks by selecting
2267 the "Bypass Commit Hooks" option. This is equivalent to passing the
2268 `--no-verify` option to `git commit`.
2269 (`#357 <https://github.com/git-cola/git-cola/issues/357>`_)
2271 * We now prevent the "Delete Files" action from creating a dialog that does
2273 (`#378 <https://github.com/git-cola/git-cola/issues/378>`_)
2275 * `git xbase` learned to edit rebase instruction sheets that contain
2278 * The diff colors are now configurable. `cola.color.{text,add,remove,header}`
2279 can now be set with 6-digit hexadecimal colors.
2280 See the `git cola manual <https://git-cola.readthedocs.io/en/latest/git-cola.html#configuration-variables>_`
2283 * Improved hotkey documentation.
2287 * `git cola` will now allow starting an interactive rebase with a dirty
2288 worktree when `rebase.autostash` is set.
2289 (`#360 <https://github.com/git-cola/git-cola/issues/360>`_)
2296 Usability, bells and whistles
2297 -----------------------------
2298 * A new "Find files" widget was added, and can be activated by
2299 using the `Ctrl+t` or `t` hotkeys.
2301 * A new `git cola find` sub-command was added for finding files.
2303 * `git cola` now remembers the text cursor's position when staging
2304 interactively with the keyboard. This makes it easier to use the keyboard
2305 arrows to select and stage lines.
2307 * The completion widgets will now select the top completion item
2308 when `Enter` or `Return` are pressed.
2310 * You can now refresh using `F5` in addition to the existing `Ctrl+R` hotkey.
2314 * `git cola` now passes `--no-abbrev-commit` to `git log` to override
2315 having `log.abbrevCommit = true` set in `.gitconfig`.
2322 Usability, bells and whistles
2323 -----------------------------
2324 * `git dag` now forwards all unknown arguments along to `git log`.
2325 (`#389 <https://github.com/git-cola/git-cola/issues/389>`_)
2327 * Line-by-line interactive staging was made more robust.
2328 (`#399 <https://github.com/git-cola/git-cola/pull/399>`_)
2330 * "Bookmarks" was renamed to "Favorites".
2331 (`#392 <https://github.com/git-cola/git-cola/issues/392>`_)
2333 * Untracked files are now displayed using a unique icon.
2334 (`#388 <https://github.com/git-cola/git-cola/pull/388>`_)
2338 * `git dag` was triggering a traceback on Fedora when parsing Git logs.
2339 (`bz #181676 <https://bugzilla.redhat.com/show_bug.cgi?id=1181686>`_)
2341 * inotify expects unicode paths on Python3.
2342 (`#393 <https://github.com/git-cola/git-cola/pull/393>`_)
2344 * Untracked files are now assumed to be utf-8 encoded.
2345 (`#401 <https://github.com/git-cola/git-cola/issues/401>`_)
2352 Usability, bells and whistles
2353 -----------------------------
2354 * `git cola` can now create GPG-signed commits and merges.
2355 See the documentation for details about setting up a GPG agent.
2356 (`#149 <https://github.com/git-cola/git-cola/issues/149>`_)
2358 * The status widget learned to copy relative paths when `Ctrl+x` is pressed.
2359 (`#358 <https://github.com/git-cola/git-cola/issues/358>`_)
2361 * Custom GUI actions can now define their own keyboard shortcuts by
2362 setting `guitool.$name.shortcut` to a string understood by Qt's
2363 `QAction::setShortcut()` API, e.g. `Alt+X`.
2365 `Qt docs <http://qt-project.org/doc/qt-4.8/qkeysequence.html#QKeySequence-2>`_
2366 for more details about the supported values.
2368 * `git cola` learned to rename branches.
2369 (`#364 <https://github.com/git-cola/git-cola/pull/364>`_)
2370 (`#278 <https://github.com/git-cola/git-cola/issues/278>`_)
2372 * `git dag` now has a "Show history" context menu which can be used to filter
2373 history using the selected paths.
2377 * `sphinxtogithub.py` was fixed for Python3.
2378 (`#353 <https://github.com/git-cola/git-cola/pull/353>`_)
2380 * The commit that changed how we read remotes from `git remote`
2381 to parsing `git config` was reverted since it created problems
2384 * Fixed a crash when using the `rebase edit` feature.
2385 (`#351 <https://github.com/git-cola/git-cola/issues/351>`_)
2387 * Better drag-and-drop behavior when dropping into gnome-terminal.
2388 (`#373 <https://github.com/git-cola/git-cola/issues/373>`_)
2392 * The `git-cola-folder-handler.desktop` file handler was fixed
2393 to pass validation by `desktop-file-validate`.
2394 (`#356 <https://github.com/git-cola/git-cola/issues/356>`_)
2396 * The `git.svg` icon was renamed to `git-cola.svg`, and `git cola` was taught
2397 to prefer icons from the desktop theme when available.
2404 Usability, bells and whistles
2405 -----------------------------
2406 * New hotkey: `Ctrl+Shift+M` merges branches.
2408 * New hotkey: `Ctrl+R` refreshes the DAG viewer.
2409 (`#347 <https://github.com/git-cola/git-cola/issues/347>`_)
2413 * We now use `git config` to parse the list of remotes
2414 instead of parsing the output of `git remote`, which
2415 is a Git porcelain and should not be used by scripts.
2417 * Avoid "C++ object has been deleted" errors from PyQt4.
2418 (`#346 <https://github.com/git-cola/git-cola/issues/346>`_)
2422 * The `make install` target now uses `install` instead of `cp`.
2429 Usability, bells and whistles
2430 -----------------------------
2431 * Updated Brazilian Portuguese translation.
2433 * The status and browse widgets now allow drag-and-drop into
2434 external applications.
2435 (`#335 <https://github.com/git-cola/git-cola/issues/335>`_)
2437 * We now show a progress bar when cloning repositories.
2438 (`#312 <https://github.com/git-cola/git-cola/issues/312>`_)
2440 * The bookmarks widget was simplified to not need a
2442 (`#289 <https://github.com/git-cola/git-cola/issues/289>`_)
2444 * Updated Traditional Chinese translation.
2446 * We now display a warning when trying to rebase with uncommitted changes.
2447 (`#338 <https://github.com/git-cola/git-cola/issues/338>`_)
2449 * The status widget learned to filter paths.
2450 `Ctrl+Shift+S` toggles the filter widget.
2451 (`#337 <https://github.com/git-cola/git-cola/issues/337>`_)
2452 (`#339 <https://github.com/git-cola/git-cola/pull/339>`_)
2454 * The status widget learned to move files to the trash
2455 when the `send2trash <https://github.com/hsoft/send2trash>`_
2456 module is installed.
2457 (`#341 <https://github.com/git-cola/git-cola/issues/341>`_)
2459 * "Recent repositories" is now a dedicated widget.
2460 (`#342 <https://github.com/git-cola/git-cola/issues/342>`_)
2462 * New Spanish translation thanks to Pilar Molina Lopez.
2463 (`#344 <https://github.com/git-cola/git-cola/pull/344>`_)
2467 * Newly added remotes are now properly seen by the fetch/push/pull dialogs.
2468 (`#343 <https://github.com/git-cola/git-cola/issues/343>`_)
2475 Usability, bells and whistles
2476 -----------------------------
2477 * New Brazilian Portuguese translation thanks to Vitor Lobo.
2479 * New Indonesian translation thanks to Samsul Ma'arif.
2481 * Updated Simplified Chinese translation thanks to Zhang Han.
2483 * `Ctrl+Backspace` is now a hotkey for "delete untracked files" in
2486 * Fetch/Push/Pull dialogs now use the configured remote of the current
2488 (`#324 <https://github.com/git-cola/git-cola/pull/324>`_)
2492 * We now use `os.getcwd()` on Python3.
2493 (`#316 <https://github.com/git-cola/git-cola/pull/316>`_)
2494 (`#326 <https://github.com/git-cola/git-cola/pull/326>`_)
2496 * The `Ctrl+P` hotkey was overloaded to both "push" and "cherry-pick",
2497 so "cherry-pick" was moved to `Ctrl+Shift+C`.
2499 * Custom GUI tools with mixed-case names are now properly supported.
2501 * "Diff Region" is now referred to as "Diff Hunk" for consistency
2502 with common terminology from diff/patch tools.
2503 (`#328 <https://github.com/git-cola/git-cola/issues/328>`_)
2505 * git-cola's test suite is now portable to MS Windows.
2506 (`#332 <https://github.com/git-cola/git-cola/pull/332>`_)
2513 Usability, bells and whistles
2514 -----------------------------
2515 * We now handle the case when inotify `add_watch()` fails
2516 and display instructions on how to increase the number of watches.
2517 (`#263 <https://github.com/git-cola/git-cola/issues/263>`_)
2519 * New and improved zh_TW localization thanks to V字龍(Vdragon).
2520 (`#265 <https://github.com/git-cola/git-cola/pull/265>`_)
2521 (`#267 <https://github.com/git-cola/git-cola/pull/267>`_)
2522 (`#268 <https://github.com/git-cola/git-cola/pull/268>`_)
2523 (`#269 <https://github.com/git-cola/git-cola/issues/269>`_)
2524 (`#270 <https://github.com/git-cola/git-cola/pull/270>`_)
2525 (`#271 <https://github.com/git-cola/git-cola/pull/271>`_)
2526 (`#272 <https://github.com/git-cola/git-cola/pull/272>`_)
2528 * New hotkeys: `Ctrl+F` for fetch, `Ctrl+P` for push,
2529 and `Ctrl+Shift+P` for pull.
2531 * The bookmarks widget's context menu actions were made clearer.
2532 (`#281 <https://github.com/git-cola/git-cola/issues/281>`_)
2534 * The term "Staging Area" is used consistently in the UI
2535 to allow for better localization.
2536 (`#283 <https://github.com/git-cola/git-cola/issues/283>`_)
2538 * The "Section" term is now referred to as "Diff Region"
2540 (`#297 <https://github.com/git-cola/git-cola/issues/297>`_)
2542 * The localization documentation related to the LANGUAGE
2543 environment variable was improved.
2544 (`#293 <https://github.com/git-cola/git-cola/pull/293>`_)
2546 * The "Actions" panel now contains tooltips for each button
2547 in case the button labels gets truncated by Qt.
2548 (`#292 <https://github.com/git-cola/git-cola/issues/292>`_)
2550 * Custom `git config`-defined actions can now be run in the
2551 background by setting `guitool.<name>.background` to `true`.
2555 * We now use bold fonts instead of SmallCaps to avoid
2556 artifacts on several configurations.
2558 * We now pickup `user.email`, `cola.tabwidth`, and similar settings
2559 when defined in /etc/gitconfig.
2560 (`#259 <https://github.com/git-cola/git-cola/issues/259>`_)
2562 * Better support for unicode paths when using inotify.
2563 (`bz #1104181 <https://bugzilla.redhat.com/show_bug.cgi?id=1104181>`_)
2565 * Unicode fixes for non-ascii locales.
2566 (`#266 <https://github.com/git-cola/git-cola/issues/266>`_)
2567 (`#273 <https://github.com/git-cola/git-cola/issues/273>`_)
2568 (`#276 <https://github.com/git-cola/git-cola/issues/276>`_)
2569 (`#282 <https://github.com/git-cola/git-cola/issues/282>`_)
2570 (`#298 <https://github.com/git-cola/git-cola/issues/298>`_)
2571 (`#302 <https://github.com/git-cola/git-cola/issues/302>`_)
2572 (`#303 <https://github.com/git-cola/git-cola/issues/303>`_)
2573 (`#305 <https://github.com/git-cola/git-cola/issues/305>`_)
2575 * Viewing history from the file browser was fixed for Python3.
2576 (`#274 <https://github.com/git-cola/git-cola/issues/274>`_)
2578 * setup.py was fixed to install the `*.rst` documentation.
2579 (`#279 <https://github.com/git-cola/git-cola/issues/279>`_)
2581 * Patch export was fixed for Python3.
2582 (`#290 <https://github.com/git-cola/git-cola/issues/290>`_)
2584 * Fixed adding a bookmark with trailing slashes.
2585 (`#295 <https://github.com/git-cola/git-cola/pull/295>`_)
2587 * The default `git dag` layout is now setup so that its widgets
2588 can be freely resized on Linux.
2589 (`#299 <https://github.com/git-cola/git-cola/issues/299>`_)
2591 * Invalid tag names are now reported when creating tags.
2592 (`#296 <https://github.com/git-cola/git-cola/pull/296>`_)
2599 Usability, bells and whistles
2600 -----------------------------
2601 * `git cola` no longer prompts after successfully creating a new branch.
2602 (`#251 <https://github.com/git-cola/git-cola/pull/251>`_)
2604 * Hitting enter on simple dialogs now accepts them.
2605 (`#255 <https://github.com/git-cola/git-cola/pull/255>`_)
2609 * `git dag` no longer relies on `sys.maxint`, which is
2610 not available in Python3.
2611 (`#249 <https://github.com/git-cola/git-cola/issues/249>`_)
2613 * Python3-related fixes.
2614 (`#254 <https://github.com/git-cola/git-cola/pull/254>`_)
2616 * Python3-on-Windows-related fixes.
2617 (`#250 <https://github.com/git-cola/git-cola/pull/250>`_)
2618 (`#252 <https://github.com/git-cola/git-cola/pull/252>`_)
2619 (`#253 <https://github.com/git-cola/git-cola/pull/253>`_)
2621 * Switching repositories using the bookmarks widget was not
2622 refreshing the inotify watcher.
2623 (`#256 <https://github.com/git-cola/git-cola/pull/256>`_)
2625 * Special commit messages trailers (e.g. "Acked-by:") are now special-cased to
2626 fix word wrapping lines that start with "foo:".
2627 (`#257 <https://github.com/git-cola/git-cola/issues/257>`_)
2629 * `git dag` sometimes left behind selection artifacts.
2630 We now refresh the view to avoid them.
2631 (`#204 <https://github.com/git-cola/git-cola/issues/204>`_)
2638 Usability, bells and whistles
2639 -----------------------------
2640 * Better inotify support for file creation and deletion.
2641 (`#240 <https://github.com/git-cola/git-cola/issues/240>`_)
2643 * `git cola` now supports the X11 Session Management Protocol
2644 and remembers its state across logout/reboot.
2645 (`#164 <https://github.com/git-cola/git-cola/issues/164>`_)
2647 * `git cola` has a new icon.
2648 (`#190 <https://github.com/git-cola/git-cola/issues/190>`_)
2652 * Building the documentation no longer requires `asciidoc`.
2653 We now use `Sphinx <http://sphinx-doc.org/>`_ for building
2654 html documentation and man pages.
2658 * Reworked the git-dag gravatar icon code to avoid a unicode
2661 * Commit message line-wrapping was made to better match the GUI editor.
2662 (`#242 <https://github.com/git-cola/git-cola/issues/242>`_)
2664 * Better support for Python3 on Windows
2665 (`#246 <https://github.com/git-cola/git-cola/issues/246>`_)
2669 * git-cola no longer depends on Asciidoc for building its documentation
2670 and man-pages. We now depend on [Sphinx](http://sphinx-doc.org/) only.
2677 Usability, bells and whistles
2678 -----------------------------
2679 * Some context menu actions are now hidden when selected
2681 (`#238 <https://github.com/git-cola/git-cola/issues/238>`_)
2685 * The build-git-cola.sh contrib script was improved.
2686 (`#235 <https://github.com/git-cola/git-cola/pull/235>`_)
2688 * Non-ascii worktrees work properly again.
2689 (`#234 <https://github.com/git-cola/git-cola/issues/234>`_)
2691 * The browser now guards itself against missing files.
2692 (`bz #1041378 <https://bugzilla.redhat.com/show_bug.cgi?id=1071378>`_)
2694 * Saving widget state now works under Python3.
2695 (`#236 <https://github.com/git-cola/git-cola/pull/236>`_)
2704 * git-cola now runs on Python 3 thanks to Virgil Dupras.
2705 (`#233 <https://github.com/git-cola/git-cola/pull/233>`_)
2707 * Python 2.6, 2.7, and 3.2+ are now supported.
2708 Python 2.5 is no longer supported.
2712 * i18n test fixes thanks to Virgil Dupras.
2713 (`#231 <https://github.com/git-cola/git-cola/pull/231>`_)
2715 * git-cola.app build fixes thanks to Maicon D. Filippsen.
2716 (`#230 <https://github.com/git-cola/git-cola/pull/230>`_)
2718 * Lots of pylint improvements thanks to Alex Chernetz.
2719 (`#229 <https://github.com/git-cola/git-cola/pull/229>`_)
2726 Usability, bells and whistles
2727 -----------------------------
2728 * The new `Bookmarks` tool makes it really easy to switch between repositories.
2730 * There is now a dedicated dialog for applying patches.
2731 See the ``File -> Apply Patches`` menu item.
2732 (`#215 <https://github.com/git-cola/git-cola/issues/215>`_)
2734 * A new `git cola am` sub-command was added for applying patches.
2738 * Fixed a typo that caused inotify events to be silently ignored.
2740 * Fixed the sys.path setup for Mac OS X (Homebrew).
2741 (`#221 <https://github.com/git-cola/git-cola/issues/221>`_)
2743 * Lots of pylint fixes thanks to Alex Chernetz.
2750 Usability, bells and whistles
2751 -----------------------------
2752 * `git cola --amend` now starts the editor in `amend` mode.
2753 (`#187 <https://github.com/git-cola/git-cola/issues/187>`_)
2755 * Multiple lines of text can now be pasted into the `summary` field.
2756 All text beyond the first newline will be automatically moved to the
2757 `extended description` field.
2758 (`#212 <https://github.com/git-cola/git-cola/issues/212>`_)
2762 * Stray whitespace in `.git` files is now ignored.
2763 (`#213 <https://github.com/git-cola/git-cola/issues/213>`_)
2765 * Fix "known incorrect sRGB profile" in `staged-item.png`.
2766 (`gentoo-devel message #85066
2767 <http://comments.gmane.org/gmane.linux.gentoo.devel/85066>`_)
2776 * Fix a traceback when `git push` fails.
2777 (`bz #1034778 <https://bugzilla.redhat.com/show_bug.cgi?id=1034778>`_)
2781 * Most of the git-cola sub-packages have been removed.
2782 The only remaining packages are `cola`, `cola.models`,
2785 * The translation file for Simplified Chinese was renamed
2787 (`#209 <https://github.com/git-cola/git-cola/issues/209>`_)
2796 * `git cola version --brief` now prints the brief version number.
2800 * Resurrected the "make dist" target, for those that prefer to create
2803 * Fixed the typo that broke the preferences dialog.
2810 Usability, bells and whistles
2811 -----------------------------
2812 * We now ship a full-featured interactive `git rebase` editor.
2813 The rebase todo file is edited using the `git xbase` script which
2814 is provided at `$prefix/share/git-cola/bin/git-xbase`.
2815 This script can be used standalone by setting the `$GIT_SEQUENCE_EDITOR`
2816 before running `git rebase --interactive`.
2817 (`#1 <https://github.com/git-cola/git-cola/issues/1>`_)
2819 * Fixup commit messages can now be loaded from the commit message editor.
2821 * Tool widgets can be locked in place by using the "Tools/Lock Layout"
2823 (`#202 <https://github.com/git-cola/git-cola/issues/202>`_)
2825 * You can now push to several remotes simultaneously by selecting
2826 multiple remotes in the "Push" dialog.
2827 (`#148 <https://github.com/git-cola/git-cola/issues/148>`_)
2829 * The `grep` tool learned to search using three different modes:
2830 basic regular expressions (default), extended regular expressions,
2835 * `git cola` now depends on the `argparse` Python module.
2836 This module is part of the stdlib in Python 2.7 and must
2837 be installed separately when using Python 2.6 and below.
2841 * Support unicode in the output from `fetch`, `push`, and `pull`.
2848 Usability, bells and whistles
2849 -----------------------------
2850 * We now detect when the editor or history browser are misconfigured.
2851 (`#197 <https://github.com/git-cola/git-cola/issues/197>`_)
2852 (`bz #886826 <https://bugzilla.redhat.com/show_bug.cgi?id=886826>`_)
2854 * Display of untracked files can be disabled from the Preferences dialog
2855 or by setting the `gui.displayuntracked` configuration variable to `false`.
2856 (`Git Mailing List on 2013-08-21
2857 <https://public-inbox.org/git/20130821032913.GA6092@wheezy.local/>`_)
2861 * Unicode stash names are now supported
2862 (`#198 <https://github.com/git-cola/git-cola/issues/198>`_)
2864 * The diffs produced when reverting workspace changes were made more robust.
2871 Usability, bells and whistles
2872 -----------------------------
2873 * Brand new German translation thanks to Sven Claussner.
2875 * The "File" menu now provides a "New Repository..." menu action.
2877 * `git dag` now uses a dock-widget interface so that its widgets can
2878 be laid-out and arranged. Customizations are saved and restored
2879 the next time `git dag` is launched.
2881 * `git dag` now has a "Zoom Best Fit" button next alongside the
2882 "Zoom In" and "Zoom Out" buttons.
2884 * `Ctrl+L` now focuses the "Search" field in the `git dag` tool.
2886 * Right-clicking in the "diff" viewer now updates the cursor position
2887 before performing actions, which makes it much easier to click around
2888 and selectively stage sections. Previously, the current cursor position
2889 was used which meant that it required two clicks (left-click to update
2890 the position followed by right-click to get the context menu) for the
2891 desired section to be used. This is now a single right-click operation.
2893 * The `Ctrl+D` "Launch Diff Tool" action learned to automatically choose
2894 between `git difftool` and `git mergetool`. If the file is unmerged then
2895 we automatically launch `git mergetool` on the path, otherwise we use
2896 `git difftool`. We do this because `git difftool` is not intended to
2897 be used on unmerged paths. Automatically using `git mergetool` when
2898 appropriate is the most intuitive and muscle-memory-friendly thing to do.
2900 * You can now right-click on folders in your standard file browser
2901 and choose "Open With -> Git Cola" (Linux-only).
2905 * Python 2.6 on Mac OS X Snow Leopard does not provide a namedtuple
2906 at `sys.version_info`. We now avoid using that variable for better
2909 * We now read the user's Git configuration from `~/.config/git/config`
2910 if that file is available, otherwise we use the traditional `~/.gitconfig`
2911 path, just like Git itself.
2913 * Some edge cases were fixed when applying partial/selected diffs.
2915 * The diff viewer is now properly cleared when refreshing.
2916 (`#194 <https://github.com/git-cola/git-cola/issues/194>`_)
2923 Usability, bells and whistles
2924 -----------------------------
2925 * The diff viewer now has an "Options" menu which can be
2926 used to set "git diff" options. This can be used to
2927 ignore whitespace changes or to show a change with its
2928 surrounding function as context.
2929 (`#150 <https://github.com/git-cola/git-cola/issues/150>`_)
2931 * `git cola` now remembers your commit message and will restore it
2932 when `git cola` is restarted.
2933 (`#175 <https://github.com/git-cola/git-cola/pull/175>`_)
2935 * `Ctrl+M` can now be used to toggle the "Amend last commit"
2936 checkbox in the commit message editor.
2937 (`#161 <https://github.com/git-cola/git-cola/pull/161>`_)
2939 * Deleting remote branches can now be done from the "Branch" menu.
2940 (`#152 <https://github.com/git-cola/git-cola/issues/152>`_)
2942 * The commit message editor now has a built-in spell checker.
2946 * We now avoid invoking external diffs when showing diffstats.
2947 (`#163 <https://github.com/git-cola/git-cola/pull/163>`_)
2949 * The `Status` tool learned to reselect files when refreshing.
2950 (`#165 <https://github.com/git-cola/git-cola/issues/165>`_)
2952 * `git cola` now remembers whether it has been maximized and will restore the
2953 maximized state when `git cola` is restarted.
2954 (`#172 <https://github.com/git-cola/git-cola/issues/172>`_)
2956 * Performance is now vastly improved when staging hundreds or
2959 * `git cola` was not correctly saving repo-specific configuration.
2960 (`#174 <https://github.com/git-cola/git-cola/issues/174>`_)
2962 * Fix a UnicodeDecode in sphinxtogithub when building from source.
2970 Usability, bells and whistles
2971 -----------------------------
2972 * We now automatically remove missing repositories from the
2973 "Select Repository" dialog.
2974 (`#145 <https://github.com/git-cola/git-cola/issues/145>`_)
2976 * A new `git cola diff` sub-command was added for diffing changed files.
2980 * The inotify auto-refresh feature makes it difficult to select text in
2981 the "diff" editor when files are being continually modified by another
2982 process. The auto-refresh causes it to lose the currently selected text,
2983 which is not wanted. We now avoid this problem by saving and restoring
2984 the selection when refreshing the editor.
2985 (`#155 <https://github.com/git-cola/git-cola/issues/155>`_)
2987 * More strings have been marked for l10n.
2988 (`#157 <https://github.com/git-cola/git-cola/issues/157>`_)
2990 * Fixed the Alt+D Diffstat shortcut.
2991 (`#159 <https://github.com/git-cola/git-cola/issues/159>`_)
2995 * Better error handling when cloning repositories.
2997 We were not handling the case where a git URL has
2998 no basename, e.g. `https://git.example.com/`.
2999 `git cola` originally rejected these URLs instead of
3000 allowing users to clone them. It now allows these URLs
3001 when they point to valid git repositories.
3003 Additionally, `git cola` learned to echo the errors
3004 reported by `git clone` when it fails.
3005 (`#156 <https://github.com/git-cola/git-cola/issues/156>`_)
3013 Usability, bells and whistles
3014 -----------------------------
3015 * `git dag` got a big visual upgrade.
3017 * `Ctrl+G` now launches the "Grep" tool.
3019 * `Ctrl+D` launches difftool and `Ctrl+E` launches your editor
3020 when in the diff panel.
3022 * git-cola can now be told to use an alternative language.
3023 For example, if the native language is German and we want git-cola to
3024 use English then we can create a `~/.config/git-cola/language` file with
3025 "en" as its contents: ``echo en >~/.config/git-cola/language``
3026 (`#140 <https://github.com/git-cola/git-cola/issues/140>`_)
3028 * A new `git cola merge` sub-command was added for merging branches.
3030 * Less blocking in the main UI
3034 * Autocomplete issues on KDE
3035 (`#144 <https://github.com/git-cola/git-cola/issues/144>`_)
3037 * The "recently opened repositories" startup dialog did not
3038 display itself in the absence of bookmarks.
3039 (`#139 <https://github.com/git-cola/git-cola/issues/139>`_)
3047 Usability, bells and whistles
3048 -----------------------------
3049 * `git cola` learned to honor `.gitattributes` when showing and
3050 interactively applying diffs. This makes it possible to store
3051 files in git using a non-utf-8 encoding and `git cola` will
3052 properly accept them. This must be enabled by settings
3053 `cola.fileattributes` to true, as it incurs a small performance
3055 (`#96 <https://github.com/git-cola/git-cola/issues/96>`_)
3057 * `git cola` now wraps commit messages at 72 columns automatically.
3058 This is configurable using the `cola.linebreak` variable to enable/disable
3059 the feature, and `cola.textwidth` to configure the limit.
3060 (`#133 <https://github.com/git-cola/git-cola/issues/133>`_)
3062 * A new "Open Recent" sub-menu was added to the "File" menu.
3063 This makes it easy to open a recently-edited repository.
3064 (`#135 <https://github.com/git-cola/git-cola/issues/135>`_)
3066 * We now show a preview for untracked files when they are clicked
3067 using the `Status` tool.
3068 * A new "Open Using Default Application" action was added to the
3069 `Status` tool. It is activated using either `Spacebar` or through
3070 the context menu. This action uses `xdg-open` on Linux and
3072 * A new "Open Parent Directory" action was added to the `Status` tool.
3073 It is activated using either `Shift+Spacebar` or through the
3075 * `git dag` learned to honor the `log.date` git configuration variable.
3076 This makes the date display follow whatever format the user has
3078 * A new `git cola config` sub-command was added for quickly
3079 tweaking `git cola`'s git configuration settings.
3080 * Some small usability tweaks -- some user confirmation prompts
3081 were defaulting to "Cancel" when they should have been defaulting
3082 to the affirmative option instead.
3086 * Properly handle arbitrarily-named branches.
3087 * We went back to launching `git mergetool` using an xterm.
3088 The reason is that there are a couple of places where `git mergetool`
3089 requires a terminal for user interaction not covered by `--no-prompt`.
3090 * We now properly handle an edge case when applying short diffs at
3091 the start of a file.
3099 Usability, bells and whistles
3100 -----------------------------
3101 * New and improved `grep` mode lets you instantly find and edit files.
3102 * New `git cola grep` standalone mode.
3103 * Support for passing arguments to the configured editors, e.g. `gvim -p`
3104 This makes it possible to select multiple files in the status
3105 window and use `Ctrl + E` to edit them all at once.
3106 * Remote operations now prompt on errors only.
3107 * The `Tab` key now jumps to the extended description when editing the summary.
3108 * More shortcut key labels and misc. UX improvements.
3112 * Selecting an item no longer copies its filename to the copy/paste buffer.
3113 `Ctrl + C` or the "Copy" context-menu action can be used instead.
3114 * The repository monitoring feature on Windows learned to ignore
3115 changes within the ".git" directory. Thanks to Andreas Sommer.
3116 (`#120 <https://github.com/git-cola/git-cola/issues/120>`_)
3124 Usability, bells and whistles
3125 -----------------------------
3126 * `git dag` learned to color-code branchy edges.
3127 The edge colors change when a new branch is detected,
3128 which makes the history much easier to follow.
3129 A huge thanks to Uri Okrent for making it happen.
3131 * New GUI for editing remote repositories.
3133 * New `git cola archive` and `git cola remote` sub-commands.
3135 * `git cola browser` learned an 'Untrack' command.
3137 * The diff editor learned to staged/unstaged while amending.
3139 * The status tool can now scroll horizontally.
3141 * New git repositories can be created by clicking 'New' on the
3142 `git cola --prompt` startup screen.
3150 Usability, bells and whistles
3151 -----------------------------
3152 * Auto-completion was added to more tools.
3154 * `git dag` is easier to use on smaller displays -- the author
3155 field elides its text which allows for a more compact display.
3157 * Selected commits in `git dag` were made more prominent and
3160 * 'Create Branch' learned to fetch remote branches and uses a
3161 background thread to do so.
3163 * User-configured GUI tools are listed alphabetically in the 'Actions' menu.
3165 * The 'Pull' dialog remembers the value of the 'Rebase' checkbox
3166 between invocations.
3176 * Detect Homebrew so that OS X users do not need to set PYTHONPATH.
3178 * `git dag` can export patches again.
3186 Usability, bells and whistles
3187 -----------------------------
3188 * The 'Classic' tool was renamed to 'Browser' and learned to
3189 limit history to the current branch.
3191 * `git dag` learned about gravatar and uses it to show images
3194 * `git dag` learned to use OpenGL for rendering resulting in
3195 much faster rendering.
3197 * More dialogs learned vim-style keyboard shortcuts.
3199 * The commit message editor learned better arrow key navigation.
3207 Usability, bells and whistles
3208 -----------------------------
3209 * `git cola` learned a few new sub commands:
3217 * `Return` in the summary field jumps to the extended description.
3219 * `Ctrl+Return` is now a shortcut for 'Commit'.
3221 * Better French translation for 'Sign-off'.
3223 * The 'Search' widget now has a much simpler and streamlined
3226 * vim-style `h,j,k,l` navigation shortcuts were added to the DAG widget.
3228 * `git dag` no longer prompts for files when diffing commits if the
3229 text field contains paths.
3231 * General user interface and performance improvements.
3235 * The diff viewer no longer changes font size when holding `Control`
3236 while scrolling with the mouse wheel.
3238 * Files with a typechange (e.g. symlinks that become files, etc.)
3239 are now correctly identified as being modified.
3243 * The `cola.controllers` and `cola.views` packages were removed.
3251 Usability, bells and whistles
3252 -----------------------------
3253 * `git cola` can now launch sub commands, e.g.:
3264 * `git dag` is more responsive when gathering auto-completions.
3266 * Keyboard shortcuts are displayed when the '?' key is pressed.
3268 * Various keyboard shortcuts were added for improved usability.
3270 * The status widget now lists unmerged files before modified files.
3272 * vim-style `h,j,k,l` navigation shortcuts were added to the status widget.
3274 * A 'Recently Modified Files...' tool was added.
3276 * Tools can now be hidden with `Alt + #` (where `#` is a keyboard number)
3277 and focused with `Alt + Shift + #`.
3279 * The syntax highlighting colors for diffs was made less intrusive.
3281 * The commit message editor was redesigned to have a more compact
3282 and keyboard-convenient user interface.
3284 * Keyboard shortcuts for adding a Signed-off-by (`Ctrl + i`)
3285 and creating a commit (`Ctrl + m`) were added.
3287 * The status widget was adjusted to use less screen real-estate.
3291 * Avoid updating the index when responding to inotify events.
3292 This avoids interfering with operations such as `git rebase --interactive`.
3293 (`#99 <https://github.com/git-cola/git-cola/issues/99>`_)
3297 * Create `git-dag.pyw` in the win32 installer.
3299 * win32 shortcuts now contain explicit calls to `pythonw.exe` instead of
3300 calling the `.pyw` file directly.
3304 * The 'Apply Changes from Branch...' feature was removed.
3305 `git dag`'s 'Grab File...' feature used alongside the index/worktree editor
3306 is a simpler alternative.
3316 * Further enhanced the staging/unstaging behavior in the status widget.
3317 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
3319 * Unmerged files are no longer listed as modified.
3323 The `cola-$version` tarballs on github were originally setup to
3324 have the same contents as the old tarballs hosted on tuxfamily.
3325 The `make dist` target was changed to write files to a
3326 `git-cola-$version` subdirectory and tarball.
3328 This makes the filenames consistent for the source tarball,
3329 the darwin .app tarball, and the win32 .exe installer.
3337 Usability, bells and whistles
3338 -----------------------------
3339 * Refined the staging/unstaging behavior for code reviews.
3340 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
3342 * Added more styling and icons to menus and buttons.
3344 * Adjusted some terminology to more closely match the git CLI.
3348 * Boolean `git config` settings with no value are now supported
3349 (these are not created by git these days but exist in legacy repositories).
3351 * Unicode branches and tags are supported in the "branch diff" tool.
3353 * Guard against low-memory conditions and more interrupted system calls.
3357 * Added desktop launchers for git-cola.desktop and git-dag.desktop.
3358 This replaces the old cola.desktop, so some adjustments to RPM .spec
3359 and debian/ files will be needed.
3361 * Fixed the darwin app-tarball Makefile target to create relative paths.
3365 * The `--style` option was removed. `git cola` follows the system theme
3366 so there's no need for this option these days.
3374 Usability, bells and whistles
3375 -----------------------------
3376 * Export a patch series from `git dag` into a `patches/` directory.
3378 * `git dag` learned to diff commits, slice history along paths, etc.
3380 * Added instant-preview to the `git stash` widget.
3382 * A simpler preferences editor is used to edit `git config` values.
3383 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
3384 (`#89 <https://github.com/git-cola/git-cola/issues/89>`_)
3386 * Previous commit messages can be re-loaded from the message editor.
3387 (`#33 <https://github.com/git-cola/git-cola/issues/33>`_)
3391 * Display commits with no file changes.
3392 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
3394 * Improved the diff editor's copy/paste behavior
3395 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
3399 * Bumped version number to ceil(minimum git version).
3400 `git cola` now requires `git` >= 1.6.3.
3402 * Simplified git-cola's versioning when building from tarballs
3403 outside of git. We no longer check for a 'version' file at
3404 the root of the repository. We instead keep a default version
3405 in `cola/version.py` and use it when `git cola`'s `.git` repository
3414 Usability, bells and whistles
3415 -----------------------------
3416 * inotify is much snappier and available on Windows
3417 thanks to Karl Bielefeldt.
3419 * New right-click command to add untracked files to .gitignore
3420 thanks to Audrius Karabanovas.
3422 * Stash, fetch, push, and pull usability improvements
3424 * General usability improvements
3426 * stderr is logged when applying partial diffs.
3430 * Files can be unstaged when amending.
3431 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
3433 * Show the configured remote.$remote.pushurl in the GUI
3434 (`#83 <https://github.com/git-cola/git-cola/issues/83>`_)
3436 * Removed usage of the "user" module.
3437 (`#86 <https://github.com/git-cola/git-cola/issues/86>`_)
3439 * Avoids an extra `git update-index` call during startup.
3447 Usability, bells and whistles
3448 -----------------------------
3449 * We now provide better feedback when `git push` fails.
3450 (`#69 <https://github.com/git-cola/git-cola/issues/69>`_)
3452 * The Fetch, Push, and Pull dialogs now give better feedback
3453 when interacting with remotes. The dialogs are modal and
3454 a progress dialog is used.
3458 * More unicode fixes, again. It is now possible to have
3459 unicode branch names, repository paths, home directories, etc.
3460 This continued the work initiated by Redhat's bugzilla #694806.
3462 https://bugzilla.redhat.com/show_bug.cgi?id=694806
3470 Usability, bells and whistles
3471 -----------------------------
3472 * The `git cola` desktop launchers now prompt for a repo
3473 by default. This is done by using the new `--prompt`
3474 flag which tells `git cola` to ignore any git repositories
3475 in the current directory and prompt for one instead.
3479 * More Unicode fixes for repositories and home directories with
3480 embedded unicode characters. Thanks to Christian Jann for
3481 patience and helpful bug reports.
3483 * Fix the 'Clone' button in the startup dialog.
3491 Usability, bells and whistles
3492 -----------------------------
3493 * Faster startup time! `git cola` now offloads initialization
3494 to a background thread so that the GUI appears almost instantly.
3496 * Specialized diff options for p4merge, vimdiff, araxis, emerge,
3497 and ecmerge in difftool (backported from git.git).
3501 * Fix launching commands in the background on Windows
3502 (e.g. when launching `git difftool`).
3504 * Fix unicode errors when home or repository directories contain
3506 (`#74 <https://github.com/git-cola/git-cola/issues/74>`_)
3507 (`bz #694806 <https://bugzilla.redhat.com/show_bug.cgi?id=694806>`_)
3515 Usability, bells and whistles
3516 -----------------------------
3517 * The `cola classic` tool can be now configured to be dockable.
3518 (`#56 <https://github.com/git-cola/git-cola/issues/56>`_)
3520 * The `cola classic` tool now uses visual sigils to indicate a file's status.
3521 The idea and icons were provided by Uri Okrent.
3523 * Include the 'Rescan' button in the 'Actions' widget regardless
3524 of whether inotify is installed.
3528 * Fix installation of translations per Fedora
3529 This incorporates Fedora's fix for the translations path
3530 which originally appeared in cola-1.4.3-translations.patch.
3532 * Mac OS X git-cola developers can now generate git-cola.app
3533 application bundles using 'make app-bundle'.
3537 * Fixed a stacktrace when trying to use "Get Commit Message Template"
3538 with an unconfigured "commit.template" git config variable.
3539 (`bz #67521 <https://bugzilla.redhat.com/show_bug.cgi?id=675721>`_)
3540 (`#72 <https://github.com/git-cola/git-cola/issues/72>`_)
3542 * Properly raise the main window on Mac OS X.
3544 * Properly handle staging a huge numbers of files at once.
3546 * Speed up 'git config' usage by fixing cola's caching proxy.
3548 * Guard against damaged ~/.cola files.
3556 Usability, bells and whistles
3557 -----------------------------
3558 * `git dag` now has a separate display area
3559 for displaying commit metadata. This area will soon
3560 grow additional functionality such as cherry-picking,
3565 * Fixed tests from a previous refactoring.
3567 * Guard against 'diff.external' configuration by always
3568 calling 'git diff' with the '--no-ext-diff' option.
3569 (`#67 <https://github.com/git-cola/git-cola/issues/67>`_)
3571 * Respect 'gui.diffcontext' so that cola's diff display
3572 shows the correct number of context lines.
3574 * Raise the GUI so that it is in the foreground on OS X.
3578 * We now allow distutils to rewrite cola's shebang line.
3579 This allows us to run on systems where "which python"
3580 is Python3k. This is exposed by setting the `PYTHON`
3581 Makefile variable to the location of python2.x.
3583 * git-cola.app is now a tiny download because it no longer
3584 contains Qt and PyQt. These libraries are provided as a
3586 (`Link <http://code.google.com/p/git-cola/downloads/list>`_)
3594 Usability, bells and whistles
3595 -----------------------------
3596 * Clicking on paths in the status widget copies them into the
3597 copy/paste buffer for easy middle-clicking into terminals.
3599 * `Ctrl+C` in diff viewer copies the selected diff to the clipboard.
3603 * Fixed the disappearing actions buttons on PyQt 4.7.4
3604 as reported by Arch and Ubuntu 10.10.
3605 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3607 * Fixed mouse interaction with the status widget where some
3608 items could not be de-selected.
3612 * Removed hard-coded reference to lib/ when calculating Python's
3613 site-packages directory.
3621 Usability, bells and whistles
3622 -----------------------------
3623 * Removed "single-click to (un)stage" in the status view.
3624 This is a usability improvement since we no longer perform
3625 different actions depending on where a row is clicked.
3627 * Added ability to create unsigned, annotated tags.
3631 * Updated documentation to use `cola.git` instead of `cola.gitcmd`.
3639 Usability, bells and whistles
3640 -----------------------------
3641 * Allow un/staging by right-clicking top-level items
3642 (`#57 <https://github.com/git-cola/git-cola/issues/57>`_)
3644 * Running 'commit' with no staged changes prompts to allow
3646 (`#55 <https://github.com/git-cola/git-cola/issues/55>`_)
3648 * Fetch, Push, and Pull are now available via the menus
3649 (`#58 <https://github.com/git-cola/git-cola/issues/58>`_)
3653 * Simplified the actions widget to work around a regression
3655 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3663 Usability, bells and whistles
3664 -----------------------------
3665 * `git dag` interaction was made faster.
3669 * Added '...' indicators to the buttons for
3670 'Fetch...', 'Push...', 'Pull...', and 'Stash...'.
3671 (`#51 <https://github.com/git-cola/git-cola/issues/51>`_)
3673 * Fixed a hang-on-exit bug in the cola-provided
3674 'ssh-askpass' implementation.
3682 Usability, bells and whistles
3683 -----------------------------
3684 * Staging and unstaging is faster.
3685 (`#48 <https://github.com/git-cola/git-cola/issues/48>`_)
3687 * `git dag` reads history in a background thread.
3691 * Added :data:`cola.compat.hashlib` for `Python 2.4` compatibility
3692 * Improved `PyQt 4.1.x` compatibility.
3696 * Configured menu actions use ``sh -c`` for Windows portability.
3704 Usability, bells and whistles
3705 -----------------------------
3706 * Added support for the configurable ``guitool.<tool>.*``
3707 actions as described in the ``git config`` documentation.
3708 (`git-config(1) <https://git-scm.com/docs/git-config>`_)
3709 (`#44 <https://github.com/git-cola/git-cola/issues/44>`_)
3711 This makes it possible to add new actions to `git cola`
3712 by simply editing ``~/.gitconfig``. This implements the
3713 same guitool support as `git gui`.
3715 * Introduced a stat cache to speed up `git config` and
3716 repository status checks.
3718 * Added Alt-key shortcuts to the main `git cola` interface.
3720 * The `Actions` dock widget switches between a horizontal
3721 and vertical layout when resized.
3723 * We now use ``git diff --submodule`` for submodules
3724 (used when git >= 1.6.6).
3726 * The context menu for modified submodules includes an option
3727 to launch `git cola`.
3728 (`#17 <https://github.com/git-cola/git-cola/issues/17>`_)
3730 * Prefer ``$VISUAL`` over ``$EDITOR`` when both are defined.
3731 These are used to set a default editor in lieu of `core.editor`
3734 * Force the editor to be ``gvim`` when we see ``vim``.
3735 This prevents us from launching an editor in the (typically
3736 unattached) parent terminal and creating zombie editors
3737 that cannot be easily killed.
3739 * Selections are remembered and restored across updates.
3740 This makes the `partial-staging` workflow easier since the
3741 diff view will show the updated diff after staging.
3743 * Show the path to the current repository in a tooltip
3744 over the commit message editor.
3745 (`#45 <https://github.com/git-cola/git-cola/issues/45>`_)
3747 * Log internal ``git`` commands when ``GIT_COLA_TRACE`` is defined.
3748 (`#39 <https://github.com/git-cola/git-cola/issues/39>`_)
3752 * Improved backwards compatibility for Python 2.4.
3754 * `Review mode` can now review the current branch; it no longer
3755 requires you to checkout the branch into which the reviewed
3756 branch will be merged.
3758 * Guard against `color.ui = always` configuration when using
3759 `git log` by passing ``--no-color``.
3761 * ``yes`` and ``no`` are now supported as valid booleans
3762 by the `git config` parser.
3764 * Better defaults are used for `fetch`, `push`, and `pull`..
3765 (`#43 <https://github.com/git-cola/git-cola/issues/43>`_)
3769 * Removed colon (`:`) from the applilcation name on Windows
3770 (`#41 <https://github.com/git-cola/git-cola/issues/41>`_)
3772 * Fixed bugs with the Windows installer
3773 (`#40 <https://github.com/git-cola/git-cola/issues/40>`_)
3775 * Added a more standard i18n infrastructure. The install
3776 tree now has the common ``share/locale/$lang/LC_MESSAGES/git-cola.mo``
3777 layout in use by several projects.
3779 * Started trying to accommodate Mac OSX 10.6 (Snow Leopard)
3780 in the ``darwin/`` build scripts but our tester is yet to
3781 report success building a `.app` bundle.
3783 * Replaced use of ``perl`` in Sphinx/documentation Makefile
3784 with more-portable ``sed`` constructs. Thanks to
3785 Stefan Naewe for discovering the portability issues and
3786 providing msysgit-friendly patches.
3794 Usability, bells and whistles
3795 -----------------------------
3796 * It is now possible to checkout from the index as well
3797 as from `HEAD`. This corresponds to the
3798 `Removed Unstaged Changes` action in the `Repository Status` tool.
3800 * The `remote` dialogs (fetch, push, pull) are now slightly
3803 * Bookmarks can be selected when `git cola` is run outside of a git repository.
3805 * Added more user documentation. We now include many links to
3806 external git resources.
3808 * Added `git dag` to the available tools.
3809 `git dag` is a node-based DAG history browser.
3810 It doesn't do much yet, but it's been merged so that we can start
3811 building and improving upon it.
3815 * Fixed a missing ``import`` when showing `right-click` actions
3816 for unmerged files in the `Repository Status` tool.
3818 * ``git update-index --refresh`` is no longer run every time
3819 ``git cola version`` is run.
3821 * Don't try to watch non-existent directories when using `inotify`.
3823 * Use ``git rev-parse --symbolic-full-name`` plumbing to find
3824 the name of the current branch.
3828 * The ``Makefile`` will now conditionally include a ``config.mak``
3829 file located at the root of the project. This allows for user
3830 customizations such as changes to the `prefix` variable
3831 to be stored in a file so that custom settings do not need to
3832 be specified every time on the command-line.
3834 * The build scripts no longer require a ``.git`` directory to
3835 generate the ``builtin_version.py`` module. The release tarballs
3836 now include a ``version`` file at the root of the project which
3837 is used in lieu of having the git repository available.
3838 This allows for ``make clean && make`` to function outside of
3841 * Added maintainer's ``make dist`` target to the ``Makefile``.
3843 * The built-in `simplejson` and `jsonpickle` libraries can be
3844 excluded from ``make install`` by specifying the ``standalone=true``
3845 `make` variable. For example, ``make standalone=true install``.
3846 This corresponds to the ``--standalone`` option to ``setup.py``.
3854 Usability, bells and whistles
3855 -----------------------------
3856 * We now use patience diff by default when it is available via
3857 `git diff --patience`.
3859 * Allow closing the `cola classic` tool with `Ctrl+W`.
3863 * Fixed an unbound variable error in the `push` dialog.
3867 * Don't include `simplejson` in MANIFEST.in.
3869 * Update desktop entry to read `Cola Git GUI`.
3877 This feature release adds two new features directly from
3878 `git cola`'s github issues backlog. On the developer
3879 front, further work was done towards modularizing the code base.
3881 Usability, bells and whistles
3882 -----------------------------
3883 * Dragging and dropping patches invokes `git am`
3884 (`#3 <https://github.com/git-cola/git-cola/issues/3>`_)
3886 * A dialog to allow opening or cloning a repository
3887 is presented when `git cola` is launched outside of a git repository.
3888 (`#22 <https://github.com/git-cola/git-cola/issues/22>`_)
3890 * Warn when `push` is used to create a new branch
3891 (`#35 <https://github.com/git-cola/git-cola/issues/35>`_)
3893 * Optimized startup time by removing several calls to `git`.
3898 * `git cola` is once again compatible with PyQt 4.3.x.
3902 * `cola.gitcmds` was added to factor out git command-line utilities
3904 * `cola.gitcfg` was added for interacting with `git config`
3906 * `cola.models.browser` was added to factor out repobrowser data
3918 * Fix launching external applications on Windows
3920 * Ensure that the `amend` checkbox is unchecked when switching modes
3922 * Update the status tree when amending commits
3932 * Fix Lintian warnings
3942 * Fix X11 warnings on application startup
3952 * Added missing 'Exit Diff Mode' button for 'Diff Expression' mode
3953 (`#31 <https://github.com/git-cola/git-cola/issues/31>`_)
3955 * Fix a bug when initializing fonts on Windows
3956 (`#32 <https://github.com/git-cola/git-cola/issues/32>`_)
3966 * Keep entries in sorted order in the `cola classic` tool
3968 * Fix staging untracked files
3969 (`#27 <https://github.com/git-cola/git-cola/issues/27>`_)
3971 * Fix the `show` command in the Stash dialog
3972 (`#29 <https://github.com/git-cola/git-cola/issues/29>`_)
3974 * Fix a typo when loading merge commit messages
3975 (`#30 <https://github.com/git-cola/git-cola/issues/30>`_)
3983 This release focuses on a redesign of the git-cola user interface,
3984 a tags interface, and better integration of the `cola classic` tool.
3985 A flexible interface based on configurable docks is used to manage the
3986 various cola widgets.
3988 Usability, bells and whistles
3989 -----------------------------
3990 * New GUI is flexible and user-configurable
3992 * Individual widgets can be detached and rearranged arbitrarily
3994 * Add an interface for creating tags
3996 * Provide a fallback `SSH_ASKPASS` implementation to prompt for
3997 SSH passwords on fetch/push/pull
3999 * The commit message editor displays the current row/column and
4000 warns when lines get too long
4002 * The `cola classic` tool displays upstream changes
4004 * `git cola --classic` launches `cola classic` in standalone mode
4006 * Provide more information in log messages
4010 * Inherit the window manager's font settings
4012 * Miscellaneous PyQt4 bug fixes and workarounds
4016 * Removed all usage of Qt Designer `.ui` files
4018 * Simpler model/view architecture
4020 * Selection is now shared across tools
4022 * Centralized notifications are used to keep views in sync
4024 * The `cola.git` command class was made thread-safe
4026 * Less coupling between model and view actions
4028 * The status view was rewritten to use the MVC architecture
4030 * Added more documentation and tests
4038 Usability, bells and whistles
4039 -----------------------------
4040 * Added a `cola classic` tool for browsing the entire repository
4042 * Handle diff expressions with spaces
4044 * Handle renamed files
4048 * Handle carat `^` characters in diff expressions on Windows
4050 * Worked around a PyQt 4.5/4.6 QThreadPool bug
4054 * Added a keyboard shortcuts reference page
4056 * Added developer API documentation
4060 * Fix the diff expression used when reviewing branches
4062 * Fix a bug when pushing branches
4064 * Fix X11 warnings at startup
4066 * Fix more interrupted system calls on Mac OS X
4074 Usability, bells and whistles
4075 -----------------------------
4076 * Fresh and tasty SVG logos
4078 * Added `Branch Review` mode for reviewing topic branches
4080 * Added diff modes for diffing between tags, branches,
4081 or arbitrary `git diff` expressions
4083 * The push dialog selects the current branch by default.
4084 This is in preparation for `git 1.7.0` where unconfigured `git push`
4085 will refuse to push when run without specifying the remote name
4086 and branch. See the `git` release notes for more information
4088 * Support `open` and `clone` commands on Windows
4090 * Allow saving cola UI layouts
4092 * Re-enabled `double-click-to-stage` for unmerged entries.
4093 Disabling it for unmerged items was inconsistent, though safer.
4095 * Show diffs when navigating the status tree with the keyboard
4099 * Worked around `pyuic4` bugs in the `setup.py` build script
4101 * Added Mac OSX application bundles to the download page
4111 * `git difftool` became an official git command in `git 1.6.3`.
4113 * `git difftool` learned `--no-prompt` / `-y` and a corresponding
4114 `difftool.prompt` configuration variable
4116 Usability, bells and whistles
4117 -----------------------------
4118 * Warn when `non-fast-forward` is used with fetch, push or pull
4120 * Allow `Ctrl+C` to exit cola when run from the command line
4124 * Support Unicode font names
4126 * Handle interrupted system calls
4130 * `PEP-8`-ified more of the cola code base
4136 * All resources are now installed into `$prefix/share/git-cola`.
4137 Closed Debian bug #519972
4139 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519972
4149 * Added support for Kompare in `git difftool`
4151 * Added a separate configuration namespace for `git difftool`
4153 * Added the `diff.tool` configuration variable to define the default diff tool
4155 Usability, bells and whistles
4156 -----------------------------
4157 * The stash dialog allows passing the `--keep-index` option to `git stash`
4159 * Amending a published commit warns at commit time
4161 * Simplified the file-across-revisions comparison dialog
4163 * `origin` is selected by default in fetch/push/pull
4165 * Removed the search field from the log widget
4167 * The log window moved into a drawer widget at the bottom of the UI
4169 * Log window display can be configured with
4170 `cola.showoutput` = `{never, always, errors}`. `errors` is the default.
4172 * `NOTE` -- `cola.showoutput` was removed with the GUI rewrite in 1.4.0.
4176 * Improved nose unittest usage
4180 * Added a Windows/msysGit installer
4182 * Included private versions of `simplejson` and `jsonpickle`
4183 for ease of installation and development