6 Usability, bells and whistles
7 -----------------------------
8 * The Rebase editor is now aware of the ``drop``, ``break``, ``label``, ``merge`` and ``reset``
9 commands that were added in recent versions of Git.
11 * Desktop notifications can now be enabled when pushing remotes by enabling the
12 "Notify on Push" option in the preferences.
13 (`#1404 <https://github.com/git-cola/git-cola/pull/1404>`_)
14 (`#350 <https://github.com/git-cola/git-cola/issues/350>`_)
16 * Faster and easier commit hash copying in DAG. Left-clicking on the Commit ID will
17 now copy it directly into the clipboard without any further action.
18 (`#1401 <https://github.com/git-cola/git-cola/issues/1401>`_)
20 * "Grab File from Parent Commit" actions have been added to the DAG.
21 (`#1401 <https://github.com/git-cola/git-cola/issues/1401>`_)
23 * The `Unstage Selected` action was added to the context menu for unmerged files.
24 (`#1397 <https://github.com/git-cola/git-cola/pull/1397>`_)
26 * ``git cola rebase`` now provides a ``--rebase-merges`` option and passes the
27 same option to ``git rebase`` when `Git v1.18.0` or newer is detected.
31 * Pre-commits hooks were updated.
32 (`#1396 <https://github.com/git-cola/git-cola/pull/1396>`_)
42 * The `importlib_metadata` dependency which was restored for Python 3.8 and earlier
43 to retain Python 3.7 support. The use of `setuptools_scm` 8.0 and newer to generate
44 the `cola/_scm_version.py` version file has been deferred to prevent the need to
53 Usability, bells and whistles
54 -----------------------------
55 * The Fetch dialog can now fetch directly into a remote tracking branch.
56 Previously, fetching just a remote branch would fetch it into `FETCH_HEAD`,
57 which is not very intuitive. If only a remote branch is selected then it makes
58 more sense to fetch into that branch's remote tracking branch directly.
59 Use `FETCH_HEAD` in the local branch field to fetch into `FETCH_HEAD` instead.
60 (`#1387 <https://github.com/git-cola/git-cola/pull/1387>`_)
62 * The Fetch, Push and Pull dialogs now remember the selected remotes.
63 (`#729 <https://github.com/git-cola/git-cola/issues/729>`_)
65 * The Fetch, Push and Pull dialogs now display the git commands that will be run.
66 The Pull dialog now selects the remote branch automatically.
67 (`#729 <https://github.com/git-cola/git-cola/issues/729>`_)
69 * The `cola.refreshonfocus` and `cola.inotify` configuration settings are now accessible
70 from the `git cola config` settings dialog.
74 * The "Ignore" action in the Status context menu now supports adding to the local
75 `.git/info/exclude` when using linked repositories created using `git worktree`.
76 (`#1394 <https://github.com/git-cola/git-cola/issues/1394>`_)
78 * The `Cmd-m` hotkey on macOS will now minimize the application. The "Amend" action
79 can now be accessed using `Alt-m`.
80 (`#1390 <https://github.com/git-cola/git-cola/issues/1390>`_)
81 (`#1391 <https://github.com/git-cola/git-cola/pull/1391>`_)
83 * The `git-cola-sequence-editor` Rebase Editor will now be found correctly
84 in more situatios on Windows.
85 (`#1385 <https://github.com/git-cola/git-cola/issues/1385>`_)
86 (`#1388 <https://github.com/git-cola/git-cola/pull/1388>`_)
88 * Git Cola syncs the OS-level filesystem when windows are closed, which can
89 cause performance issues. The `cola.sync` configuration variable can
90 be configured to `false` to avoid this behavior.
91 (`#1305 <https://github.com/git-cola/git-cola/issues/1305>`_)
95 * The `importlib_metadata` dependency, which was previously required for Python 3.8 and earlier,
106 * `launchable` tags were added to the flatpak app metainfo files.
114 Usability, bells and whistles
115 -----------------------------
116 * The Rebase editor (`git-cola-sequence-editor`) can now add "remarks" to commits.
117 Remarks are simple numbered flags (0-9) that allow you to mark commits. This lets
118 you visually highlight commits to aid you when rebasing and grouping related commits
119 across a large patch series. Remarks can be added to a single commit or to all
120 commits that touch a file.
121 (`#1375 <https://github.com/git-cola/git-cola/pull/1375>`_)
122 (`#1380 <https://github.com/git-cola/git-cola/pull/1380>`_)
124 * Invalid `commit.template` configuration is now reported in the `Console` tool
125 instead of presenting an error traceback dialog via a `UsageError` exception.
126 (`#1384 <https://github.com/git-cola/git-cola/issues/1384>`_)
130 * The file system monitor was corrected to catch `PermissionError` exceptions.
131 (`bz #2260155 <https://bugzilla.redhat.com/show_bug.cgi?id=2260155>`_)
135 * If the `polib` module (e.g. `sudo apt install python3-polib`) is installed then it
136 will be used instead of the vendored `cola.polib` module. This makes it easier for
137 distributions to remove the vendored module from the `cola` namespace.
138 `polib` is now listed as an install requirement in `pyproject.toml`.
139 (`bz #2264526 <https://bugzilla.redhat.com/show_bug.cgi?id=2264526>`_)
141 * The flatpak metainfo now contains the required developer name field.
142 (`#1382 <https://github.com/git-cola/git-cola/pull/1382>`_)
146 * The "actions/cache" and "styfle/cancel-workflow-action" github actions were upgraded.
148 * The test suite now uses ``ruff`` to validate python code. ``pylint`` is no longer used.
149 (`#1353 <https://github.com/git-cola/git-cola/issues/1353>`_)
150 (`#1383 <https://github.com/git-cola/git-cola/pull/1383>`_)
158 Usability, bells and whistles
159 -----------------------------
160 * "Stage Modified" was added to the available toolbar actions.
161 (`#1371 <https://github.com/git-cola/git-cola/issues/1371>`_)
163 * "Stage Untracked" no longer stages modified files when the list of
164 untracked files to stage is empty.
165 (`#1371 <https://github.com/git-cola/git-cola/issues/1371>`_)
167 * `Ctrl + Space` can now be used to display the autocomplete options in input fields
168 that provide autocompletion.
170 * The Diff widget now displays the currently selected filename.
171 Uncheck the "Show filenames" option in the Diff widget's tool menu
172 to disable this feature.
173 (`#1367 <https://github.com/git-cola/git-cola/issues/1367>`_)
175 * The "Fetch", "Push" and "Pull" dialogs now have an embedded progress bar instead
176 of displaying a progress bar in a separate popup window.
178 * The "Fetch", "Push" and "Pull" dialogs will now stay open after the remote
179 operation completes when the "Close on completion" checkbox is unchecked.
180 These dialogs closed themselves unconditionally before this change.
184 * PyQt6 compatibility for the "Find in diff" feature.
186 * PyQt6 compatibility for the ``git dag`` Gravatar icons.
190 * Updated Polish translation.
191 (`#1368 <https://github.com/git-cola/git-cola/pull/1368>`_)
193 Packaging and Dependencies
194 --------------------------
195 * The vendored `qtpy` library was updated to `v2.4.1`.
197 * The documentation no longer depends on `jaraco.packaging`.
201 * upload-artifact and setup-python github actions were upgraded.
209 Usability, bells and whistles
210 -----------------------------
211 * The remote messages dialog is now displayed for the Pull and Push actions in the
212 Branches widget only. This dialog is disabled by default and enabled in the
213 main Push and Pull dialog settings.
214 (`#1363 <https://github.com/git-cola/git-cola/issues/1363>`_)
216 * The whole-file staging actions in the Diff widget's right-click menu are now listed
217 after the selection and hunk staging actions. This helps prevent accidental clicks
218 from clobbering the index for the entire file.
219 (`#1362 <https://github.com/git-cola/git-cola/issues/1362>`_)
221 * The completion popup no longer reappears after an item is selected in the
222 "Checkout Branch" action and similar dialogs.
223 (`#1360 <https://github.com/git-cola/git-cola/issues/1360>`_)
227 * PyQt6 compatibility was improved.
235 Usability, bells and whistles
236 -----------------------------
237 * Git Cola now preserves `# commentary` in commit messages by default.
238 The `commit.cleanup` Git configuration variable can be used to
239 customize this behavior. For example, if you want Git Cola to
240 strip comments (the old behavior before v4.4.0) then
241 you can run `git config --global commit.cleanup strip` or configure
242 the "Commit Message Cleanup" setting in the Preferences window.
243 (`#1330 <https://github.com/git-cola/git-cola/issues/1330>`_)
245 * `git dag` now includes completions for `git log` options in the text input field.
247 * `git dag` now provides convenient search filters when right-clicking in the
250 * A `1.25 x` Hi-DPI magnification option mode is now available in the Appearance settings.
251 (`#1313 <https://github.com/git-cola/git-cola/issues/1313>`_)
253 * MacOS-specific application themes are now available in the Appearance settings
254 when the pyobjc module is installed.
255 (`#905 <https://github.com/git-cola/git-cola/issues/905>`_)
257 * Git Cola now runs `git commit` in the background and feedback is provided while
258 the commit is running. This prevents the UI from freezing when running pre-commit
259 hooks that can make `git commit` take a long time to run.
260 (`#1320 <https://github.com/git-cola/git-cola/issues/1320>`_)
262 * The Diff context menu was reworked to reduce visual clutter and better match
263 the Status context menu.
264 (`#1347 <https://github.com/git-cola/git-cola/issues/1347>`_)
266 * The standalone `git cola tag` tool now autocompletes the tag name field.
267 (`#706 <https://github.com/git-cola/git-cola/pull/706>`_)
268 (`#691 <https://github.com/git-cola/git-cola/issues/691>`_)
270 * The "Branches" dock widget now has a "Visualize" right-click menu option.
271 (`#1061 <https://github.com/git-cola/git-cola/issues/1061>`_)
273 * The "Stash" dialog learned to rename stashes.
274 (`#558 <https://github.com/git-cola/git-cola/issues/558>`_)
276 * The "Fetch", "Push" and "Pull" dialogs can now display remote messages from the server.
277 (`#951 <https://github.com/git-cola/git-cola/issues/951>`_)
281 * `git dag` fixed how it was handling refspec arguments.
282 (`#1334 <https://github.com/git-cola/git-cola/issues/1334>`_)
284 * `git dag` will now properly refresh itself when remote branches are updated.
285 (`#1063 <https://github.com/git-cola/git-cola/issues/1063>`_)
287 * The `cola.inotify` feature no longer runs into issues when accessing WSL2
288 filesystems from Windows 11+.
289 (`#1194 <https://github.com/git-cola/git-cola/issues/1194>`_)
293 * `cercis <https://pypi.org/project/cercis/>`_ is now being used to enforce
294 Git Cola's python code style. We were previously disabling quote normalization
295 when using `black`. Use of `cercis` allows us to enable quote normalization
296 under its default single-quote settings.
298 * The test suite now works on Windows.
299 (`#1331 <https://github.com/git-cola/git-cola/issues/1331>`_)
300 (`#1332 <https://github.com/git-cola/git-cola/pull/1332>`_)
302 * Pre-commits hooks and code modernization.
303 (`#1333 <https://github.com/git-cola/git-cola/pull/1333>`_)
305 * Compatibility with Sphinx 7.2.0 was added to the `sphinxtogithub`
306 sphinx documentation plugin.
307 (`#1336 <https://github.com/git-cola/git-cola/pull/1336>`_)
315 Usability, bells and whistles
316 -----------------------------
317 * The minimum font size can now be set lower, which is helpful for Hi-DPI displays.
318 (`#1342 <https://github.com/git-cola/git-cola/pull/1342>`_)
322 * Flashing windows during startup on Windows has been fixed.
323 (`#1329 <https://github.com/git-cola/git-cola/issues/1329>`_)
325 * `git dag` was not displaying history when refspecs were specified.
326 (`#1334 <https://github.com/git-cola/git-cola/issues/1334>`_)
330 * Compatibility with Sphinx 7.2.0 was added to the `sphinxtogithub`
331 sphinx documentation plugin.
332 (`#1336 <https://github.com/git-cola/git-cola/pull/1336>`_)
342 * The pypi wheel was fixed to include `entry_points.txt`.
344 * The "Revert" command was throwing an exception after successfully completing.
352 Usability, bells and whistles
353 -----------------------------
354 * `git dag` now displays commit metadata more similarly to `git log`.
355 The commit date is now displayed and the subject field is displayed
356 directly above the extended description.
358 * `git dag` now supports a `cola.logdate` configuration for controlling
359 the date format. The configured value is passed to `git log --date=<format>`.
360 (`#1319 <https://github.com/git-cola/git-cola/pull/1319>`_)
361 (`#1312 <https://github.com/git-cola/git-cola/issues/1312>`_)
363 * The default `patches` directory that is used when exporting patches
364 is now configurable using the `cola.patchesdirectory` configuration
365 variable and the Preferences dialog.
367 * The Diff Editor can now export the diff selection, or the current
368 diff hunk, to a `*.patch` file from the `Patches` context menu action.
370 * Existing patches can be appended to by choosing a patch file from
371 the `Append Patch` sub-menu in the `Patches` context menu action.
373 * Patches can now be applied by dragging and dropping patches files from
374 a file browser onto the diff editor. The "Apply Patches" dialog is
375 launched with the drag-and-dropped patch files.
377 * Shell completions for zsh are now provided in the source distribution.
378 See the `contrib/_git-cola` zsh completion file for more details
382 * ``QApplication::desktop()`` is no longer available on PyQt6.
383 Git Cola no longer relies on this method.
387 * Git Cola can now be installed on Windows using `winget`.
388 See the ``README.md`` file for more details.
389 (`#1318 <https://github.com/git-cola/git-cola/pull/1318>`_)
399 * Diffs for repositories with a single commit have been fixed.
400 (`#1306 <https://github.com/git-cola/git-cola/issues/1306>`_)
402 * The toolbars follow the Qt toolbar style, as they did prior to `v4.2.0`.
403 (`#1307 <https://github.com/git-cola/git-cola/issues/1307>`_)
405 * The "Checkout Branch" dialog was fixed to display all completions when first shown.
406 (`#1308 <https://github.com/git-cola/git-cola/issues/1308>`_)
414 Usability, bells and whistles
415 -----------------------------
416 * The Diff Editor can now send diffs to your favorite editor before the diffs are applied.
417 The right-click "Edit Diff ..." menu actions and the `Ctrl + Shift + S` /
418 `Ctrl + Shift + U` hotkeys send the current diff hunk, or the selected diff, to your
419 editor before they are applied to the worktree / staging area.
420 (`#1290 <https://github.com/git-cola/git-cola/pull/1290>`_)
421 (`#794 <https://github.com/git-cola/git-cola/issues/794>`_)
423 * The Diff Editor and DAG viewer can now search within their diffs using
424 `Ctrl + F` and `Ctrl + G` hotkeys.
425 (`#1116 <https://github.com/git-cola/git-cola/issues/1116>`_)
427 * A new *Diff Mode* can be used to diff and unstage edits relative to any commit.
428 (`#816 <https://github.com/git-cola/git-cola/issues/816>`_)
430 * The Commit Message Editor can now spell-check the summary field. Previously only the
431 "Extended Description..." field supported spell checking.
432 (`#633 <https://github.com/git-cola/git-cola/issues/633>`_)
433 (`#1070 <https://github.com/git-cola/git-cola/issues/1070>`_)
435 * Repositories in your "Recents" and "Favorites" can now be searched using the new
436 "Search" tool button. Quickly switch between these repositories using the `Alt + P`
437 hotkey and "Quick Open..." File menu action.
438 (`#1282 <https://github.com/git-cola/git-cola/pull/1282>`_)
440 * "Favorites", "Recents" and the startup dialog now display a case-insensitively
441 sorted list of repositories.
442 (`#1047 <https://github.com/git-cola/git-cola/issues/1047>`_)
444 * The startup dialog now has a right-click context menu that allows you to prune
445 stale entries and other actions that were not previously accessible from
447 (`#1199 <https://github.com/git-cola/git-cola/issues/1199>`_)
448 (`#1280 <https://github.com/git-cola/git-cola/pull/1280>`_)
450 * The "Copy Leading Paths" action in the Status tool's right-click "Copy" sub-menu
451 can now strip off an arbitrary number of leading paths.
452 (`#784 <https://github.com/git-cola/git-cola/issues/784>`_)
454 * The "Cherry-Pick" action now reports errors when "git cherry-pick" fails.
455 A new "Abort Cherry-Pick" action has been added for aborting a failed cherry-pick.
456 (`#1062 <https://github.com/git-cola/git-cola/issues/1062>`_)
458 * The diff text can now be quickly zoomed using `Ctrl + Mouse wheel` scroll.
459 This will quickly change the text size within the current session only.
460 (`#1029 <https://github.com/git-cola/git-cola/issues/1029>`_)
462 * The Console and Diff widgets learned to open URLs. Right-click on a line
463 that contains http URLs and context-menu actions for opening each URL
464 using your default web browser will be displayed.
465 (`#1139 <https://github.com/git-cola/git-cola/issues/1139>`_)
467 * Drag-and-drop has been improved when dragging filenames from the Status tool.
468 Dragging multiple files requires special handling to improve usability.
469 Some terminals (such as `kitty`) consume multiple file URLs by separating paths with
470 newlines. This is useful when you'd like to capture raw filenames but is less
471 convenient when dropping filenames onto a command-line. Drag with the `Alt`-modifier
472 held down to drag-and-drop filenames for command-line use. Using the `Alt` modifier
473 omits URLs so that the drag-and-drop payload includes only space-delimited,
475 (`#719 <https://github.com/git-cola/git-cola/issues/719>`_)
477 * The DAG viewer now displays the diff between the start and end commits when
478 multiple commits are selected. The diffs are displayed in the DAG's diff viewer.
479 (`#552 <https://github.com/git-cola/git-cola/issues/552>`_)
481 * The DAG viewer learned to checkout branches and initiate rebases from its right-click menu.
482 (`#1113 <https://github.com/git-cola/git-cola/issues/1113>`_)
484 * The DAG diff viewer learned to word-wrap the diff text.
485 (`#1242 <https://github.com/git-cola/git-cola/issues/1242>`_)
487 * The spelling dictionaries are now discovered dynamically at runtime.
488 `dict/words` and `dict/propernames` are now discovered via `$XDG_DATA_DIRS`
489 by the spell checker. This allows a spelling dictionary to be placed in e.g..
490 `~/.local/share/dict/words` to override the default `/usr/share/dict/words`.
491 (`#873 <https://github.com/git-cola/git-cola/issues/873>`_)
493 * The File menu now has a "Patches" sub-menu with a full set of "git am" Patch actions.
495 * The Diff Editor and various Diff widgets now have a "Copy Diff" action with an
496 `Alt + Shift + C` hotkey that copies the selected diff text to the clipboard with the
497 `+`, `-` and `<Space>` diff prefix characters removed.
498 (`#1288 <https://github.com/git-cola/git-cola/issues/1288>`_)
500 * The "Revert" action for reverting commits from the DAG tool now displays error
501 messages when ``git revert`` fails.
502 (`#885 <https://github.com/git-cola/git-cola/issues/885>`_)
504 * The Diff Editor now uses an easier-to-see *block cursor* by default.
505 Disable `cola.blockcursor <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-blockcursor>`_
506 to continue using original *line cursor* by running
507 ``git config --global cola.blockcursor false``, or by editing the settings in the menu.
509 * The "Unmerged" header item in the Status tool now displays a summary list of unmerged files.
511 * The hotkeys documentation has been updated to clarify that the "Copy Commit ID"
512 action is available in several tools.
513 (`#779 <https://github.com/git-cola/git-cola/issues/779>`_)
515 * Saving files when using "Browse Other Branch" now displays errors from
516 ``git show`` when saving files from arbitrary commits.
517 (`#1065 <https://github.com/git-cola/git-cola/issues/1065>`_)
519 * The Apply Patches dialog now reports errors when patches fail to apply.
520 (`#673 <https://github.com/git-cola/git-cola/issues/673>`_)
522 * The "Status" tool now disables "Copy" actions in its context menu when no
523 files have been selected.
524 (`#697 <https://github.com/git-cola/git-cola/issues/697>`_)
526 * The "Unstage" menu item in the Status tool now uses a "Remove" icon.
527 (`#1289 <https://github.com/git-cola/git-cola/pull/1289>`_)
531 * The vendored `qtpy` module was modified to sever its dependency on the
532 `packaging.version` module. This mostly affects users that want to run
533 Git Cola directly from the source tree outside of any virtualenv.
534 (`#1286 <https://github.com/git-cola/git-cola/issues/1286>`_)
542 Usability, bells and whistles
543 -----------------------------
544 * The rebase editor was taught to handle stacked branch workflows enabled by
545 ``git rebase --update-refs``. The ``git cola rebase`` sub-command now has
546 an ``--update-refs`` option and the menu actions display a prompt that allows
547 you to enable the updating of stacked branches.
548 (`#1261 <https://github.com/git-cola/git-cola/pull/1261>`_)
549 (`#571 <https://github.com/git-cola/git-cola/issues/571>`_)
551 * The status widget now respects `diff.ignoreSubmodules`.
552 (`#1269 <https://github.com/git-cola/git-cola/issues/1269>`_)
554 Packaging and Dependencies
555 --------------------------
556 * PyQt6 is now officially supported.
557 (`#1211 <https://github.com/git-cola/git-cola/issues/1211>`_)
558 (`#1273 <https://github.com/git-cola/git-cola/issues/1273>`_)
560 * The vendored `qtpy` library was updated to `v2.3.0`.
564 * Fixes and updates to Git Cola's CI actions.
565 (`#1278 <https://github.com/git-cola/git-cola/pull/1278>`_)
566 (`#1277 <https://github.com/git-cola/git-cola/issues/1277>`_)
576 * The "T" hotkey for "Find Files" was removed to avoid issues in some configurations.
577 (`#1270 <https://github.com/git-cola/git-cola/issues/1270>`_)
579 * Some context menus entries were corrected to better handle binary files.
580 (`#1271 <https://github.com/git-cola/git-cola/pull/1271>`_)
588 Usability, bells and whistles
589 -----------------------------
590 * The branches widget no longer loses its selection state in response to
591 notifications and UI actions.
592 (`#1221 <https://github.com/git-cola/git-cola/issues/1221>`_)
594 * The use of ``gravatar.com`` to fetch icons associated with author emails
595 can now be disabled by setting `git config --global cola.gravatar false`.
596 (`#933 <https://github.com/git-cola/git-cola/issues/933>`_)
600 * The config reader has been revamped to better read settings when git config
601 files are located in unexpected locations.
602 (`#927 <https://github.com/git-cola/git-cola/issues/927>`_)
603 (`#1264 <https://github.com/git-cola/git-cola/issues/1264>`_)
605 * The preferences dialog no longer throws an error when the editor has not
607 (`#1263 <https://github.com/git-cola/git-cola/issues/1263>`_)
609 * Context menu actions for staging files has been added when diffing images.
610 (`#1265 <https://github.com/git-cola/git-cola/issues/1265>`_)
612 * The stash editor now properly displays stashes with slashes ("/") in
613 their names or messages.
614 (`#1267 <https://github.com/git-cola/git-cola/pull/1267>`_)
616 * The settings file is now written-to and read-from in a robust manner to avoid data
617 loss when doing an ACPI shutdown or forced shutdown of a machine.
618 (`#1241 <https://github.com/git-cola/git-cola/issues/1241>`_)
620 * Git Cola now displays an error message when attempting to open a repository that
621 cannot be accessed due to the new `safe.directory` protections in Git v2.30.3.
622 (`#1243 <https://github.com/git-cola/git-cola/issues/1243>`_)
626 * The .po and .pot files now contain location information.
627 (`#880 <https://github.com/git-cola/git-cola/issues/880>`_)
635 Usability, bells and whistles
636 -----------------------------
637 * The Rebase editor (`git-cola-sequence-editor`) now supports multi-select.
638 Use `Shift-{Up,Down}` to select multiple lines and the keyboard hotkeys
639 listed in the `?` dialog to drive the UI.
640 (`#1257 <https://github.com/git-cola/git-cola/pull/1257>`_)
642 * The `$GIT_VISUAL` and `$VISUAL` environment variable are now consulted in addition
643 to `$GIT_EDITOR` and `$EDITOR` when the `gui.editor` configuration is unset.
644 (`#1237 <https://github.com/git-cola/git-cola/pull/1237>`_)
646 * The application window icon is now enabled when running on Wayland.
647 (`#1240 <https://github.com/git-cola/git-cola/pull/1240>`_)
649 * The Status widget now has an "Open Worktree" action.
650 (`#1245 <https://github.com/git-cola/git-cola/pull/1245>`_)
652 * The "Open Using Default Application", "Open Directory",
653 "Open Parent Directory" and "Open Worktree" actions are now available on Windows.
655 * The dialog for opening repositories is now a read-only dialog that omits the
656 ability to create folders and modify the filesystem.
657 (`#1168 <https://github.com/git-cola/git-cola/issues/1168>`_)
659 * A few more `git` calls have been eliminated from the startup sequence.
660 This further improved the startup time for Git Cola.
661 (`#1259 <https://github.com/git-cola/git-cola/pull/1259>`_)
665 * Documentation rendering errors have been fixed.
666 (`#1256 <https://github.com/git-cola/git-cola/pull/1256>`_)
668 * Use of a `~/.config/git-cola/language` file to override the language has been fixed.
669 (`#1246 <https://github.com/git-cola/git-cola/issues/1246>`_)
671 * We no longer write the `cola.spellcheck` configuration value on launch.
672 (`#1238 <https://github.com/git-cola/git-cola/pull/1238>`_)
676 * Updated Spanish translation.
677 (`#1244 <https://github.com/git-cola/git-cola/pull/1244>`_)
679 * Updated Japanese translation.
680 (`#1249 <https://github.com/git-cola/git-cola/pull/1249>`_)
684 * Building documentation offline is supported again.
685 (`#1250 <https://github.com/git-cola/git-cola/issues/1250>`_)
687 * The Appstream Metadata files were missing in the v4.0.0 release are included again.
688 (`#1254 <https://github.com/git-cola/git-cola/pull/1254>`_)
689 (`#1253 <https://github.com/git-cola/git-cola/issues/1253>`_)
697 Usability, bells and whistles
698 -----------------------------
699 * Double-clicking dock widgets no longer creates sub-windows when the layout is locked.
700 (`#1176 <https://github.com/git-cola/git-cola/issues/1176>`_)
701 (`#1198 <https://github.com/git-cola/git-cola/pull/1198>`_)
705 * We now guard against `locale.getdefaultlocale()` returning `None` in some
706 configurations, notably on macOS if none of 'LC_ALL', 'LC_CTYPE', 'LANG' or 'LANGUAGE'
708 (`#1234 <https://github.com/git-cola/git-cola/issues/1234>`_)
710 * The preferences dialog has been fixed to properly handle booleans.
711 (`#1235 <https://github.com/git-cola/git-cola/pull/1235>`_)
713 * The `docs/` directory was restructured to avoid missing `setup.py` errors.
714 `share/doc/git-cola` is now a symlink pointing to `docs/`.
715 (`#1230 <https://github.com/git-cola/git-cola/issues/1230>`_)
717 * Message boxes could sometimes display off-screen or using geometry that is larger
718 than the current desktop. Message box sizes are now clamped to the desktop size.
719 (`#1228 <https://github.com/git-cola/git-cola/issues/1228>`_)
729 These changes are primarily breaking changes for packagers of Git Cola.
730 For example, Linux distribution and Homebrew package maintainers may need to
731 be aware of these changes.
733 Changes have been made build infrastructure and the resulting filesystem artifacts.
735 * The build system is now Python3-only and has been modernized for PEP-517/518.
736 While Git Cola still builds and runs under Python2, it is no longer officially
737 supported and may stop working in a future release without notice.
738 (`#1201 <https://github.com/git-cola/git-cola/issues/1201>`_)
740 * The `#!/usr/bin/env python` shebang lines in the `git-cola` and `git-dag` wrapper
741 scripts have been updated to use `python3`.
742 (`#1204 <https://github.com/git-cola/git-cola/pull/1204>`_)
744 * The build system was switched to `setuptools` and no longer depends on `distutils`.
745 ``python setup.py {build,install,build_pot,build_mo}`` are no longer provided.
746 Use the https://pypa-build.readthedocs.io/en/stable/installation.html
747 ``python -m build`` tool to generate sdist and wheel distributions,
748 and ``pip install .`` to install Git Cola from source.
749 (`#1204 <https://github.com/git-cola/git-cola/pull/1204>`_)
751 * The `git-cola`, `git-dag` and `git-cola-sequence-editor` commands are now installed
752 using setuptools entry points.
754 * The `bin/` wrapper scripts in the source tree continue to be provided for convenience
755 but they are not the scripts that get installed.
757 * The `qtpy` Python package is no longer installed alongside the `cola` Python package.
759 * The `cola` package is now installed into the standard Python site-packages location.
761 * The `share/git-cola/lib` private Python modules directory no longer exists.
763 * The `NO_VENDOR_LIBS` and `NO_PRIVATE_LIBS` Makefile options are no longer necessary.
765 * The `share/git-cola` filesystem namespace no longer exists. All of cola's package data
766 is distributed alongside the `cola` module as package data.
768 * Building the Sphinx documentation now also requires the `jaraco.packaging` and
769 `rst.linker` packages. See `setup.cfg` for the package requirement details.
771 Usability, bells and whistles
772 -----------------------------
774 <https://git-cola.readthedocs.io/en/latest/git-cola.html#custom-themes>`_
775 can be used by adding `*.qss` Qt stylesheet files to `~/.config/git-cola/themes/`.
776 (`#1222 <https://github.com/git-cola/git-cola/pull/1222>`_)
777 (`#1226 <https://github.com/git-cola/git-cola/pull/1226>`_)
779 * Git Cola now keeps track of child Browser windows and will close all of them when
780 the main window is closed.
781 (`#1200 <https://github.com/git-cola/git-cola/pull/1200>`_)
785 * Staging conflicted binary files has been fixed to avoid Unicode decoding errors.
786 (`#1189 <https://github.com/git-cola/git-cola/issues/1189>`_)
788 * Ensure that secure permissions are used when creating temporary files.
789 (`#1209 <https://github.com/git-cola/git-cola/pull/1209>`_)
791 * The line numbering in the diff viewer was corrected when displaying merge diffs.
792 (`#1208 <https://github.com/git-cola/git-cola/pull/1208>`_)
794 * Documentation typo fixes.
795 (`#1193 <https://github.com/git-cola/git-cola/pull/1193>`_)
797 * Git Cola was revamped to use Qt signals and slots for all of its notifications.
798 This made its notification system more robust.
799 (`#1202 <https://github.com/git-cola/git-cola/pull/1202>`_)
800 (`#1203 <https://github.com/git-cola/git-cola/pull/1203>`_)
801 (`#1205 <https://github.com/git-cola/git-cola/pull/1205>`_)
802 (`#1206 <https://github.com/git-cola/git-cola/pull/1206>`_)
806 * `vcruntime140.dll` and `msvcp140.dll` are now included in the Windows installation.
807 (`#1207 <https://github.com/git-cola/git-cola/pull/1207>`_)
815 Usability, bells and whistles
816 -----------------------------
817 * The git config guitool action can now be grouped under user-defined menus.
818 This is done by using slash (``/``) delimiters in the action name.
819 Entries before the final slash are treated like sub-menus inside the
820 top-level ``Actions`` menu.
821 (`#1150 <https://github.com/git-cola/git-cola/issues/1150>`_)
823 * Toolbars now have a full set of icons. The icons follow the system theme
824 and can be configured to display text, just icons, or text and icons.
825 (`#1177 <https://github.com/git-cola/git-cola/pull/1177>`_)
827 * The startup dialog will now open the selected repository when the "enter"
829 (`#1162 <https://github.com/git-cola/git-cola/issues/1162>`_)
831 * ``Shift+S`` will stage selected lines (in addition to ``s``).
832 (`#1187 <https://github.com/git-cola/git-cola/issues/1187>`_)
836 * The vendored qtpy library was patched to retain Python2 compatibility.
838 * The "Unstage" toolbar action was fixed.
839 (`#1178 <https://github.com/git-cola/git-cola/issues/1178>`_)
841 * We now avoid `QWidget::setWidth(float)` for compatibility with newer Qt versions.
842 (`#1183 <https://github.com/git-cola/git-cola/pull/1183>`_)
844 * Documentation typo fixes.
845 (`#1185 <https://github.com/git-cola/git-cola/pull/1185>`_)
849 * Updated Polish translation.
850 (`#1184 <https://github.com/git-cola/git-cola/pull/1184>`_)
854 * Git Cola now uses Github Actions for running its continuous integration tests.
855 (`#1179 <https://github.com/git-cola/git-cola/pull/1179>`_)
863 Usability, bells and whistles
864 -----------------------------
865 * The Status tool was improved to better retain selected files when
866 the state changes and the display is refreshed.
867 (`#1130 <https://github.com/git-cola/git-cola/issues/1130>`_)
868 (`#1131 <https://github.com/git-cola/git-cola/pull/1131>`_)
870 * The Diff editor can now stage selected lines for untracked files.
871 Git Cola will detect when a file is untracked and will allow you to
872 partially stage it, just like existing tracked files.
873 (`#1146 <https://github.com/git-cola/git-cola/pull/1146>`_)
874 (`#1084 <https://github.com/git-cola/git-cola/issues/1084>`_)
876 * Diffing of staged files has been implemented for repositories that contain
878 (`#1149 <https://github.com/git-cola/git-cola/pull/1149>`_)
879 (`#1110 <https://github.com/git-cola/git-cola/issues/1110>`_)
881 * Documentation improvements and typo fixes.
882 (`#1163 <https://github.com/git-cola/git-cola/pull/1163>`_)
883 (`#1164 <https://github.com/git-cola/git-cola/pull/1164>`_)
887 * The `FIPS security mode <https://github.com/python/cpython/issues/53462>`_
888 is now supported by Git Cola when running on FIPS-enabled Python
889 (Python 3.9+ or centos8/rhel8's patched Python 3.6).
890 (`#1157 <https://github.com/git-cola/git-cola/issues/1157>`_)
894 * The `argparse` usage was adjusted to remain compatible with older Pythons.
895 (`#1155 <https://github.com/git-cola/git-cola/issues/1155>`_)
897 * The window restoration logic was fixed to properly save/restore settings
898 when different languages are used.
899 (`#1071 <https://github.com/git-cola/git-cola/issues/1071>`_)
900 (`#1161 <https://github.com/git-cola/git-cola/issues/1161>`_)
901 (`#382 <https://github.com/git-cola/git-cola/issues/382>`_)
903 * `git dag` no longer passes floats to `QPen::setWidth()` for better compatibility.
904 (`bz #2014950 <https://bugzilla.redhat.com/show_bug.cgi?id=2014950>`_)
908 * The Windows installer was slimmed down by removing unused Qt DLLs.
909 (`#1152 <https://github.com/git-cola/git-cola/pull/1152>`_)
919 * Patch release to fix a typo in the Interactive Rebase feature.
926 Usability, bells and whistles
927 -----------------------------
928 * The git config reader now supports the `include.path` directive
929 for including config files.
930 (`#1136 <https://github.com/git-cola/git-cola/issues/1136>`_)
931 (`#1137 <https://github.com/git-cola/git-cola/pull/1137>`_)
933 * The dialog for selecting commits now support filtering.
934 (`#1121 <https://github.com/git-cola/git-cola/pull/1121>`_)
936 * The diff editor now wraps long lines by default. The diff options
937 menu can be used to enable/disable line wrapping.
938 (`#1123 <https://github.com/git-cola/git-cola/pull/1123>`_)
940 * Git Cola now honors `core.hooksPath` for configuring custom Git hooks,
941 which was introduced in Git v2.9.
942 (`#1118 <https://github.com/git-cola/git-cola/issues/1118>`_)
944 * A new `Ctrl + Shift + S` hotkey was added for staging/unstaging all
945 files, both modified and untracked.
947 * The `Status` tool now supports `Ctrl + A` for selecting all files and
948 it behaves more predictably when performing operations when multiple
949 categories of files are selected (e.g. when both modified and untracked
950 header items are selected).
951 (`#1117 <https://github.com/git-cola/git-cola/issues/1117>`_)
955 * Updated Hungarian translation.
956 (`#1135 <https://github.com/git-cola/git-cola/pull/1135>`_)
960 * The "Interactive Rebase" feature was updated to work with Windows.
962 * `make install-man` was updated to support Sphinx 4.0.
963 (`#1141 <https://github.com/git-cola/git-cola/issues/1141>`_)
965 * `git cola --help-commands` was updated for newer versions of argparse.
966 (`#1133 <https://github.com/git-cola/git-cola/issues/1133>`_)
970 * Git Cola can now be started as a Python module.
971 (`#1119 <https://github.com/git-cola/git-cola/pull/1119>`_)
979 Usability, bells and whistles
980 -----------------------------
981 * The startup dialog now detects when Recent and Favorite repositories no
982 longer exist on disk, and offers to remove these entries when selected.
983 (`#1089 <https://github.com/git-cola/git-cola/pull/1089>`_)
985 * The startup dialog now includes a simpler and more condensed folder view
986 that can be used for selecting Favorites and Recent repositories.
987 (`#1086 <https://github.com/git-cola/git-cola/pull/1086>`_)
989 * The "Commit" menu now includes an "Undo Last Commit" action.
990 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
992 * The "Reset" menu was revamped to expose all of Git's reset modes alongside a
993 new "Restore Worktree" action that updates the worktree using "git read-tree".
994 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
998 * Updated Polish translation.
999 (`#1107 <https://github.com/git-cola/git-cola/pull/1107>`_)
1001 * Updated Japanese translation.
1002 (`#1098 <https://github.com/git-cola/git-cola/pull/1098>`_)
1004 * Updated Brazilian translation.
1005 (`#1091 <https://github.com/git-cola/git-cola/pull/1091>`_)
1009 * The ``--use-env-python`` option for ``setup.py`` is now Python3 compatible.
1010 (`#1102 <https://github.com/git-cola/git-cola/issues/1102>`_)
1018 Usability, bells and whistles
1019 -----------------------------
1020 * The submodules widget can now be used to add submodules.
1021 Submodules are now updated recursively.
1022 (`#534 <https://github.com/git-cola/git-cola/issues/534>`_)
1024 * The image diff viewer can now be toggled between text and image modes.
1025 This is helpful when, for example, diffing .svg files where it can be useful
1026 to see diffs in both an image and text representation.
1027 (`#859 <https://github.com/git-cola/git-cola/issues/859>`_)
1028 (`#1035 <https://github.com/git-cola/git-cola/pull/1035>`_)
1030 * The default `ssh-askpass` username + password dialog included with Git Cola
1031 can now toggle between showing and masking the password input field.
1032 (`#1069 <https://github.com/git-cola/git-cola/pull/1069>`_)
1036 * Updated Polish translation.
1037 (`#1076 <https://github.com/git-cola/git-cola/pull/1076>`_)
1039 * Updated Hungarian translation.
1040 (`#1067 <https://github.com/git-cola/git-cola/pull/1067>`_)
1044 * The `share/appdata` AppStream data was renamed to `share/metainfo`
1045 in accordance with `AppStream standard changes from 2016
1046 <https://github.com/ximion/appstream/blob/master/NEWS#L1363>`_.
1047 (`#1079 <https://github.com/git-cola/git-cola/pull/1079>`_)
1049 * The ``cola`` modules are now installed into the Python ``site-packages``
1050 directory by default. This allows distributions to package ``git-cola`` for
1051 multiple versions of Python. See the PACKAGING NOTES section in the README
1052 for details about suppressing the installation of the private
1053 ``share/git-cola/lib/cola`` modules when building cola.
1054 (`#181 <https://github.com/git-cola/git-cola/issues/181>`_)
1056 * Git Cola's rebase / sequence editor, formerly known as ``git-xbase`` and
1057 installed as ``share/git-cola/bin/git-xbase``, has been renamed to
1058 ``git-cola-sequence-editor`` and is now installed into the default
1059 ``bin/git-cola-sequence-editor`` executable location to enable external
1060 reuse of this general-purpose tool.
1062 * A workaround used by the pynsist installer preamble script was obsoleted by
1063 `takluyver/pynsist#149 <https://github.com/takluyver/pynsist/pull/149>`_
1064 and has now been removed.
1065 (`#1073 <https://github.com/git-cola/git-cola/pull/1073>`_)
1069 * `git dag` now uses integer widths when initializing its brushes.
1070 (`#1080 <https://github.com/git-cola/git-cola/pull/1080>`_)
1078 Usability, bells and whistles
1079 -----------------------------
1080 * The ``git-xbase`` rebase editor now includes a file list for filtering
1081 the changes displayed in the diff view.
1082 (`#1051 <https://github.com/git-cola/git-cola/pull/1051>`_)
1084 * The fallback `ssh-askpass` script, which provides the Username/Password
1085 login dialog when performing remote operations, previously presented both
1086 the username and password input fields with ``***`` asterisks.
1087 The dialog now uses asterisks for the password field only.
1088 (`#1026 <https://github.com/git-cola/git-cola/pull/1026>`_)
1090 * Stashes can now be applied using the `Ctrl + Enter` hotkey, popped with the
1091 `Ctrl + Backspace` hotkey, and dropped with the `Ctrl + Shift + Backspace`
1092 hotkey when inside the stash dialog. This enables a keyboard-centric
1093 mouse-free workflow when using the stash dialog.
1095 * When amending a commit, `git cola` will check whether the commit has been
1096 published to a remote branch using ``git branch -r --contains HEAD``.
1097 This command can be slow when operating on a repository with many
1098 remote branches. The new `cola.checkpublishedcommits` configuration
1099 variable allows you to opt-out of this check, which improves performance
1100 when amending a commit. The settings widget exposes this variable as,
1101 "Check Published Commits when Amending".
1102 (`#1021 <https://github.com/git-cola/git-cola/issues/1021>`_)
1103 (`#1027 <https://github.com/git-cola/git-cola/pull/1027>`_)
1107 * Updated Polish translation.
1108 (`#1033 <https://github.com/git-cola/git-cola/pull/1033>`_)
1112 * ``git-dag.appdata.xml`` was updated to allow network access for author icons.
1113 (`#1050 <https://github.com/git-cola/git-cola/pull/1050>`_)
1115 * The inotify filesystem monitor now handles
1116 `OSError: [Errno 24] Too many open files` errors by disabling inotify.
1117 (`#1015 <https://github.com/git-cola/git-cola/issues/1015>`_)
1119 * Typos in various documentation files have been fixed.
1120 (`#1025 <https://github.com/git-cola/git-cola/pull/1025>`_)
1122 * The "Recent Repositories" limit was off by one, and now correctly
1123 remembers the configured number of repositories in the menu.
1124 (`#1024 <https://github.com/git-cola/git-cola/pull/1024>`_)
1126 * The "revert" action in the DAG and other tools now uses
1127 ``git revert --no-edit``, which avoids launching an editor
1128 when reverting the commit. Use `Ctrl+m` in the commit message
1129 editor after reverting a commit to rewrite its commit message.
1130 (`#1020 <https://github.com/git-cola/git-cola/issues/1020>`_)
1138 Usability, bells and whistles
1139 -----------------------------
1140 * The remote editor is much faster since it no longer queries
1141 remotes, and uses the cached information instead.
1142 (`#986 <https://github.com/git-cola/git-cola/issues/986>`_)
1144 * Commit message templates can now be loaded automatically by setting
1145 ``git config cola.autoloadcommittemplate true``.
1146 (`#1013 <https://github.com/git-cola/git-cola/pull/1013>`_)
1147 (`#735 <https://github.com/git-cola/git-cola/pull/735>`_)
1149 * The UI layout can now be reset back to its initial state by selecting
1150 the "Reset Layout" action. This reverts the layout to the same state
1151 as when the app first launched.
1152 (`#1008 <https://github.com/git-cola/git-cola/pull/1008>`_)
1153 (`#994 <https://github.com/git-cola/git-cola/issues/994>`_)
1155 * Files can now be ignored in either the project's `.gitignore`, or in the
1156 repository's private local `.git/info/exclude` ignore file.
1157 (`#1006 <https://github.com/git-cola/git-cola/pull/1006>`_)
1158 (`#1000 <https://github.com/git-cola/git-cola/issues/1000>`_)
1160 * New remotes are now selected when they are added in the "Edit Remotes" tool.
1161 (`#1002 <https://github.com/git-cola/git-cola/pull/1002>`_)
1163 * The "Recent" repositories list is now saved to disk when opening a
1164 repository. Previously, this list was only updated when exiting the app.
1165 (`#1001 <https://github.com/git-cola/git-cola/pull/1001>`_)
1167 * The bookmarks tool now has a "Delete" option in its right-click menu.
1168 (`#999 <https://github.com/git-cola/git-cola/pull/999>`_)
1170 * The current repository is no longer listed in the "File/Open Recent" menu.
1171 (`#998 <https://github.com/git-cola/git-cola/pull/998>`_)
1175 * Updated Hungarian translation.
1176 (`#1005 <https://github.com/git-cola/git-cola/pull/1005>`_)
1177 (`#1018 <https://github.com/git-cola/git-cola/pull/1018>`_)
1179 * Updated Turkish translation.
1180 (`#1003 <https://github.com/git-cola/git-cola/pull/1003>`_)
1181 (`#1011 <https://github.com/git-cola/git-cola/pull/1011>`_)
1185 * Better support for Python 3.8's line buffering modes.
1186 (`#1014 <https://github.com/git-cola/git-cola/pull/1014>`_)
1188 * The default `ssh-askpass` script now uses a more generic `#!` shebang line.
1189 (`#1012 <https://github.com/git-cola/git-cola/pull/1012>`_)
1191 * Fetch, push, and pull operations will now refresh the model and display when
1192 operations complete.
1193 (`#996 <https://github.com/git-cola/git-cola/issues/996>`_)
1195 * The branches widget now refreshes its display when changing branches.
1196 (`#992 <https://github.com/git-cola/git-cola/pull/992>`_)
1200 * The `share/git-cola/bin/git-xbase` script will now have its `#!` lines
1201 updated during installation.
1202 (`#991 <https://github.com/git-cola/git-cola/pull/991>`_)
1206 * The unit tests were made more platform-independent.
1207 (`#993 <https://github.com/git-cola/git-cola/pull/993>`_)
1215 Usability, bells and whistles
1216 -----------------------------
1217 * Auto-completion for filenames can now be disabled. This speeds up
1218 revision completion when working in large repositories with many files.
1219 (`#981 <https://github.com/git-cola/git-cola/pull/981>`_)
1221 * The Stash dialog now shows the stash date as a tooltip when hovering
1222 over a stashed change.
1223 (`#982 <https://github.com/git-cola/git-cola/pull/982>`_)
1225 * Qt HiDPI settings are overridden by the `git cola` HiDPI appearance settings.
1226 These overrides can now be disabled by selecting the "Disable" mode.
1227 This allows users to control the Qt HiDPI settings through environment
1228 variables. Additionally, the "Auto" mode now detects the presence of
1229 the Qt HiDPI variables and no longer overrides them when the user has
1230 configured their environment explicitly.
1231 (`#963 <https://github.com/git-cola/git-cola/issues/963>`_)
1233 * Confirmation dialogs can now focus buttons using the Tab key.
1234 Previously, the "Y" and "N" keys could be used to confirm or deny
1235 using the keyboard, but "Tab" is more familiar.
1236 (`#965 <https://github.com/git-cola/git-cola/issues/965>`_)
1238 * Error dialogs (for example, when a commit hook fails) will now always
1239 show the details. The details were previously hidden behind a toggle.
1240 (`#968 <https://github.com/git-cola/git-cola/issues/968>`_)
1244 * Updated Japanese translation.
1245 (`#973 <https://github.com/git-cola/git-cola/pull/973>`_)
1246 (`#974 <https://github.com/git-cola/git-cola/pull/974>`_)
1248 * Updated Simplified Chinese translation.
1249 (`#950 <https://github.com/git-cola/git-cola/pull/950>`_)
1253 * The filesystem monitor no longer logs that it has been enabled after the
1254 inotify watch limit is reached on Linux.
1255 (`#984 <https://github.com/git-cola/git-cola/pull/984>`_)
1257 * Better Unicode robustness.
1258 (`#990 <https://github.com/git-cola/git-cola/issues/990>`_)
1259 (`#910 <https://github.com/git-cola/git-cola/issues/991>`_)
1261 * The "Branches" widget did not always update itself when deleting branches
1262 (for example, when inotify is disabled or unavailable).
1263 (`#978 <https://github.com/git-cola/git-cola/issues/978>`_)
1265 * Non-ASCII Unicode byte strings are more robustly handled by the log widget.
1266 (`#977 <https://github.com/git-cola/git-cola/issues/977>`_)
1268 * Non-Unicode results from the `gettext` library are more robustly handled.
1269 (`#969 <https://github.com/git-cola/git-cola/issues/969>`_)
1271 * Launching `git cola` from within a directory that has since been deleted
1272 would previously result in an error, and is now robustly handled.
1273 (`#961 <https://github.com/git-cola/git-cola/issues/961>`_)
1277 * The vendored `qtpy` library was updated to `v1.9`.
1285 Usability, bells and whistles
1286 -----------------------------
1287 * The file browser now includes "Blame" in its context menu.
1288 (`#953 <https://github.com/git-cola/git-cola/issues/953>`_)
1290 * The "Push" action now uses "git push --force-with-lease" when using
1291 the "Force" option with Git v1.8.5 and newer.
1292 (`#946 <https://github.com/git-cola/git-cola/issues/946>`_)
1294 * Updated German translation.
1295 (`#936 <https://github.com/git-cola/git-cola/pull/936>`_)
1297 * The `Status` widget learned to optionally display file counts in its
1298 category headers, and indent the files displayed in each category.
1299 (`#931 <https://github.com/git-cola/git-cola/pull/931>`_)
1301 * The `Branches` widget can now sort branches by their most recent commit.
1302 (`#930 <https://github.com/git-cola/git-cola/pull/930>`_)
1304 * `git cola` now includes configurable GUI themes that can be used to style
1305 the user interface. Enable the new themes by configuring `cola.theme`
1306 in the preferences window. See the
1307 `cola.theme documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-theme>`_
1308 for more details. (`#924 <https://github.com/git-cola/git-cola/pull/924>`_)
1310 * `git cola` now has built-in support for HiDPI displays by enabling
1311 the Qt 5.6 `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
1312 (`#938 <https://github.com/git-cola/git-cola/issues/938>`_)
1314 * `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
1315 icons have been updated to look sharp when displayed in HiDPI.
1316 (`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
1320 * `git cola`'s "Revert Unstaged Edits" previously checked out from "HEAD^",
1321 when in "Amend" mode, and removing staged changes. This behavior has been
1322 changed to always checkout from the index, which avoids data loss.
1323 (`#947 <https://github.com/git-cola/git-cola/issues/947>`_)
1325 * `git cola` has been updated to work with newer versions of `gnome-terminal`
1326 and no longer shell-quotes its arguments when launching `gnome-terminal`.
1327 The `cola.terminalshellquote` configuration variable can be set to `true` to
1328 get the old behavior, or to handle other terminals that take the command to run
1329 as a single string instead of as arguments to `execv()`.
1330 (`#935 <https://github.com/git-cola/git-cola/pull/935>`_)
1332 * `git dag` now properly handles arbitrary input on Python3.
1333 Previously, an exception would be raised when entering `--grep=xxx` where
1334 `xxx` is a quoted string with a missing end-quote.
1335 (`#941 <https://github.com/git-cola/git-cola/pull/941>`_)
1339 * The contribution guidelines for contributors has been updated to mention
1340 how to regenerate the `*.mo` message files.
1341 (`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
1349 Usability, bells and whistles
1350 -----------------------------
1351 * `git dag` improved how it renders parent commits.
1352 (`#921 <https://github.com/git-cola/git-cola/pull/921>`_)
1354 * The `Branches` widget now checks out branches when double-clicked.
1355 (`#920 <https://github.com/git-cola/git-cola/pull/920>`_)
1357 * The new `Submodules` widget makes it easy to interact with submodules.
1358 Additionally, submodules can now be updated using the `Status` widget.
1359 (`#916 <https://github.com/git-cola/git-cola/pull/916>`_)
1361 * Updated Japanese translation.
1362 (`#914 <https://github.com/git-cola/git-cola/pull/914>`_)
1364 * The "Open Terminal" action now launches a Git Bash shell on Windows.
1365 (`#913 <https://github.com/git-cola/git-cola/pull/913>`_)
1367 * New menu actions for updating all submodules.
1368 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
1370 * The status widget can now update submodules.
1371 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
1373 * The "Apply Patch" `git cola am` dialog now includes a diff viewer
1374 to display the contents of the selected patch.
1376 * The "Alt+D" diffstat hotkey now selects the staged/modified/etc.
1377 header in the Status widget, which shows the totality of everything
1378 that will be committed.
1379 (`#771 <https://github.com/git-cola/git-cola/issues/771>`_)
1381 * Running "Launch Editor" from the diff editor now opens the editor at the
1383 (`#898 <https://github.com/git-cola/git-cola/pull/898>`_)
1385 * The textwidth and tabwidth configuration values can now be set
1386 per-repository, rather than globally only.
1388 * Text entry widgets switched to using a block cursor in `v3.2`.
1389 This has been reverted to the original line cursor for consistency
1390 with other applications and user expectations.
1391 (`#889 <https://github.com/git-cola/git-cola/issues/889>`_)
1393 * The "edit at line" feature, used by the "Grep" tool, now supports
1394 the Sublime text editor.
1395 (`#894 <https://github.com/git-cola/git-cola/pull/894>`_)
1399 * Launching external programs has been improved on Windows.
1400 (`#925 <https://github.com/git-cola/git-cola/pull/925>`_)
1402 * Improve compatibility when using PySide2.
1403 (`#912 <https://github.com/git-cola/git-cola/pull/912>`_)
1405 * The Diff Editor was not honoring the configured tab width on startup.
1406 (`#900 <https://github.com/git-cola/git-cola/issues/900>`_)
1408 * The "Delete Files" feature was creating an unreadable display when
1409 many files were selected. Word-wrap the list of files so that the
1410 display stays within a sensible size.
1411 (`#895 <https://github.com/git-cola/git-cola/issues/895>`_)
1413 * Spelling and grammar fixes.
1414 (`#915 <https://github.com/git-cola/git-cola/pull/915>`_)
1415 (`#891 <https://github.com/git-cola/git-cola/pull/891>`_)
1419 * The logo was run through `tidy` to give it a consistent style.
1420 Some technical issues with the logo were improved.
1421 (`#877 <https://github.com/git-cola/git-cola/issues/877>`_)
1423 * The entire codebase is now checked by `flake8`, rather than just
1424 the module and test directories. This catches things like
1425 the pynsist installer scripts.
1426 (`#884 <https://github.com/git-cola/git-cola/issues/884>`_)
1427 (`#882 <https://github.com/git-cola/git-cola/issues/882>`_)
1428 (`#879 <https://github.com/git-cola/git-cola/pull/879>`_)
1432 * The vendored `qtpy` library was updated to `v1.6`.
1434 * The Windows installer's wrapper scripts were missing an import.
1435 (`#878 <https://github.com/git-cola/git-cola/issues/878>`_)
1443 Usability, bells and whistles
1444 -----------------------------
1445 * The `git cola dag` DAG window now supports `git revert`.
1446 (`#843 <https://github.com/git-cola/git-cola/issues/843>`_)
1448 * `git stash pop` is now supported by the stash dialog.
1449 (`#844 <https://github.com/git-cola/git-cola/issues/844>`_)
1451 * The status widget now ensures that each item is visible when selection
1452 changes. Previously, if you scrolled to the right to see the name of
1453 a long filename, and then selected a short filename above it, the widget
1454 may not have shown the short filename in the viewport. We now ensure
1455 that the filenames are visible when the selection changes.
1456 (`#828 <https://github.com/git-cola/git-cola/pull/828>`_)
1458 * The `git xbase` rebase editor no longer displays an error when
1459 cancelling an interactive rebase.
1460 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
1462 * The dialog shown when renaming remotes has been simplified.
1463 (`#840 <https://github.com/git-cola/git-cola/pull/840>`_)
1464 (`#838 <https://github.com/git-cola/git-cola/issues/838>`_)
1466 * The help dialog in the `git-xbase` Rebase editor is now scrollable.
1467 (`#855 <https://github.com/git-cola/git-cola/issues/855>`_)
1471 * Updated Brazilian translation.
1472 (`#845 <https://github.com/git-cola/git-cola/pull/845>`_)
1474 * Updated Czech translation.
1475 (`#854 <https://github.com/git-cola/git-cola/pull/854>`_)
1476 (`#853 <https://github.com/git-cola/git-cola/pull/853>`_)
1477 (`#835 <https://github.com/git-cola/git-cola/pull/835>`_)
1478 (`#813 <https://github.com/git-cola/git-cola/pull/813>`_)
1480 * Update Spanish translation.
1481 (`#862 <https://github.com/git-cola/git-cola/pull/862>`_)
1482 (`#867 <https://github.com/git-cola/git-cola/pull/867>`_)
1486 * The original `#!/usr/bin/env python` shebang lines can now be
1487 retained by passing `USE_ENV_PYTHON=1` to `make` when installing.
1488 (`#850 <https://github.com/git-cola/git-cola/issues/850>`_)
1490 * The Makefile is now resilient to DESTDIR and prefix containing whitespace.
1491 (`#858 <https://github.com/git-cola/git-cola/pull/858>`_)
1493 * The vendored `qtpy` library was updated to `v1.4.2`.
1495 * `python3-distutils` is needed to build cola on Debian.
1496 (`#837 <https://github.com/git-cola/git-cola/issues/837>`_)
1500 * The "C" key no longer closes the message dialogs, for example the
1501 one that is shown when a commit fails its pre-commit hooks.
1502 This allows "Ctrl+C" copy to work, rather than closing the dialog.
1503 (`#734 <https://github.com/git-cola/git-cola/issues/734>`_)
1505 * Dock widgets sizes are now properly saved and restored when the main
1506 window is maximized.
1507 (`#848 <https://github.com/git-cola/git-cola/issues/848>`_)
1509 * The spellcheck feature was broken under Python3.
1510 (`#857 <https://github.com/git-cola/git-cola/issues/857>`_)
1512 * A regression when saving stashes was fixed.
1513 (`#847 <https://github.com/git-cola/git-cola/issues/847>`_)
1515 * Diffing image files was not updating the available context menus,
1516 which prevented the "Stage" action from being present in the menu.
1517 (`#841 <https://github.com/git-cola/git-cola/issues/841>`_)
1519 * `git cola` now detects when `git lfs uninstall` has been run. This allows
1520 you to re-initialize "Git LFS" in an existing repository where it had been
1521 previously uninstalled.
1522 (`#842 <https://github.com/git-cola/git-cola/issues/842>`_)
1524 * Custom color values that did not contain any hexadecimal digits in the
1525 `a-f` range were being converted into integers by the config reader. This
1526 then caused the configured colors to be ignored.
1528 These color values are now interpreted correctly. Additionally, color
1529 values can now use an optional HTML-like `#` prefix.
1531 Example `.gitconfig` snippet::
1536 (`#836 <https://github.com/git-cola/git-cola/pull/836>`_)
1537 (`#849 <https://github.com/git-cola/git-cola/issues/849>`_)
1539 * We now display an error message graphically when `Git` is not installed.
1540 Previously, the message went to stderr only.
1541 (`#830 <https://github.com/git-cola/git-cola/issues/830>`_)
1543 * Changing diff options was causing resulting in an exception.
1544 (`#833 <https://github.com/git-cola/git-cola/issues/833>`_)
1545 (`#834 <https://github.com/git-cola/git-cola/pull/834>`_)
1547 * The DAG window now updates itself when branches and tags are created.
1548 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
1550 * The user's `$PATH` environment variable can now contain UTF-8
1551 encoded paths. Previously, launching external commands could
1553 (`#807 <https://github.com/git-cola/git-cola/issues/807>`_)
1555 * Git Cola development sandboxes can now be stored on UTF-8 encoded
1556 filesystem paths. Previously, the interactive rebase feature
1557 could be broken when running in that environment.
1558 (`#825 <https://github.com/git-cola/git-cola/issues/825>`_)
1560 * The log window now uses an ISO-8601 time stamp, which
1561 avoids localized output in the log window.
1562 (`#817 <https://github.com/git-cola/git-cola/issues/817>`_)
1566 * The code base has been thoroughly sanitized using `pylint`, and
1567 Travis is now running pylint over the entire project.
1569 * Miscellaneous improvements and code improvements.
1570 (`#874 <https://github.com/git-cola/git-cola/issues/874>`_)
1578 Usability, bells and whistles
1579 -----------------------------
1580 * The "Browser" widget learned to rename files using "git mv".
1581 (`#239 <https://github.com/git-cola/git-cola/issues/239>`_)
1583 * The "Diff" widget learned to diff images. Side-by-side and pixel diff
1584 modes allow you to inspect changes to common images formats.
1585 (`#444 <https://github.com/git-cola/git-cola/issues/444>`_)
1586 (`#803 <https://github.com/git-cola/git-cola/pull/803>`_)
1588 * Git LFS and Git Annex are natively supported by the image diff viewer.
1590 * Git Annex operations are now included. `git annex init` can be performed on
1591 repositories, and `git annex add` can be run on untracked files from the
1592 status widget. Install `git-annex` to activate this feature.
1594 * Git LFS operations are now included. `git lfs install` can be performed on
1595 repositories, and `git lfs track` can be run on untracked files from the
1596 status widget. Install `git-lfs` to activate this feature.
1598 * The "Stash" tool learned to stash staged changes only. Select the
1599 "Stage Index" option and only staged changes will be stashed away.
1600 (`#413 <https://github.com/git-cola/git-cola/issues/413>`_)
1602 * The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
1603 shows error messages when things go wrong, and now saves the "Stash Index"
1604 and "Keep Index" options across sessions.
1606 * The Edit menu's "Copy" and "Select All" actions now forward to either the
1607 diff, status, recent, or favorites widgets, based on which widget has focus.
1609 * The "File" and "Edit" menu can now be activated using `Alt + {F,E}` hotkeys.
1610 (`#759 <https://github.com/git-cola/git-cola/issues/759>`_)
1612 * It was easy to accidentally trigger the first action in the `Status` tool's
1613 context menu when using a quick right-click to bring up the menu.
1614 A short sub-second delay was added to ensure that the top-most action is not
1615 triggered unless enough time has passed. This prevents accidental
1616 activation of the first item (typically "Stage" or "Unstage") without
1617 burdening common use cases.
1618 (`#755 <https://github.com/git-cola/git-cola/pull/755>`_)
1619 (`#643 <https://github.com/git-cola/git-cola/issues/643>`_)
1621 * The "Ctrl+S" hotkey now works for the header items in the Status tool.
1622 Selected the "Modified" header item and activating the "Stage" hotkey,
1623 for example, will stage all modified files. This works for the "Staged",
1624 "Modified", and "Untracked" headers. This is not enabled for the
1625 "Unmerged" header by design.
1626 (`#772 <https://github.com/git-cola/git-cola/issues/772>`_)
1628 * The list of "Recent" repositories previously capped the number of
1629 repositories shown to 8 repositories. This can be set to a higher
1630 value by setting the `cola.maxrecent` configuration variable.
1631 (`#752 <https://github.com/git-cola/git-cola/issues/752>`_)
1633 * The "Create Branch" dialog now prevents invalid branch names.
1634 (`#765 <https://github.com/git-cola/git-cola/issues/765>`_)
1636 * Updated Turkish translation.
1637 (`#756 <https://github.com/git-cola/git-cola/pull/756>`_)
1639 * Updated Ukrainian translation.
1640 (`#753 <https://github.com/git-cola/git-cola/pull/753>`_)
1642 * Updated German translation.
1643 (`#802 <https://github.com/git-cola/git-cola/pull/802>`_)
1645 * Updated Czech translation
1646 (`#792 <https://github.com/git-cola/git-cola/pull/792>`_)
1647 (`#806 <https://github.com/git-cola/git-cola/pull/806>`_)
1649 * The window title can be configured to not display the absolute path of the
1651 (`#775 <https://github.com/git-cola/git-cola/issues/775>`_)
1653 * The "Edit Remotes" editor learned to edit remote URLS.
1655 * Bare repositories can now be created by selecting the
1656 "New Bare Repository..." action from the `File` menu.
1658 * The "Branches" widget learned to configure upstream branches.
1660 * A new `git cola clone` sub-command was added for cloning repositories.
1664 * The vendored `qtpy` library was updated to `v1.3.1`.
1666 * The macOS installation was made simpler for better compatibility with
1668 (`#636 <https://github.com/git-cola/git-cola/issues/636>`_)
1670 * The Windows installer is now much simpler. Git Cola now bundles
1671 Python and PyQt5, so users need only install the "Git for Windows"
1672 and "Git Cola" installers to get things working.
1676 * Uninitialized difftool errors will now be displayed graphically.
1677 They were previously going to the shell.
1678 (`#457 <https://github.com/git-cola/git-cola/issues/457>`_)
1680 * Translations marked "fuzzy" will no longer be used when translating strings.
1681 (`#782 <https://github.com/git-cola/git-cola/issues/782>`_)
1683 * Deleted unmerged files will now correctly use a deleted icon.
1684 (`#479 <https://github.com/git-cola/git-cola/issues/479>`_)
1686 * The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
1687 (`#767 <https://github.com/git-cola/git-cola/issues/767>`_)
1689 * The "Create Tag" dialog did not correctly handle the case when a signed
1690 tag is requested, but no message is provided, and the user chooses to
1691 create a non-annotated tag instead. This convenience fallback will now
1692 properly create an unsigned, non-annotated tag.
1693 (`#696 <https://github.com/git-cola/git-cola/issues/696>`_)
1695 * `.gitconfig` and `.git/config` values editable by the Preferences dialog
1696 (aka `git cola config`) will now get unset when set to an empty value.
1697 For example, setting a different `user.email` in the current repository,
1698 followed by a subsequent emptying of that field, would previously result in
1699 an empty string getting stored in the config. This has been fixed so that
1700 the value will now get unset in the config instead.
1701 (`#406 <https://github.com/git-cola/git-cola/issues/406>`_)
1703 * Spelling and typo fixes.
1704 (`#748 <https://github.com/git-cola/git-cola/pull/748>`_)
1706 * `core.commentChar` is now honored when set in the local repository
1708 (`#766 <https://github.com/git-cola/git-cola/issues/766>`_)
1710 * The log window was using a format string that did not display
1711 correctly in all locales. A locale-aware format is now used.
1712 (`#800 <https://github.com/git-cola/git-cola/pull/800>`_)
1714 * The dialog displayed when prompting for a reference could sometimes
1716 (`#804 <https://github.com/git-cola/git-cola/pull/804>`_)
1724 Usability, bells and whistles
1725 -----------------------------
1726 * Updated Simplified Chinese translation.
1727 (`#726 <https://github.com/git-cola/git-cola/pull/726>`_)
1729 * Updated Ukrainian translation.
1730 (`#723 <https://github.com/git-cola/git-cola/pull/723>`_)
1732 * New Czech translation.
1733 (`#736 <https://github.com/git-cola/git-cola/pull/736>`_)
1734 (`#737 <https://github.com/git-cola/git-cola/pull/737>`_)
1735 (`#740 <https://github.com/git-cola/git-cola/pull/740>`_)
1736 (`#743 <https://github.com/git-cola/git-cola/pull/743>`_)
1738 * The "name" field in the "Create Tag" dialog now includes autocompletion,
1739 which makes it easy to see which tags currently exist.
1741 * `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
1742 menu item to add a toolbar.
1744 * Setting `cola.expandtab` to `true` will now expand tabs into spaces
1745 in the commit message editor. The number of spaces to insert is determined
1746 by consulting `cola.tabwidth`, which defaults to `8`.
1748 * The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
1749 ability to copy text from the DAG window.
1750 (`#705 <https://github.com/git-cola/git-cola/pull/705>`_)
1752 * The "Prepare Commit Message" action can now be invoked via the
1753 `Ctrl+Shift+Return` shortcut.
1754 (`#707 <https://github.com/git-cola/git-cola/pull/707>`_)
1756 * The `Branches` pane now has a filter field that highlights branches whose
1757 names match the string entered into its text field.
1758 (`#713 <https://github.com/git-cola/git-cola/pull/713>`_)
1760 * Actions that are triggered in response to button presses were being
1761 triggered when the button was pressed, rather than when it was released,
1762 which was a usability flaw. All buttons now respond when clicked
1763 rather than when pressed.
1764 (`#715 <https://github.com/git-cola/git-cola/pull/715>`_)
1766 * The DAG window will now only refresh when object IDs change.
1767 Previously, the DAG would redraw itself in response to inotify events,
1768 such as filesystem operations, which was disruptive when inspecting a large
1769 diff in its diff viewer. The DAG will now only redraw when the object IDs
1770 corresponding to its query input changes. Furthermore, when redrawing, the
1771 scrollbar positions are retained to minimize disruption to the viewport
1773 (`#620 <https://github.com/git-cola/git-cola/issues/620>`_)
1774 (`#724 <https://github.com/git-cola/git-cola/issues/724>`_)
1776 * The "About" dialog now includes the SHA-1 where Git Cola was built.
1777 (`#530 <https://github.com/git-cola/git-cola/issues/530>`_)
1779 * The "Status" widget now has "Copy Leading Path to Clipboard" and
1780 "Copy Basename to Clipboard" actions.
1781 (`#435 <https://github.com/git-cola/git-cola/issues/435>`_)
1782 (`#436 <https://github.com/git-cola/git-cola/issues/436>`_)
1784 * The "Status" widget now supports custom "Copy xxx to Clipboard" actions.
1785 (`#437 <https://github.com/git-cola/git-cola/issues/437>`_)
1787 * The main menu now has an "Edit" menu.
1788 (`#725 <https://github.com/git-cola/git-cola/issues/725>`_)
1790 * `git dag` learned to checkout commits into a detached HEAD state.
1791 (`#698 <https://github.com/git-cola/git-cola/issues/698>`_)
1793 * The `status` widget's context menus now omit actions selection-dependent
1794 actions when no file is selected.
1795 (`#731 <https://github.com/git-cola/git-cola/pull/731>`_)
1797 * The startup dialog now focuses the repository list so that repositories
1798 can be selected with the keyboard without mouse intervention.
1799 (`#741 <https://github.com/git-cola/git-cola/issues/741>`_)
1803 * `git dag` now prevents nodes from overlapping in more situations.
1804 (`#689 <https://github.com/git-cola/git-cola/pull/689>`_)
1806 * Adding untracked Git submodule repo directories previously ran
1807 `git add submodule/` but we now call `git add submodule` without
1808 the trailing slash (`/`) to avoid staging files that belong to the
1809 submodule (which is possibly a `git` bug). By working around the
1810 buggy behavior we allow users to recover by issuing the appropriate
1811 `git submodule add` command to properly register the submodule.
1812 (`#681 <https://github.com/git-cola/git-cola/pull/681>`_)
1814 * We now avoid `git for-each-ref --sort=version:refname` on versions
1815 of `git` older than `v2.7.0`. Previously we only avoided it for
1816 versions older than `v2.0.0`, which was a mistake.
1817 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
1819 * The error message displayed when `git` is not installed has been fixed.
1820 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
1822 * Adding new remotes was silently broken.
1823 (`#684 <https://github.com/git-cola/git-cola/issues/684>`_)
1824 (`#685 <https://github.com/git-cola/git-cola/pull/685>`_)
1826 * The repo selection dialog had errors during startup when the
1827 `cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
1828 (`#690 <https://github.com/git-cola/git-cola/issues/690>`_)
1830 * Restored support for PyQt 4.6 (Centos 6.8)
1831 (`#692 <https://github.com/git-cola/git-cola/issues/692>`_)
1833 * Switching repositories now resets the "Amend Mode" and other settings
1835 (`#710 <https://github.com/git-cola/git-cola/issues/710>`_)
1837 * `git rebase` error messages now displayed when rebasing fails or stops
1838 via the standalone `git cola rebase` front-end.
1839 (`#721 <https://github.com/git-cola/git-cola/issues/721>`_)
1841 * `git cola` learned to stage broken symlinks.
1842 (`#727 <https://github.com/git-cola/git-cola/issues/727>`_)
1844 * The "View History" feature in the `Browser` tool was fixed, and now
1845 disambiguates between refs and paths.
1846 (`#732 <https://github.com/git-cola/git-cola/issues/732>`_)
1848 * The diff editor now has better support for files with CRLF `\r\n`
1850 (`#730 <https://github.com/git-cola/git-cola/issues/730>`_)
1852 * `cola.inotify` in a repo-local config is now honored
1853 when `git cola` is launched from a desktop entry (`git cola --prompt`).
1854 (`#695 <https://github.com/git-cola/git-cola/issues/695>`_)
1862 Usability, bells and whistles
1863 -----------------------------
1864 * New Ukrainian translation.
1865 (`#670 <https://github.com/git-cola/git-cola/pull/670>`_)
1866 (`#672 <https://github.com/git-cola/git-cola/pull/672>`_)
1868 * New and improved French translations.
1870 * The new `Branches` widget makes it easier to checkout, merge, push,
1871 and pull branches from a single interface.
1873 * `git cola` now includes a dark icon theme. The dark icon theme can be
1874 activated either by setting the `GIT_COLA_ICON_THEME` environment variable
1875 to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
1876 `--icon-theme=dark` on the command line.
1877 (`#638 <https://github.com/git-cola/git-cola/pull/638>`_)
1879 * Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.
1881 * The commit message editor now remembers the "Spellcheck" setting
1883 (`#645 <https://github.com/git-cola/git-cola/pull/645>`_)
1885 * `git dag` now uses an improved algorithm for laying out the graph,
1886 which avoids collisions under certain graph configurations, and
1887 avoids overlapping tag with commits.
1888 (`#648 <https://github.com/git-cola/git-cola/pull/648>`_)
1889 (`#651 <https://github.com/git-cola/git-cola/pull/651>`_)
1890 (`#654 <https://github.com/git-cola/git-cola/pull/654>`_)
1891 (`#656 <https://github.com/git-cola/git-cola/pull/656>`_)
1892 (`#659 <https://github.com/git-cola/git-cola/pull/659>`_)
1894 * `git dag` now remembers its column sizes across sessions.
1895 (`#674 <https://github.com/git-cola/git-cola/issues/674>`_)
1897 * `Grep` now shows a preview of the selected file's content in a split window
1898 below the grep results.
1900 * `Grep` now includes line numbers in the preview pane's output.
1902 * `Edit Remotes` now remembers its window settings after exiting.
1904 * `Diff` now has an option to display line numbers in the editor.
1905 (`#136 <https://github.com/git-cola/git-cola/issues/136>`_)
1907 * `Amend Last Commit` can now be triggered via the `Commit` menu in addition
1908 to the commit message editor's options.
1909 (`#640 <https://github.com/git-cola/git-cola/issues/640>`_)
1911 * The `File Browser` tool was made much faster and can now operate on
1912 much larger repositories.
1913 (`#499 <https://github.com/git-cola/git-cola/issues/499>`_)
1915 * A new "turbo" mode was added that allows you to opt-out of operations
1916 that can slow `git cola` on large repositories. The turbo mode is
1917 enabled by configuring `git config cola.turbo true`. Turbo mode
1918 disables the background loading of Git commit messages and other
1919 details in the `File Browser` widget.
1921 * A new GitIgnore dialog allows adding custom gitignore patterns.
1922 (`#653 <https://github.com/git-cola/git-cola/pull/653>`_)
1924 * The spellchecker in `git cola` can now use an additional dictionary
1925 by configuring `cola.dictionary` to the path to a file containing
1926 a newline-separated list of words.
1927 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1929 * The stash, export patches, diff, and gitignore dialogs now remember
1932 * A new `git cola recent` sub-command was added for finding recently
1935 * The `Fetch` dialog now allows pruning remote branches.
1936 (`#639 <https://github.com/git-cola/git-cola/issues/639>`_)
1937 (`#680 <https://github.com/git-cola/git-cola/pull/680>`_)
1941 * `git cola`'s spellchecker now supports the new `dict-common` filesystem
1942 layout, and prefers the `/usr/share/dict/cracklib-small` file over the
1943 `/usr/share/dict/words` provided on older distributions.
1944 This makes the spellchecker compatible with Arch, which does not provide
1945 a `words` symlink like Debian.
1946 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1948 * Properly handle the case where an existing file is untracked using
1951 * Fix a quirk where the "Create Branch" dialog sometimes required clicking
1952 twice on the radio buttons.
1953 (`#662 <https://github.com/git-cola/git-cola/pull/662>`_)
1955 * Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
1956 be executed with the press of a single enter key after being shown.
1957 (`#661 <https://github.com/git-cola/git-cola/issues/661>`_)
1959 * Committing is now allowed in when resolving a merge results in no
1960 changes. This state was previously prevented by the commit message editor,
1961 which prevented users from resolving merges that result in no changes.
1962 (`#679 <https://github.com/git-cola/git-cola/pull/679>`_)
1964 * The filesystem monitor would sometimes emit backtraces when directories
1965 are modified. This has been fixed.
1966 (`bz #1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)
1968 * Absolute paths are now returned when querying for `.git`-relative paths
1969 from within a submodule, which uses `.git`-files.
1970 This fixes launching `git cola` from within a subdirectory of a submodule.
1971 (`#675 <https://github.com/git-cola/git-cola/pull/675>`_)
1979 Usability, bells and whistles
1980 -----------------------------
1981 * `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
1982 hook to update the commit message. This hook takes the same parameters
1983 as Git's `prepare-commit-message` hook. The default path to this hook
1984 can be overridden by setting the `cola.prepareCommitMessageHook`
1985 configuration variable.
1986 (`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)
1988 * `git cola diff` (and the corresponding `Diff` menu actions) can now
1989 launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
1990 also added for launching an editor.
1992 * Traditional Chinese (Taiwan) translation updates.
1996 * `git cola` now works when installed in non-ASCII, UTF-8-encoded paths.
1997 (`#629 <https://github.com/git-cola/git-cola/issues/629>`_)
1999 * Styling issues that caused black backgrounds in various widgets when using
2000 PyQt5 on Mac OS X have been fixed.
2001 (`#624 <https://github.com/git-cola/git-cola/issues/624>`_)
2003 * The "Open Recent" menu action was broken and has been fixed.
2004 (`#634 <https://github.com/git-cola/git-cola/issues/634>`_)
2006 * Exiting `git cola` with a maximized main window would hang when reopened
2008 (`#641 <https://github.com/git-cola/git-cola/issues/641>`_)
2012 * `appdata.xml` files are now provided at
2013 `share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
2014 for use by the Linux software gallery.
2015 (`#627 <https://github.com/git-cola/git-cola/pull/627>`_)
2016 (`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)
2026 * The "Open Recent" menu was updated to new bookmarks format.
2027 (`#628 <https://github.com/git-cola/git-cola/issues/628>`_)
2035 Usability, bells and whistles
2036 -----------------------------
2037 * New Polish translation thanks to Łukasz Wojniłowicz
2038 (`#598 <https://github.com/git-cola/git-cola/pull/598>`_)
2040 * The `Bypass Commit Hooks` feature now disables itself automatically
2041 when a new commit is created. The new behavior turns the option into a
2042 single-use flag, which helps prevent users from accidentally leaving it
2043 active longer than intended.
2044 (`#595 <https://github.com/git-cola/git-cola/pull/595>`_)
2046 * `git dag` learned to launch an external diff viewer on selected commits.
2047 The standard `Ctrl+D` shortcut can be used to view diffs.
2048 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
2050 * `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
2051 The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
2052 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
2054 * Items in the "Favorites" list can now be renamed, which makes it
2055 easier to differentiate between several checkouts of the same repository.
2056 (`#599 <https://github.com/git-cola/git-cola/issues/599>`_)
2057 (`#601 <https://github.com/git-cola/git-cola/pull/601>`_)
2059 * The startup screen now includes a logo and `git cola` version information.
2060 (`#526 <https://github.com/git-cola/git-cola/issues/526>`_)
2062 * The `About` page was revamped to contain multiple tabs. A new tab was added
2063 that provides details about `git cola`''s dependencies. New tabs were also
2064 added for giving credit to `git cola`'s authors and translators.
2066 * The `About` page can now be accessed via `git cola about`.
2068 * The "Fast-forward only" and "No fast-forward" options supported by
2069 `git pull` are now accessible via `git cola pull`.
2071 * Doing a forced push no longer requires selecting the remote branch.
2072 (`#618 <https://github.com/git-cola/git-cola/pull/618>`_)
2074 * `git cola push` now has an option to suppress the prompt that is shown
2075 when pushing would create new remote branches.
2076 (`#605 <https://github.com/git-cola/git-cola/issues/605>`_)
2078 * `git dag` now shows commit messages in a more readable color.
2079 (`#574 <https://github.com/git-cola/git-cola/issues/574>`_)
2081 * `git cola browse` and the `status` widget learned to launch the OS-specified
2082 default action for a file. When used on directories via `git cola browse`,
2083 or when "Open Parent Directory" is used on files, the OS-specified
2084 file browser will typically be used.
2086 * `git cola browse` and the `status` widget learned to launch terminals.
2090 * `git cola browse` was not updating when expanding items.
2091 (`#588 <https://github.com/git-cola/git-cola/issues/588>`_)
2093 * Typo fixes in comments, naming, and strings have been applied.
2094 (`#593 <https://github.com/git-cola/git-cola/pull/593>`_)
2096 * The inotify and win32 filesystem monitoring no longer refreshes
2097 when updates are made to ignored files.
2098 (`#517 <https://github.com/git-cola/git-cola/issues/517>`_)
2099 (`#516 <https://github.com/git-cola/git-cola/issues/516>`_)
2101 * The `Refresh` button on the actions panel no longer raises an
2102 exception when using PyQt5.
2103 (`#604 <https://github.com/git-cola/git-cola/issues/604>`_)
2105 * Fixed a typo in the inotify back-end that is triggered when files are removed.
2106 (`#607 <https://github.com/git-cola/git-cola/issues/607>`_)
2108 * Fixed a typo when recovering from a failed attempt to open a repository.
2109 (`#606 <https://github.com/git-cola/git-cola/issues/606>`_)
2111 * `git dag` now properly updates itself when launched from the menu bar.
2112 (`#613 <https://github.com/git-cola/git-cola/pull/613>`_)
2114 * If git-cola is invoked on Windows using `start pythonw git-cola`,
2115 a console window will briefly flash on the screen each time
2116 `git cola` invokes `git`. The console window is now suppressed.
2118 * We now avoid some problematic Popen flags on Windows which were
2119 breaking the `git rebase` feature on Windows.
2121 * The `Save` button in `git dag`'s "Grab File..." feature now properly
2122 prompts for a filename when saving files.
2123 (`#617 <https://github.com/git-cola/git-cola/pull/617>`_)
2127 * The `qtpy` symlink in the source tree has been removed to allow for easier
2128 development on Windows.
2129 (`#626 <https://github.com/git-cola/git-cola/issues/626>`_)
2137 Usability, bells and whistles
2138 -----------------------------
2139 * `git cola push` learned to configure upstream branches.
2140 (`#563 <https://github.com/git-cola/git-cola/issues/563>`_)
2144 * The diffstat view is now properly updated when notifications are
2145 received via inotify filesystem monitoring.
2146 (`#577 <https://github.com/git-cola/git-cola/issues/577>`_)
2148 * Python3 with PyQt5 had a bug that prevented `git cola` from starting.
2149 (`#589 <https://github.com/git-cola/git-cola/pull/589>`_)
2160 * When repositories stored in non-ASCII, UTF-8-encoded filesystem paths
2161 were operated upon with `LC_ALL=C` set in the environment, Unicode errors
2162 would occur when using `python2`. `git cola` was made more robust and will
2163 now operate correctly within this environment.
2164 (`#581 <https://github.com/git-cola/git-cola/issues/581>`_)
2166 * Support for the `GIT_WORK_TREE` environment variable was fixed.
2167 (`#582 <https://github.com/git-cola/git-cola/pull/582>`_)
2172 * The `unittest.mock` module is now used instead of the original `mock` module
2173 when running the `git cola` test suite using Python3.
2174 (`#569 <https://github.com/git-cola/git-cola/issues/569>`_)
2179 * `git cola` is now compatible with *PyQt5*, *PyQt4*, and *Pyside*.
2180 `git cola` previously supported *PyQt4* only, but will now use whichever
2181 library is available. Users are not required to upgrade at this time,
2182 but *PyQt5* support can be enabled anytime by making its python
2184 (`#232 <https://github.com/git-cola/git-cola/issues/232>`_)
2186 *NOTE*: We do not yet recommend using *PyQt5* because there are known
2187 exit-on-segfault bugs in *Qt5* that have not yet been addressed.
2188 `git cola` is sensitive to this bug and is known to crash on exit
2189 when using `git dag` or the interactive rebase feature on *PyQt5*.
2191 https://bugreports.qt.io/browse/QTBUG-52988
2193 *PyQt4* is stable and there are no known issues when using it so
2194 we recommend using it until the Qt5 bugs have been resolved.
2196 * `git cola` now depends on *QtPy* and includes a bundled copy of the
2197 `qtpy` library. If you are packaging `git cola` and would prefer to use
2198 `qtpy` from your distribution instead of the built-in version then use
2199 `make NO_VENDOR_LIBS=1` when building `git cola`. This will prevent
2200 vendored libraries from being installed.
2208 Usability, bells and whistles
2209 -----------------------------
2211 * A new "Reset" sub-menu provides access to running "git reset --mixed"
2212 when resetting branch heads and "git reset --merge" when resetting
2214 (`#542 <https://github.com/git-cola/git-cola/issues/542>`_)
2216 * `git cola` now supports linked worktrees, i.e. worktrees created by
2218 (`#554 <https://github.com/git-cola/git-cola/issues/554>`_)
2223 * Diff highlighting is now robust to the user having
2224 diff.supressBlankEmpty=true in their git config.
2225 (`#541 <https://github.com/git-cola/git-cola/issues/541>`_)
2227 * The filesystem monitor now properly handles repositories that use
2228 `.git`-files, e.g. when using submodules.
2229 (`#545 <https://github.com/git-cola/git-cola/issues/545>`_)
2230 (`#546 <https://github.com/git-cola/git-cola/pulls/546>`_)
2232 * Per-repository git configuration is now properly detected when launching
2233 `git cola` from an application launcher.
2234 (`#548 <https://github.com/git-cola/git-cola/issues/548>`_)
2236 * `git cola` now cleans up after itself immediately to avoid leaving behind
2237 empty `/tmp/git-cola-XXXXXX` directories when the user uses `Ctrl+C`
2239 (`#566 <https://github.com/git-cola/git-cola/issues/566>`_)
2244 * It is now possible to install `git cola` to and from UTF-8-encoded filesystem
2245 paths. Previously, Python's stdlib would throw an encoding error during
2246 installation. We workaround the stdlib by forcing python2 to use UTF-8,
2247 thus fixing assumptions in the stdlib library code.
2248 (`#551 <https://github.com/git-cola/git-cola/issues/551>`_)
2256 Usability, bells and whistles
2257 -----------------------------
2259 * The icon for untracked files was adjusted to better differentiate
2260 between files and the "Untracked" header.
2261 (`#509 <https://github.com/git-cola/git-cola/issues/509>`_)
2263 * Ctrl+O was added as a hotkey for opening repositories.
2264 (`#507 <https://github.com/git-cola/git-cola/pull/507>`_)
2266 * `git dag` now uses consistent edge colors across updates.
2267 (`#512 <https://github.com/git-cola/git-cola/issues/512>`_)
2269 * `git cola`'s Bookmarks widget can now be used to set a "Default Repository".
2270 Under the hood, we set the `cola.defaultrepo` configuration variable.
2271 The default repository is used whenever `git cola` is launched outside of
2272 a Git repository. When unset, or when set to a bogus value, `git cola`
2273 will prompt for a repository, as it previously did.
2274 (`#513 <https://github.com/git-cola/git-cola/issues/513>`_)
2276 * `git cola`'s Russian and Spanish translations were improved
2277 thanks to Vaiz and Zeioth.
2278 (`#514 <https://github.com/git-cola/git-cola/pull/514>`_)
2279 (`#515 <https://github.com/git-cola/git-cola/pull/515>`_)
2280 (`#523 <https://github.com/git-cola/git-cola/pull/523>`_)
2282 * `git cola` was translated to Turkish thanks to Barış ÇELİK.
2283 (`#520 <https://github.com/git-cola/git-cola/pull/520>`_)
2285 * The status view now supports launching `git gui blame`. It can be
2286 configured to use a different command by setting `cola.blameviewer`.
2287 (`#521 <https://github.com/git-cola/git-cola/pull/521>`_)
2289 * `git dag` now allows selecting non-contiguous ranges in the log widget.
2290 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
2292 * Any font can now be chosen for the diff editor, not just mono-space fonts.
2293 (`#525 <https://github.com/git-cola/git-cola/issues/525>`_)
2298 * `xfce4-terminal` and `gnome-terminal` are now supported when launching
2299 `git mergetool` to resolve merges. These terminals require that the command
2300 to execute is shell-quoted and passed as a single string argument to `-e`
2301 rather than as additional command line arguments.
2302 (`#524 <https://github.com/git-cola/git-cola/issues/524>`_)
2304 * Fixed a Unicode problem when formatting the error message that is shown
2305 when `gitk` is not installed. We now handle Unicode data in tracebacks
2306 generated by python itself.
2307 (`#528 <https://github.com/git-cola/git-cola/issues/528>`_)
2309 * The `New repository` feature was fixed.
2310 (`#533 <https://github.com/git-cola/git-cola/pull/533>`_)
2312 * We now use omit the extended description when creating "fixup!" commits,
2313 for consistency with the Git CLI. We now include only the one-line summary
2314 in the final commit message.
2315 (`#522 <https://github.com/git-cola/git-cola/issues/522>`_)
2323 Usability, bells and whistles
2324 -----------------------------
2326 * The user interface is now HiDPI-capable. Git Cola now uses SVG
2327 icons, and its interface can be scaled by setting the `GIT_COLA_SCALE`
2328 environment variable.
2330 * `git dag` now supports the standard editor, difftool, and history hotkeys.
2331 It is now possible to invoke these actions from file widget's context
2332 menu and through the standard hotkeys.
2333 (`#473 <https://github.com/git-cola/git-cola/pull/473>`_)
2335 * The `Status` tool also learned about the history hotkey.
2336 Additionally, the `Alt + {J,K}` aliases are also supported in the `Status`
2337 tool for consistency with the other tools where the non-Alt hotkeys are not
2339 (`#488 <https://github.com/git-cola/git-cola/pull/488>`_)
2341 * The `File Browser` tool now has better default column sizes,
2342 and remembers its window size and placement.
2344 * The `File Browser` now supports the refresh hotkey, and has better
2345 behavior when refreshing. The selection is now retained, and new and
2346 removed files are found when refreshing.
2348 * A new `git-cola-completion.bash` completion script is provided in the
2349 `contrib/` directory. It must be used alongside Git's completion script.
2350 Source it from your `~/.bashrc` (or `~/.zshrc`, etc) after sourcing
2351 the `git-completion.bash` script and you will have command-line completion
2352 support for the `git cola` and `git dag` sub-commands.
2354 * The "checkout" dialog now offers completion for remote branches and other
2355 git refs. This makes it easier to checkout remote branches in a detached
2356 head state. Additionally, the checkout dialog also offers completion for
2357 remote branches that have not yet been checked out, which makes it easier to
2358 create a local tracking branch by just completing for that potential name.
2359 (`#390 <https://github.com/git-cola/git-cola/issues/390>`_)
2361 * The "create branch" and "create tag" dialogs now save and restore their
2364 * The "status" widget can now be configured to use a bold font with a darker
2365 background for the header items.
2366 (`#506 <https://github.com/git-cola/git-cola/pull/506>`_)
2368 * The "status" widget now remembers its horizontal scrollbar position across
2369 updates. This is helpful when working on projects with long paths.
2370 (`#494 <https://github.com/git-cola/git-cola/issues/494>`_)
2375 * When using *Git for Windows*, a `git` window would appear
2376 when running *Windows 8*. We now pass additional flags to
2377 `subprocess.Popen` to prevent a `git` window from appearing.
2378 (`#477 <https://github.com/git-cola/git-cola/issues/477>`_)
2379 (`#486 <https://github.com/git-cola/git-cola/pull/486>`_)
2381 * Launching difftool with `.PY` in `$PATHEXT` on Windows was fixed.
2382 (`#492 <https://github.com/git-cola/git-cola/issues/492>`_)
2384 * Creating a local branch tracking a remote branch that contains
2385 slashes in its name is now properly handled.
2386 (`#496 <https://github.com/git-cola/git-cola/issues/496>`_)
2388 * The "Browse Other Branch" feature was broken by Python3, and is now fixed.
2389 (`#501 <https://github.com/git-cola/git-cola/issues/501>`_)
2391 * We now avoid `long` for better Python3 compatibility.
2392 (`#502 <https://github.com/git-cola/git-cola/issues/502>`_)
2394 * We now use Git's default merge message when merging branches.
2395 (`#508 <https://github.com/git-cola/git-cola/issues/508>`_)
2397 * Miscellaneous fixes
2398 (`#485 <https://github.com/git-cola/git-cola/pull/485>`_)
2403 * git-cola's documentation no longer uses an inter-sphinx link mapping
2404 to docs.python.org. This fixes warnings when building RPMs using koji,
2405 where network access is prevented.
2407 https://bugzilla.redhat.com/show_bug.cgi?id=1231812
2415 Usability, bells and whistles
2416 -----------------------------
2418 * The Interactive Rebase feature now works on Windows!
2419 (`#463 <https://github.com/git-cola/git-cola/issues/463>`_)
2421 * The `diff` editor now understands vim-style `hjkl` navigation hotkeys.
2422 (`#476 <https://github.com/git-cola/git-cola/issues/476>`_)
2424 * `Alt + {J,K}` navigation hotkeys were added to allow changing to the
2425 next/previous file from the diff and commit editors.
2427 * The `Rename branch` menu action is now disabled in empty repositories.
2428 (`#475 <https://github.com/git-cola/git-cola/pull/475>`_)
2429 (`#459 <https://github.com/git-cola/git-cola/issues/459>`_)
2431 * `git cola` now checks unmerged files for conflict markers before
2432 staging them. This feature can be disabled in the preferences.
2433 (`#464 <https://github.com/git-cola/git-cola/issues/464>`_)
2435 * `git dag` now remembers which commits were selected when refreshing
2436 so that it can restore the selection afterwards.
2437 (`#480 <https://github.com/git-cola/git-cola/issues/480>`_)
2439 * "Launch Editor", "Launch Difftool", "Stage/Unstage",
2440 and "Move Up/Down" hotkeys now work when the commit message
2442 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
2444 * The diff editor now supports the `Ctrl+u` hotkey for reverting
2445 diff hunks and selected lines.
2447 * The `core.commentChar` Git configuration value is now honored.
2448 Commit messages and rebase instruction sheets will now use
2449 the configured character for comments. This allows having
2450 commit messages that start with `#` when `core.commentChar`
2451 is configured to its non-default value.
2452 (`#446 <https://github.com/git-cola/git-cola/issues/446>`_)
2457 * Diff syntax highlighting was improved to handle more edge cases
2458 and false positives.
2459 (`#467 <https://github.com/git-cola/git-cola/pull/467>`_)
2461 * Setting commands in the interactive rebase editor was fixed.
2462 (`#472 <https://github.com/git-cola/git-cola/issues/472>`_)
2464 * git-cola no longer clobbers the Ctrl+Backspace text editing shortcut
2465 in the commit message editor.
2466 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
2468 * The copy/paste clipboard now persists after `git cola` exits.
2469 (`#484 <https://github.com/git-cola/git-cola/issues/484>`_)
2479 * Fixed the "Sign off" feature in the commit message editor.
2487 Usability, bells and whistles
2488 -----------------------------
2489 * Double-click will now choose a commit in the "Select commit" dialog.
2491 * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the
2492 commit message when a merge is in-progress. Upon refresh, `git cola` will
2493 now detect when a merge has completed and reset the commit message back to
2494 its previous state. It is only reset if the editor contains a message
2495 that was read from the file and has not been manually edited by the user.
2497 * The commit message editor's context menu now has a "Clear..." action for
2498 clearing the message across both the summary and description fields.
2500 * Traditional Chinese (Taiwan) translation updates.
2502 * The system theme's icons are now used wherever possible.
2503 (`#458 <https://github.com/git-cola/git-cola/pull/458>`_)
2507 * The stash viewer now uses ``git show --no-ext-diff`` to avoid running
2508 user-configured diff tools.
2510 * `git cola` now uses the `setsid()` system call to ensure that the
2511 `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing
2512 changes using `git`. The askpass helpers will now be used even when
2513 `git cola` is launched from a terminal.
2515 The behavior without `setsid()` is that `git cola` can appear to hang while
2516 pushing changes. The hang happens when `git` prompts the user for a
2517 password using the terminal, but the user never sees the prompt. `setsid()`
2518 detaches the terminal, which ensures that the askpass helpers are used.
2519 (`#218 <https://github.com/git-cola/git-cola/issues/218>`_)
2520 (`#262 <https://github.com/git-cola/git-cola/issues/262>`_)
2521 (`#377 <https://github.com/git-cola/git-cola/issues/377>`_)
2523 * `git dag`'s file list tool was updated to properly handle Unicode paths.
2525 * `gnome-terminal` is no longer used by default when `cola.terminal` is unset.
2526 It is broken, as was detailed in #456.
2527 (`#456 <https://github.com/git-cola/git-cola/issues/456>`_)
2529 * The interactive rebase feature was not always setting `$GIT_EDITOR`
2530 to the value of `gui.editor`, thus there could be instances where rebase
2531 will seem to not stop, or hang, when performing "reword" actions.
2533 We now set the `$GIT_EDITOR` environment variable when performing the
2534 "Continue", "Skip", and "Edit Todo" rebase actions so that the correct
2535 editor is used during the rebase.
2536 (`#445 <https://github.com/git-cola/git-cola/issues/445>`_)
2540 * `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y"
2541 version number. Most of our releases tend to contain new features.
2548 Usability, bells and whistles
2549 -----------------------------
2550 * Updated zh_TW translations.
2552 * `git cola rebase` now defaults to `@{upstream}`, and generally uses the same
2553 CLI syntax as `git rebase`.
2555 * The commit message editor now allows you to bypass commit hooks by selecting
2556 the "Bypass Commit Hooks" option. This is equivalent to passing the
2557 `--no-verify` option to `git commit`.
2558 (`#357 <https://github.com/git-cola/git-cola/issues/357>`_)
2560 * We now prevent the "Delete Files" action from creating a dialog that does
2562 (`#378 <https://github.com/git-cola/git-cola/issues/378>`_)
2564 * `git xbase` learned to edit rebase instruction sheets that contain
2567 * The diff colors are now configurable. `cola.color.{text,add,remove,header}`
2568 can now be set with 6-digit hexadecimal colors.
2569 See the `git cola manual <https://git-cola.readthedocs.io/en/latest/git-cola.html#configuration-variables>_`
2572 * Improved hotkey documentation.
2576 * `git cola` will now allow starting an interactive rebase with a dirty
2577 worktree when `rebase.autostash` is set.
2578 (`#360 <https://github.com/git-cola/git-cola/issues/360>`_)
2585 Usability, bells and whistles
2586 -----------------------------
2587 * A new "Find files" widget was added, and can be activated by
2588 using the `Ctrl+t` or `t` hotkeys.
2590 * A new `git cola find` sub-command was added for finding files.
2592 * `git cola` now remembers the text cursor's position when staging
2593 interactively with the keyboard. This makes it easier to use the keyboard
2594 arrows to select and stage lines.
2596 * The completion widgets will now select the top completion item
2597 when `Enter` or `Return` are pressed.
2599 * You can now refresh using `F5` in addition to the existing `Ctrl+R` hotkey.
2603 * `git cola` now passes `--no-abbrev-commit` to `git log` to override
2604 having `log.abbrevCommit = true` set in `.gitconfig`.
2611 Usability, bells and whistles
2612 -----------------------------
2613 * `git dag` now forwards all unknown arguments along to `git log`.
2614 (`#389 <https://github.com/git-cola/git-cola/issues/389>`_)
2616 * Line-by-line interactive staging was made more robust.
2617 (`#399 <https://github.com/git-cola/git-cola/pull/399>`_)
2619 * "Bookmarks" was renamed to "Favorites".
2620 (`#392 <https://github.com/git-cola/git-cola/issues/392>`_)
2622 * Untracked files are now displayed using a unique icon.
2623 (`#388 <https://github.com/git-cola/git-cola/pull/388>`_)
2627 * `git dag` was triggering a traceback on Fedora when parsing Git logs.
2628 (`bz #181676 <https://bugzilla.redhat.com/show_bug.cgi?id=1181686>`_)
2630 * inotify expects Unicode paths on Python3.
2631 (`#393 <https://github.com/git-cola/git-cola/pull/393>`_)
2633 * Untracked files are now assumed to be UTF-8 encoded.
2634 (`#401 <https://github.com/git-cola/git-cola/issues/401>`_)
2641 Usability, bells and whistles
2642 -----------------------------
2643 * `git cola` can now create GPG-signed commits and merges.
2644 See the documentation for details about setting up a GPG agent.
2645 (`#149 <https://github.com/git-cola/git-cola/issues/149>`_)
2647 * The status widget learned to copy relative paths when `Ctrl+x` is pressed.
2648 (`#358 <https://github.com/git-cola/git-cola/issues/358>`_)
2650 * Custom GUI actions can now define their own keyboard shortcuts by
2651 setting `guitool.$name.shortcut` to a string understood by the Qt
2652 `QKeySequence` API, e.g. `Alt+X`.
2653 See the `Qt docs <https://doc.qt.io/qt-6/qkeysequence.html#toString>`_
2654 for more details about the supported values.
2656 * `git cola` learned to rename branches.
2657 (`#364 <https://github.com/git-cola/git-cola/pull/364>`_)
2658 (`#278 <https://github.com/git-cola/git-cola/issues/278>`_)
2660 * `git dag` now has a "Show history" context menu which can be used to filter
2661 history using the selected paths.
2665 * `sphinxtogithub.py` was fixed for Python3.
2666 (`#353 <https://github.com/git-cola/git-cola/pull/353>`_)
2668 * The commit that changed how we read remotes from `git remote`
2669 to parsing `git config` was reverted since it created problems
2672 * Fixed a crash when using the `rebase edit` feature.
2673 (`#351 <https://github.com/git-cola/git-cola/issues/351>`_)
2675 * Better drag-and-drop behavior when dropping into gnome-terminal.
2676 (`#373 <https://github.com/git-cola/git-cola/issues/373>`_)
2680 * The `git-cola-folder-handler.desktop` file handler was fixed
2681 to pass validation by `desktop-file-validate`.
2682 (`#356 <https://github.com/git-cola/git-cola/issues/356>`_)
2684 * The `git.svg` icon was renamed to `git-cola.svg`, and `git cola` was taught
2685 to prefer icons from the desktop theme when available.
2692 Usability, bells and whistles
2693 -----------------------------
2694 * New hotkey: `Ctrl+Shift+M` merges branches.
2696 * New hotkey: `Ctrl+R` refreshes the DAG viewer.
2697 (`#347 <https://github.com/git-cola/git-cola/issues/347>`_)
2701 * We now use `git config` to parse the list of remotes
2702 instead of parsing the output of `git remote`, which
2703 is a Git porcelain and should not be used by scripts.
2705 * Avoid "C++ object has been deleted" errors from PyQt4.
2706 (`#346 <https://github.com/git-cola/git-cola/issues/346>`_)
2710 * The `make install` target now uses `install` instead of `cp`.
2717 Usability, bells and whistles
2718 -----------------------------
2719 * Updated Brazilian Portuguese translation.
2721 * The status and browse widgets now allow drag-and-drop into
2722 external applications.
2723 (`#335 <https://github.com/git-cola/git-cola/issues/335>`_)
2725 * We now show a progress bar when cloning repositories.
2726 (`#312 <https://github.com/git-cola/git-cola/issues/312>`_)
2728 * The bookmarks widget was simplified to not need a
2730 (`#289 <https://github.com/git-cola/git-cola/issues/289>`_)
2732 * Updated Traditional Chinese translation.
2734 * We now display a warning when trying to rebase with uncommitted changes.
2735 (`#338 <https://github.com/git-cola/git-cola/issues/338>`_)
2737 * The status widget learned to filter paths.
2738 `Ctrl+Shift+S` toggles the filter widget.
2739 (`#337 <https://github.com/git-cola/git-cola/issues/337>`_)
2740 (`#339 <https://github.com/git-cola/git-cola/pull/339>`_)
2742 * The status widget learned to move files to the trash
2743 when the `send2trash <https://github.com/hsoft/send2trash>`_
2744 module is installed.
2745 (`#341 <https://github.com/git-cola/git-cola/issues/341>`_)
2747 * "Recent repositories" is now a dedicated widget.
2748 (`#342 <https://github.com/git-cola/git-cola/issues/342>`_)
2750 * New Spanish translation thanks to Pilar Molina Lopez.
2751 (`#344 <https://github.com/git-cola/git-cola/pull/344>`_)
2755 * Newly added remotes are now properly seen by the fetch/push/pull dialogs.
2756 (`#343 <https://github.com/git-cola/git-cola/issues/343>`_)
2763 Usability, bells and whistles
2764 -----------------------------
2765 * New Brazilian Portuguese translation thanks to Vitor Lobo.
2767 * New Indonesian translation thanks to Samsul Ma'arif.
2769 * Updated Simplified Chinese translation thanks to Zhang Han.
2771 * `Ctrl+Backspace` is now a hotkey for "delete untracked files" in
2774 * Fetch/Push/Pull dialogs now use the configured remote of the current
2776 (`#324 <https://github.com/git-cola/git-cola/pull/324>`_)
2780 * We now use `os.getcwd()` on Python3.
2781 (`#316 <https://github.com/git-cola/git-cola/pull/316>`_)
2782 (`#326 <https://github.com/git-cola/git-cola/pull/326>`_)
2784 * The `Ctrl+P` hotkey was overloaded to both "push" and "cherry-pick",
2785 so "cherry-pick" was moved to `Ctrl+Shift+C`.
2787 * Custom GUI tools with mixed-case names are now properly supported.
2789 * "Diff Region" is now referred to as "Diff Hunk" for consistency
2790 with common terminology from diff/patch tools.
2791 (`#328 <https://github.com/git-cola/git-cola/issues/328>`_)
2793 * git-cola's test suite is now portable to MS Windows.
2794 (`#332 <https://github.com/git-cola/git-cola/pull/332>`_)
2801 Usability, bells and whistles
2802 -----------------------------
2803 * We now handle the case when inotify `add_watch()` fails
2804 and display instructions on how to increase the number of watches.
2805 (`#263 <https://github.com/git-cola/git-cola/issues/263>`_)
2807 * New and improved zh_TW localization thanks to V字龍(Vdragon).
2808 (`#265 <https://github.com/git-cola/git-cola/pull/265>`_)
2809 (`#267 <https://github.com/git-cola/git-cola/pull/267>`_)
2810 (`#268 <https://github.com/git-cola/git-cola/pull/268>`_)
2811 (`#269 <https://github.com/git-cola/git-cola/issues/269>`_)
2812 (`#270 <https://github.com/git-cola/git-cola/pull/270>`_)
2813 (`#271 <https://github.com/git-cola/git-cola/pull/271>`_)
2814 (`#272 <https://github.com/git-cola/git-cola/pull/272>`_)
2816 * New hotkeys: `Ctrl+F` for fetch, `Ctrl+P` for push,
2817 and `Ctrl+Shift+P` for pull.
2819 * The bookmarks widget's context menu actions were made clearer.
2820 (`#281 <https://github.com/git-cola/git-cola/issues/281>`_)
2822 * The term "Staging Area" is used consistently in the UI
2823 to allow for better localization.
2824 (`#283 <https://github.com/git-cola/git-cola/issues/283>`_)
2826 * The "Section" term is now referred to as "Diff Region"
2828 (`#297 <https://github.com/git-cola/git-cola/issues/297>`_)
2830 * The localization documentation related to the LANGUAGE
2831 environment variable was improved.
2832 (`#293 <https://github.com/git-cola/git-cola/pull/293>`_)
2834 * The "Actions" panel now contains tooltips for each button
2835 in case the button labels gets truncated by Qt.
2836 (`#292 <https://github.com/git-cola/git-cola/issues/292>`_)
2838 * Custom `git config`-defined actions can now be run in the
2839 background by setting `guitool.<name>.background` to `true`.
2843 * We now use bold fonts instead of SmallCaps to avoid
2844 artifacts on several configurations.
2846 * We now pickup `user.email`, `cola.tabwidth`, and similar settings
2847 when defined in /etc/gitconfig.
2848 (`#259 <https://github.com/git-cola/git-cola/issues/259>`_)
2850 * Better support for Unicode paths when using inotify.
2851 (`bz #1104181 <https://bugzilla.redhat.com/show_bug.cgi?id=1104181>`_)
2853 * Unicode fixes for non-ASCII locales.
2854 (`#266 <https://github.com/git-cola/git-cola/issues/266>`_)
2855 (`#273 <https://github.com/git-cola/git-cola/issues/273>`_)
2856 (`#276 <https://github.com/git-cola/git-cola/issues/276>`_)
2857 (`#282 <https://github.com/git-cola/git-cola/issues/282>`_)
2858 (`#298 <https://github.com/git-cola/git-cola/issues/298>`_)
2859 (`#302 <https://github.com/git-cola/git-cola/issues/302>`_)
2860 (`#303 <https://github.com/git-cola/git-cola/issues/303>`_)
2861 (`#305 <https://github.com/git-cola/git-cola/issues/305>`_)
2863 * Viewing history from the file browser was fixed for Python3.
2864 (`#274 <https://github.com/git-cola/git-cola/issues/274>`_)
2866 * setup.py was fixed to install the `*.rst` documentation.
2867 (`#279 <https://github.com/git-cola/git-cola/issues/279>`_)
2869 * Patch export was fixed for Python3.
2870 (`#290 <https://github.com/git-cola/git-cola/issues/290>`_)
2872 * Fixed adding a bookmark with trailing slashes.
2873 (`#295 <https://github.com/git-cola/git-cola/pull/295>`_)
2875 * The default `git dag` layout is now setup so that its widgets
2876 can be freely resized on Linux.
2877 (`#299 <https://github.com/git-cola/git-cola/issues/299>`_)
2879 * Invalid tag names are now reported when creating tags.
2880 (`#296 <https://github.com/git-cola/git-cola/pull/296>`_)
2887 Usability, bells and whistles
2888 -----------------------------
2889 * `git cola` no longer prompts after successfully creating a new branch.
2890 (`#251 <https://github.com/git-cola/git-cola/pull/251>`_)
2892 * Hitting enter on simple dialogs now accepts them.
2893 (`#255 <https://github.com/git-cola/git-cola/pull/255>`_)
2897 * `git dag` no longer relies on `sys.maxint`, which is
2898 not available in Python3.
2899 (`#249 <https://github.com/git-cola/git-cola/issues/249>`_)
2901 * Python3-related fixes.
2902 (`#254 <https://github.com/git-cola/git-cola/pull/254>`_)
2904 * Python3-on-Windows-related fixes.
2905 (`#250 <https://github.com/git-cola/git-cola/pull/250>`_)
2906 (`#252 <https://github.com/git-cola/git-cola/pull/252>`_)
2907 (`#253 <https://github.com/git-cola/git-cola/pull/253>`_)
2909 * Switching repositories using the bookmarks widget was not
2910 refreshing the inotify watcher.
2911 (`#256 <https://github.com/git-cola/git-cola/pull/256>`_)
2913 * Special commit messages trailers (e.g. "Acked-by:") are now special-cased to
2914 fix word wrapping lines that start with "foo:".
2915 (`#257 <https://github.com/git-cola/git-cola/issues/257>`_)
2917 * `git dag` sometimes left behind selection artifacts.
2918 We now refresh the view to avoid them.
2919 (`#204 <https://github.com/git-cola/git-cola/issues/204>`_)
2926 Usability, bells and whistles
2927 -----------------------------
2928 * Better inotify support for file creation and deletion.
2929 (`#240 <https://github.com/git-cola/git-cola/issues/240>`_)
2931 * `git cola` now supports the X11 Session Management Protocol
2932 and remembers its state across logout/reboot.
2933 (`#164 <https://github.com/git-cola/git-cola/issues/164>`_)
2935 * `git cola` has a new icon.
2936 (`#190 <https://github.com/git-cola/git-cola/issues/190>`_)
2940 * Building the documentation no longer requires `asciidoc`.
2941 We now use `Sphinx <https://www.sphinx-doc.org>`_ for building
2942 html documentation and man pages.
2946 * Reworked the git-dag gravatar icon code to avoid a Unicode
2949 * Commit message line-wrapping was made to better match the GUI editor.
2950 (`#242 <https://github.com/git-cola/git-cola/issues/242>`_)
2952 * Better support for Python3 on Windows
2953 (`#246 <https://github.com/git-cola/git-cola/issues/246>`_)
2957 * git-cola no longer depends on Asciidoc for building its documentation
2958 and man-pages. We now depend on [Sphinx](https://www.sphinx-doc.org) only.
2965 Usability, bells and whistles
2966 -----------------------------
2967 * Some context menu actions are now hidden when selected
2969 (`#238 <https://github.com/git-cola/git-cola/issues/238>`_)
2973 * The build-git-cola.sh contrib script was improved.
2974 (`#235 <https://github.com/git-cola/git-cola/pull/235>`_)
2976 * Non-ASCII worktrees work properly again.
2977 (`#234 <https://github.com/git-cola/git-cola/issues/234>`_)
2979 * The browser now guards itself against missing files.
2980 (`bz #1041378 <https://bugzilla.redhat.com/show_bug.cgi?id=1071378>`_)
2982 * Saving widget state now works under Python3.
2983 (`#236 <https://github.com/git-cola/git-cola/pull/236>`_)
2992 * git-cola now runs on Python 3 thanks to Virgil Dupras.
2993 (`#233 <https://github.com/git-cola/git-cola/pull/233>`_)
2995 * Python 2.6, 2.7, and 3.2+ are now supported.
2996 Python 2.5 is no longer supported.
3000 * i18n test fixes thanks to Virgil Dupras.
3001 (`#231 <https://github.com/git-cola/git-cola/pull/231>`_)
3003 * git-cola.app build fixes thanks to Maicon D. Filippsen.
3004 (`#230 <https://github.com/git-cola/git-cola/pull/230>`_)
3006 * Lots of pylint improvements thanks to Alex Chernetz.
3007 (`#229 <https://github.com/git-cola/git-cola/pull/229>`_)
3014 Usability, bells and whistles
3015 -----------------------------
3016 * The new `Bookmarks` tool makes it really easy to switch between repositories.
3018 * There is now a dedicated dialog for applying patches.
3019 See the ``File -> Apply Patches`` menu item.
3020 (`#215 <https://github.com/git-cola/git-cola/issues/215>`_)
3022 * A new `git cola am` sub-command was added for applying patches.
3026 * Fixed a typo that caused inotify events to be silently ignored.
3028 * Fixed the sys.path setup for Mac OS X (Homebrew).
3029 (`#221 <https://github.com/git-cola/git-cola/issues/221>`_)
3031 * Lots of pylint fixes thanks to Alex Chernetz.
3038 Usability, bells and whistles
3039 -----------------------------
3040 * `git cola --amend` now starts the editor in `amend` mode.
3041 (`#187 <https://github.com/git-cola/git-cola/issues/187>`_)
3043 * Multiple lines of text can now be pasted into the `summary` field.
3044 All text beyond the first newline will be automatically moved to the
3045 `extended description` field.
3046 (`#212 <https://github.com/git-cola/git-cola/issues/212>`_)
3050 * Stray whitespace in `.git` files is now ignored.
3051 (`#213 <https://github.com/git-cola/git-cola/issues/213>`_)
3053 * Fix "known incorrect sRGB profile" in `staged-item.png`.
3054 (`gentoo-devel message #85066
3055 <https://web.archive.org/web/20141012075946/http://comments.gmane.org:80/gmane.linux.gentoo.devel/85066>`_)
3064 * Fix a traceback when `git push` fails.
3065 (`bz #1034778 <https://bugzilla.redhat.com/show_bug.cgi?id=1034778>`_)
3069 * Most of the git-cola sub-packages have been removed.
3070 The only remaining packages are `cola`, `cola.models`,
3073 * The translation file for Simplified Chinese was renamed
3075 (`#209 <https://github.com/git-cola/git-cola/issues/209>`_)
3084 * `git cola version --brief` now prints the brief version number.
3088 * Resurrected the "make dist" target, for those that prefer to create
3091 * Fixed the typo that broke the preferences dialog.
3098 Usability, bells and whistles
3099 -----------------------------
3100 * We now ship a full-featured interactive `git rebase` editor.
3101 The rebase todo file is edited using the `git xbase` script which
3102 is provided at `$prefix/share/git-cola/bin/git-xbase`.
3103 This script can be used standalone by setting the `$GIT_SEQUENCE_EDITOR`
3104 before running `git rebase --interactive`.
3105 (`#1 <https://github.com/git-cola/git-cola/issues/1>`_)
3107 * Fixup commit messages can now be loaded from the commit message editor.
3109 * Tool widgets can be locked in place by using the "Tools/Lock Layout"
3111 (`#202 <https://github.com/git-cola/git-cola/issues/202>`_)
3113 * You can now push to several remotes simultaneously by selecting
3114 multiple remotes in the "Push" dialog.
3115 (`#148 <https://github.com/git-cola/git-cola/issues/148>`_)
3117 * The `grep` tool learned to search using three different modes:
3118 basic regular expressions (default), extended regular expressions,
3123 * `git cola` now depends on the `argparse` Python module.
3124 This module is part of the stdlib in Python 2.7 and must
3125 be installed separately when using Python 2.6 and below.
3129 * Support Unicode in the output from `fetch`, `push`, and `pull`.
3136 Usability, bells and whistles
3137 -----------------------------
3138 * We now detect when the editor or history browser are misconfigured.
3139 (`#197 <https://github.com/git-cola/git-cola/issues/197>`_)
3140 (`bz #886826 <https://bugzilla.redhat.com/show_bug.cgi?id=886826>`_)
3142 * Display of untracked files can be disabled from the Preferences dialog
3143 or by setting the `gui.displayuntracked` configuration variable to `false`.
3144 (`Git Mailing List on 2013-08-21
3145 <https://public-inbox.org/git/20130821032913.GA6092@wheezy.local/>`_)
3149 * Unicode stash names are now supported
3150 (`#198 <https://github.com/git-cola/git-cola/issues/198>`_)
3152 * The diffs produced when reverting workspace changes were made more robust.
3159 Usability, bells and whistles
3160 -----------------------------
3161 * Brand new German translation thanks to Sven Claussner.
3163 * The "File" menu now provides a "New Repository..." menu action.
3165 * `git dag` now uses a dock-widget interface so that its widgets can
3166 be laid-out and arranged. Customizations are saved and restored
3167 the next time `git dag` is launched.
3169 * `git dag` now has a "Zoom Best Fit" button next alongside the
3170 "Zoom In" and "Zoom Out" buttons.
3172 * `Ctrl+L` now focuses the "Search" field in the `git dag` tool.
3174 * Right-clicking in the "diff" viewer now updates the cursor position
3175 before performing actions, which makes it much easier to click around
3176 and selectively stage sections. Previously, the current cursor position
3177 was used which meant that it required two clicks (left-click to update
3178 the position followed by right-click to get the context menu) for the
3179 desired section to be used. This is now a single right-click operation.
3181 * The `Ctrl+D` "Launch Diff Tool" action learned to automatically choose
3182 between `git difftool` and `git mergetool`. If the file is unmerged then
3183 we automatically launch `git mergetool` on the path, otherwise we use
3184 `git difftool`. We do this because `git difftool` is not intended to
3185 be used on unmerged paths. Automatically using `git mergetool` when
3186 appropriate is the most intuitive and muscle-memory-friendly thing to do.
3188 * You can now right-click on folders in your standard file browser
3189 and choose "Open With -> Git Cola" (Linux-only).
3193 * Python 2.6 on Mac OS X Snow Leopard does not provide a namedtuple
3194 at `sys.version_info`. We now avoid using that variable for better
3197 * We now read the user's Git configuration from `~/.config/git/config`
3198 if that file is available, otherwise we use the traditional `~/.gitconfig`
3199 path, just like Git itself.
3201 * Some edge cases were fixed when applying partial/selected diffs.
3203 * The diff viewer is now properly cleared when refreshing.
3204 (`#194 <https://github.com/git-cola/git-cola/issues/194>`_)
3211 Usability, bells and whistles
3212 -----------------------------
3213 * The diff viewer now has an "Options" menu which can be
3214 used to set "git diff" options. This can be used to
3215 ignore whitespace changes or to show a change with its
3216 surrounding function as context.
3217 (`#150 <https://github.com/git-cola/git-cola/issues/150>`_)
3219 * `git cola` now remembers your commit message and will restore it
3220 when `git cola` is restarted.
3221 (`#175 <https://github.com/git-cola/git-cola/pull/175>`_)
3223 * `Ctrl+M` can now be used to toggle the "Amend last commit"
3224 checkbox in the commit message editor.
3225 (`#161 <https://github.com/git-cola/git-cola/pull/161>`_)
3227 * Deleting remote branches can now be done from the "Branch" menu.
3228 (`#152 <https://github.com/git-cola/git-cola/issues/152>`_)
3230 * The commit message editor now has a built-in spell checker.
3234 * We now avoid invoking external diffs when showing diffstats.
3235 (`#163 <https://github.com/git-cola/git-cola/pull/163>`_)
3237 * The `Status` tool learned to reselect files when refreshing.
3238 (`#165 <https://github.com/git-cola/git-cola/issues/165>`_)
3240 * `git cola` now remembers whether it has been maximized and will restore the
3241 maximized state when `git cola` is restarted.
3242 (`#172 <https://github.com/git-cola/git-cola/issues/172>`_)
3244 * Performance is now vastly improved when staging hundreds or
3247 * `git cola` was not correctly saving repo-specific configuration.
3248 (`#174 <https://github.com/git-cola/git-cola/issues/174>`_)
3250 * Fix a UnicodeDecode in sphinxtogithub when building from source.
3258 Usability, bells and whistles
3259 -----------------------------
3260 * We now automatically remove missing repositories from the
3261 "Select Repository" dialog.
3262 (`#145 <https://github.com/git-cola/git-cola/issues/145>`_)
3264 * A new `git cola diff` sub-command was added for diffing changed files.
3268 * The inotify auto-refresh feature makes it difficult to select text in
3269 the "diff" editor when files are being continually modified by another
3270 process. The auto-refresh causes it to lose the currently selected text,
3271 which is not wanted. We now avoid this problem by saving and restoring
3272 the selection when refreshing the editor.
3273 (`#155 <https://github.com/git-cola/git-cola/issues/155>`_)
3275 * More strings have been marked for l10n.
3276 (`#157 <https://github.com/git-cola/git-cola/issues/157>`_)
3278 * Fixed the Alt+D Diffstat shortcut.
3279 (`#159 <https://github.com/git-cola/git-cola/issues/159>`_)
3283 * Better error handling when cloning repositories.
3285 We were not handling the case where a git URL has
3286 no basename, e.g. `https://git.example.com/`.
3287 `git cola` originally rejected these URLs instead of
3288 allowing users to clone them. It now allows these URLs
3289 when they point to valid git repositories.
3291 Additionally, `git cola` learned to echo the errors
3292 reported by `git clone` when it fails.
3293 (`#156 <https://github.com/git-cola/git-cola/issues/156>`_)
3301 Usability, bells and whistles
3302 -----------------------------
3303 * `git dag` got a big visual upgrade.
3305 * `Ctrl+G` now launches the "Grep" tool.
3307 * `Ctrl+D` launches difftool and `Ctrl+E` launches your editor
3308 when in the diff panel.
3310 * git-cola can now be told to use an alternative language.
3311 For example, if the native language is German and we want git-cola to
3312 use English then we can create a `~/.config/git-cola/language` file with
3313 "en" as its contents: ``echo en >~/.config/git-cola/language``
3314 (`#140 <https://github.com/git-cola/git-cola/issues/140>`_)
3316 * A new `git cola merge` sub-command was added for merging branches.
3318 * Less blocking in the main UI
3322 * Autocomplete issues on KDE
3323 (`#144 <https://github.com/git-cola/git-cola/issues/144>`_)
3325 * The "recently opened repositories" startup dialog did not
3326 display itself in the absence of bookmarks.
3327 (`#139 <https://github.com/git-cola/git-cola/issues/139>`_)
3335 Usability, bells and whistles
3336 -----------------------------
3337 * `git cola` learned to honor `.gitattributes` when showing and
3338 interactively applying diffs. This makes it possible to store
3339 files in git using a non-UTF-8 encoding and `git cola` will
3340 properly accept them. This must be enabled by settings
3341 `cola.fileattributes` to true, as it incurs a small performance
3343 (`#96 <https://github.com/git-cola/git-cola/issues/96>`_)
3345 * `git cola` now wraps commit messages at 72 columns automatically.
3346 This is configurable using the `cola.linebreak` variable to enable/disable
3347 the feature, and `cola.textwidth` to configure the limit.
3348 (`#133 <https://github.com/git-cola/git-cola/pull/133>`_)
3350 * A new "Open Recent" sub-menu was added to the "File" menu.
3351 This makes it easy to open a recently-edited repository.
3352 (`#135 <https://github.com/git-cola/git-cola/issues/135>`_)
3354 * We now show a preview for untracked files when they are clicked
3355 using the `Status` tool.
3356 * A new "Open Using Default Application" action was added to the
3357 `Status` tool. It is activated using either `Spacebar` or through
3358 the context menu. This action uses `xdg-open` on Linux and
3360 * A new "Open Parent Directory" action was added to the `Status` tool.
3361 It is activated using either `Shift+Spacebar` or through the
3363 * `git dag` learned to honor the `log.date` git configuration variable.
3364 This makes the date display follow whatever format the user has
3366 * A new `git cola config` sub-command was added for quickly
3367 tweaking `git cola`'s git configuration settings.
3368 * Some small usability tweaks -- some user confirmation prompts
3369 were defaulting to "Cancel" when they should have been defaulting
3370 to the affirmative option instead.
3374 * Properly handle arbitrarily-named branches.
3375 * We went back to launching `git mergetool` using an xterm.
3376 The reason is that there are a couple of places where `git mergetool`
3377 requires a terminal for user interaction not covered by `--no-prompt`.
3378 * We now properly handle an edge case when applying short diffs at
3379 the start of a file.
3387 Usability, bells and whistles
3388 -----------------------------
3389 * New and improved `grep` mode lets you instantly find and edit files.
3390 * New `git cola grep` standalone mode.
3391 * Support for passing arguments to the configured editors, e.g. `gvim -p`
3392 This makes it possible to select multiple files in the status
3393 window and use `Ctrl + E` to edit them all at once.
3394 * Remote operations now prompt on errors only.
3395 * The `Tab` key now jumps to the extended description when editing the summary.
3396 * More shortcut key labels and misc. UX improvements.
3400 * Selecting an item no longer copies its filename to the copy/paste buffer.
3401 `Ctrl + C` or the "Copy" context-menu action can be used instead.
3402 * The repository monitoring feature on Windows learned to ignore
3403 changes within the ".git" directory. Thanks to Andreas Sommer.
3404 (`#120 <https://github.com/git-cola/git-cola/issues/120>`_)
3412 Usability, bells and whistles
3413 -----------------------------
3414 * `git dag` learned to color-code branch edges.
3415 The edge colors change when a new branch is detected,
3416 which makes the history much easier to follow.
3417 A huge thanks to Uri Okrent for making it happen.
3419 * New GUI for editing remote repositories.
3421 * New `git cola archive` and `git cola remote` sub-commands.
3423 * `git cola browser` learned an 'Untrack' command.
3425 * The diff editor learned to staged/unstaged while amending.
3427 * The status tool can now scroll horizontally.
3429 * New git repositories can be created by clicking 'New' on the
3430 `git cola --prompt` startup screen.
3438 Usability, bells and whistles
3439 -----------------------------
3440 * Auto-completion was added to more tools.
3442 * `git dag` is easier to use on smaller displays -- the author
3443 field elides its text which allows for a more compact display.
3445 * Selected commits in `git dag` were made more prominent and
3448 * 'Create Branch' learned to fetch remote branches and uses a
3449 background thread to do so.
3451 * User-configured GUI tools are listed alphabetically in the 'Actions' menu.
3453 * The 'Pull' dialog remembers the value of the 'Rebase' checkbox
3454 between invocations.
3464 * Detect Homebrew so that OS X users do not need to set PYTHONPATH.
3466 * `git dag` can export patches again.
3474 Usability, bells and whistles
3475 -----------------------------
3476 * The 'Classic' tool was renamed to 'Browser' and learned to
3477 limit history to the current branch.
3479 * `git dag` learned about gravatar and uses it to show images
3482 * `git dag` learned to use OpenGL for rendering resulting in
3483 much faster rendering.
3485 * More dialogs learned vim-style keyboard shortcuts.
3487 * The commit message editor learned better arrow key navigation.
3495 Usability, bells and whistles
3496 -----------------------------
3497 * `git cola` learned a few new sub commands:
3505 * `Return` in the summary field jumps to the extended description.
3507 * `Ctrl+Return` is now a shortcut for 'Commit'.
3509 * Better French translation for 'Sign-off'.
3511 * The 'Search' widget now has a much simpler and streamlined
3514 * vim-style `h,j,k,l` navigation shortcuts were added to the DAG widget.
3516 * `git dag` no longer prompts for files when diffing commits if the
3517 text field contains paths.
3519 * General user interface and performance improvements.
3523 * The diff viewer no longer changes font size when holding `Control`
3524 while scrolling with the mouse wheel.
3526 * Files with a type change (e.g. symlinks that become files, etc.)
3527 are now correctly identified as being modified.
3531 * The `cola.controllers` and `cola.views` packages were removed.
3539 Usability, bells and whistles
3540 -----------------------------
3541 * `git cola` can now launch sub commands, e.g.:
3552 * `git dag` is more responsive when gathering auto-completions.
3554 * Keyboard shortcuts are displayed when the '?' key is pressed.
3556 * Various keyboard shortcuts were added for improved usability.
3558 * The status widget now lists unmerged files before modified files.
3560 * vim-style `h,j,k,l` navigation shortcuts were added to the status widget.
3562 * A 'Recently Modified Files...' tool was added.
3564 * Tools can now be hidden with `Alt + #` (where `#` is a keyboard number)
3565 and focused with `Alt + Shift + #`.
3567 * The syntax highlighting colors for diffs was made less intrusive.
3569 * The commit message editor was redesigned to have a more compact
3570 and keyboard-convenient user interface.
3572 * Keyboard shortcuts for adding a Signed-off-by (`Ctrl + i`)
3573 and creating a commit (`Ctrl + m`) were added.
3575 * The status widget was adjusted to use less screen real-estate.
3579 * Avoid updating the index when responding to inotify events.
3580 This avoids interfering with operations such as `git rebase --interactive`.
3581 (`#99 <https://github.com/git-cola/git-cola/issues/99>`_)
3585 * Create `git-dag.pyw` in the win32 installer.
3587 * win32 shortcuts now contain explicit calls to `pythonw.exe` instead of
3588 calling the `.pyw` file directly.
3592 * The 'Apply Changes from Branch...' feature was removed.
3593 `git dag`'s 'Grab File...' feature used alongside the index/worktree editor
3594 is a simpler alternative.
3604 * Further enhanced the staging/unstaging behavior in the status widget.
3605 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
3607 * Unmerged files are no longer listed as modified.
3611 The `cola-$version` tarballs on github were originally setup to
3612 have the same contents as the old tarballs hosted on tuxfamily.
3613 The `make dist` target was changed to write files to a
3614 `git-cola-$version` subdirectory and tarball.
3616 This makes the filenames consistent for the source tarball,
3617 the darwin .app tarball, and the win32 .exe installer.
3625 Usability, bells and whistles
3626 -----------------------------
3627 * Refined the staging/unstaging behavior for code reviews.
3628 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
3630 * Added more styling and icons to menus and buttons.
3632 * Adjusted some terminology to more closely match the git CLI.
3636 * Boolean `git config` settings with no value are now supported
3637 (these are not created by git these days but exist in legacy repositories).
3639 * Unicode branches and tags are supported in the "branch diff" tool.
3641 * Guard against low-memory conditions and more interrupted system calls.
3645 * Added desktop launchers for git-cola.desktop and git-dag.desktop.
3646 This replaces the old cola.desktop, so some adjustments to RPM .spec
3647 and debian/ files will be needed.
3649 * Fixed the darwin app-tarball Makefile target to create relative paths.
3653 * The `--style` option was removed. `git cola` follows the system theme
3654 so there's no need for this option these days.
3662 Usability, bells and whistles
3663 -----------------------------
3664 * Export a patch series from `git dag` into a `patches/` directory.
3666 * `git dag` learned to diff commits, slice history along paths, etc.
3668 * Added instant-preview to the `git stash` widget.
3670 * A simpler preferences editor is used to edit `git config` values.
3671 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
3672 (`#89 <https://github.com/git-cola/git-cola/issues/89>`_)
3674 * Previous commit messages can be re-loaded from the message editor.
3675 (`#33 <https://github.com/git-cola/git-cola/issues/33>`_)
3679 * Display commits with no file changes.
3680 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
3682 * Improved the diff editor's copy/paste behavior
3683 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
3687 * Bumped version number to ceil(minimum git version).
3688 `git cola` now requires `git` >= 1.6.3.
3690 * Simplified git-cola's versioning when building from tarballs
3691 outside of git. We no longer check for a 'version' file at
3692 the root of the repository. We instead keep a default version
3693 in `cola/version.py` and use it when `git cola`'s `.git` repository
3702 Usability, bells and whistles
3703 -----------------------------
3704 * inotify is much snappier and available on Windows
3705 thanks to Karl Bielefeldt.
3707 * New right-click command to add untracked files to .gitignore
3708 thanks to Audrius Karabanovas.
3710 * Stash, fetch, push, and pull usability improvements
3712 * General usability improvements
3714 * stderr is logged when applying partial diffs.
3718 * Files can be unstaged when amending.
3719 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
3721 * Show the configured remote.$remote.pushurl in the GUI
3722 (`#83 <https://github.com/git-cola/git-cola/issues/83>`_)
3724 * Removed usage of the "user" module.
3725 (`#86 <https://github.com/git-cola/git-cola/issues/86>`_)
3727 * Avoids an extra `git update-index` call during startup.
3735 Usability, bells and whistles
3736 -----------------------------
3737 * We now provide better feedback when `git push` fails.
3738 (`#69 <https://github.com/git-cola/git-cola/issues/69>`_)
3740 * The Fetch, Push, and Pull dialogs now give better feedback
3741 when interacting with remotes. The dialogs are modal and
3742 a progress dialog is used.
3746 * More Unicode fixes, again. It is now possible to have
3747 Unicode branch names, repository paths, home directories, etc.
3748 This continued the work initiated by Redhat's bugzilla #694806.
3750 https://bugzilla.redhat.com/show_bug.cgi?id=694806
3758 Usability, bells and whistles
3759 -----------------------------
3760 * The `git cola` desktop launchers now prompt for a repo
3761 by default. This is done by using the new `--prompt`
3762 flag which tells `git cola` to ignore any git repositories
3763 in the current directory and prompt for one instead.
3767 * More Unicode fixes for repositories and home directories with
3768 embedded Unicode characters. Thanks to Christian Jann for
3769 patience and helpful bug reports.
3771 * Fix the 'Clone' button in the startup dialog.
3779 Usability, bells and whistles
3780 -----------------------------
3781 * Faster startup time! `git cola` now offloads initialization
3782 to a background thread so that the GUI appears almost instantly.
3784 * Specialized diff options for p4merge, vimdiff, araxis, emerge,
3785 and ecmerge in difftool (backported from git.git).
3789 * Fix launching commands in the background on Windows
3790 (e.g. when launching `git difftool`).
3792 * Fix Unicode errors when home or repository directories contain
3794 (`#74 <https://github.com/git-cola/git-cola/issues/74>`_)
3795 (`bz #694806 <https://bugzilla.redhat.com/show_bug.cgi?id=694806>`_)
3803 Usability, bells and whistles
3804 -----------------------------
3805 * The `cola classic` tool can be now configured to be dock-able.
3806 (`#56 <https://github.com/git-cola/git-cola/issues/56>`_)
3808 * The `cola classic` tool now uses visual sigils to indicate a file's status.
3809 The idea and icons were provided by Uri Okrent.
3811 * Include the 'Rescan' button in the 'Actions' widget regardless
3812 of whether inotify is installed.
3816 * Fix installation of translations per Fedora
3817 This incorporates Fedora's fix for the translations path
3818 which originally appeared in cola-1.4.3-translations.patch.
3820 * Mac OS X git-cola developers can now generate git-cola.app
3821 application bundles using 'make app-bundle'.
3825 * Fixed an error when trying to use "Get Commit Message Template"
3826 with an undefined "commit.template" git config variable.
3827 (`bz #67521 <https://bugzilla.redhat.com/show_bug.cgi?id=675721>`_)
3828 (`#72 <https://github.com/git-cola/git-cola/issues/72>`_)
3830 * Properly raise the main window on Mac OS X.
3832 * Properly handle staging a huge numbers of files at once.
3834 * Speed up 'git config' usage by fixing cola's caching proxy.
3836 * Guard against damaged ~/.cola files.
3844 Usability, bells and whistles
3845 -----------------------------
3846 * `git dag` now has a separate display area
3847 for displaying commit metadata. This area will soon
3848 grow additional functionality such as cherry-picking,
3853 * Fixed tests from a previous refactoring.
3855 * Guard against 'diff.external' configuration by always
3856 calling 'git diff' with the '--no-ext-diff' option.
3857 (`#67 <https://github.com/git-cola/git-cola/issues/67>`_)
3859 * Respect 'gui.diffcontext' so that cola's diff display
3860 shows the correct number of context lines.
3862 * Raise the GUI so that it is in the foreground on OS X.
3866 * We now allow distutils to rewrite cola's shebang line.
3867 This allows us to run on systems where "which python"
3868 is Python3k. This is exposed by setting the `PYTHON`
3869 Makefile variable to the location of python2.x.
3871 * git-cola.app is now a tiny download because it no longer
3872 contains Qt and PyQt. These libraries are provided as a
3881 Usability, bells and whistles
3882 -----------------------------
3883 * Clicking on paths in the status widget copies them into the
3884 copy/paste buffer for easy middle-clicking into terminals.
3886 * `Ctrl+C` in diff viewer copies the selected diff to the clipboard.
3890 * Fixed the disappearing actions buttons on PyQt 4.7.4
3891 as reported by Arch and Ubuntu 10.10.
3892 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3894 * Fixed mouse interaction with the status widget where some
3895 items could not be de-selected.
3899 * Removed hard-coded reference to lib/ when calculating Python's
3900 site-packages directory.
3908 Usability, bells and whistles
3909 -----------------------------
3910 * Removed "single-click to (un)stage" in the status view.
3911 This is a usability improvement since we no longer perform
3912 different actions depending on where a row is clicked.
3914 * Added ability to create unsigned, annotated tags.
3918 * Updated documentation to use `cola.git` instead of `cola.gitcmd`.
3926 Usability, bells and whistles
3927 -----------------------------
3928 * Allow un/staging by right-clicking top-level items
3929 (`#57 <https://github.com/git-cola/git-cola/issues/57>`_)
3931 * Running 'commit' with no staged changes prompts to allow
3933 (`#55 <https://github.com/git-cola/git-cola/issues/55>`_)
3935 * Fetch, Push, and Pull are now available via the menus
3936 (`#58 <https://github.com/git-cola/git-cola/issues/58>`_)
3940 * Simplified the actions widget to work around a regression
3942 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3950 Usability, bells and whistles
3951 -----------------------------
3952 * `git dag` interaction was made faster.
3956 * Added '...' indicators to the buttons for
3957 'Fetch...', 'Push...', 'Pull...', and 'Stash...'.
3958 (`#51 <https://github.com/git-cola/git-cola/issues/51>`_)
3960 * Fixed a hang-on-exit bug in the cola-provided
3961 'ssh-askpass' implementation.
3969 Usability, bells and whistles
3970 -----------------------------
3971 * Staging and unstaging is faster.
3972 (`#48 <https://github.com/git-cola/git-cola/issues/48>`_)
3974 * `git dag` reads history in a background thread.
3978 * Added `cola.compat.hashlib` for `Python 2.4` compatibility
3979 * Improved `PyQt 4.1.x` compatibility.
3983 * Configured menu actions use ``sh -c`` for Windows portability.
3991 Usability, bells and whistles
3992 -----------------------------
3993 * Added support for the configurable ``guitool.<tool>.*``
3994 actions as described in the ``git config`` documentation.
3995 (`git-config(1) <https://git-scm.com/docs/git-config>`_)
3996 (`#44 <https://github.com/git-cola/git-cola/issues/44>`_)
3998 This makes it possible to add new actions to `git cola`
3999 by simply editing ``~/.gitconfig``. This implements the
4000 same guitool support as `git gui`.
4002 * Introduced a stat cache to speed up `git config` and
4003 repository status checks.
4005 * Added Alt-key shortcuts to the main `git cola` interface.
4007 * The `Actions` dock widget switches between a horizontal
4008 and vertical layout when resized.
4010 * We now use ``git diff --submodule`` for submodules
4011 (used when git >= 1.6.6).
4013 * The context menu for modified submodules includes an option
4014 to launch `git cola`.
4015 (`#17 <https://github.com/git-cola/git-cola/issues/17>`_)
4017 * Prefer ``$VISUAL`` over ``$EDITOR`` when both are defined.
4018 These are used to set a default editor in lieu of `core.editor`
4021 * Force the editor to be ``gvim`` when we see ``vim``.
4022 This prevents us from launching an editor in the (typically
4023 unattached) parent terminal and creating zombie editors
4024 that cannot be easily killed.
4026 * Selections are remembered and restored across updates.
4027 This makes the `partial-staging` workflow easier since the
4028 diff view will show the updated diff after staging.
4030 * Show the path to the current repository in a tooltip
4031 over the commit message editor.
4032 (`#45 <https://github.com/git-cola/git-cola/issues/45>`_)
4034 * Log internal ``git`` commands when ``GIT_COLA_TRACE`` is defined.
4035 (`#39 <https://github.com/git-cola/git-cola/issues/39>`_)
4039 * Improved backwards compatibility for Python 2.4.
4041 * `Review mode` can now review the current branch; it no longer
4042 requires you to checkout the branch into which the reviewed
4043 branch will be merged.
4045 * Guard against `color.ui = always` configuration when using
4046 `git log` by passing ``--no-color``.
4048 * ``yes`` and ``no`` are now supported as valid booleans
4049 by the `git config` parser.
4051 * Better defaults are used for `fetch`, `push`, and `pull`..
4052 (`#43 <https://github.com/git-cola/git-cola/issues/43>`_)
4056 * Removed colon (`:`) from the application name on Windows
4057 (`#41 <https://github.com/git-cola/git-cola/issues/41>`_)
4059 * Fixed bugs with the Windows installer
4060 (`#40 <https://github.com/git-cola/git-cola/issues/40>`_)
4062 * Added a more standard i18n infrastructure. The install
4063 tree now has the common ``share/locale/$lang/LC_MESSAGES/git-cola.mo``
4064 layout in use by several projects.
4066 * Started trying to accommodate Mac OS X 10.6 (Snow Leopard)
4067 in the ``darwin/`` build scripts but our tester is yet to
4068 report success building a `.app` bundle.
4070 * Replaced use of ``perl`` in Sphinx/documentation Makefile
4071 with more-portable ``sed`` constructs. Thanks to
4072 Stefan Naewe for discovering the portability issues and
4073 providing msysgit-friendly patches.
4081 Usability, bells and whistles
4082 -----------------------------
4083 * It is now possible to checkout from the index as well
4084 as from `HEAD`. This corresponds to the
4085 `Removed Unstaged Changes` action in the `Repository Status` tool.
4087 * The `remote` dialogs (fetch, push, pull) are now slightly
4090 * Bookmarks can be selected when `git cola` is run outside of a git repository.
4092 * Added more user documentation. We now include many links to
4093 external git resources.
4095 * Added `git dag` to the available tools.
4096 `git dag` is a node-based DAG history browser.
4097 It doesn't do much yet, but it's been merged so that we can start
4098 building and improving upon it.
4102 * Fixed a missing ``import`` when showing `right-click` actions
4103 for unmerged files in the `Repository Status` tool.
4105 * ``git update-index --refresh`` is no longer run every time
4106 ``git cola version`` is run.
4108 * Don't try to watch non-existent directories when using `inotify`.
4110 * Use ``git rev-parse --symbolic-full-name`` plumbing to find
4111 the name of the current branch.
4115 * The ``Makefile`` will now conditionally include a ``config.mak``
4116 file located at the root of the project. This allows for user
4117 customizations such as changes to the `prefix` variable
4118 to be stored in a file so that custom settings do not need to
4119 be specified every time on the command-line.
4121 * The build scripts no longer require a ``.git`` directory to
4122 generate the ``builtin_version.py`` module. The release tarballs
4123 now include a ``version`` file at the root of the project which
4124 is used in lieu of having the git repository available.
4125 This allows for ``make clean && make`` to function outside of
4128 * Added maintainer's ``make dist`` target to the ``Makefile``.
4130 * The built-in `simplejson` and `jsonpickle` libraries can be
4131 excluded from ``make install`` by specifying the ``standalone=true``
4132 `make` variable. For example, ``make standalone=true install``.
4133 This corresponds to the ``--standalone`` option to ``setup.py``.
4141 Usability, bells and whistles
4142 -----------------------------
4143 * We now use patience diff by default when it is available via
4144 `git diff --patience`.
4146 * Allow closing the `cola classic` tool with `Ctrl+W`.
4150 * Fixed an unbound variable error in the `push` dialog.
4154 * Don't include `simplejson` in MANIFEST.in.
4156 * Update desktop entry to read `Cola Git GUI`.
4164 This feature release adds two new features directly from
4165 `git cola`'s github issues backlog. On the developer
4166 front, further work was done towards modularizing the code base.
4168 Usability, bells and whistles
4169 -----------------------------
4170 * Dragging and dropping patches invokes `git am`
4171 (`#3 <https://github.com/git-cola/git-cola/issues/3>`_)
4173 * A dialog to allow opening or cloning a repository
4174 is presented when `git cola` is launched outside of a git repository.
4175 (`#22 <https://github.com/git-cola/git-cola/issues/22>`_)
4177 * Warn when `push` is used to create a new branch
4178 (`#35 <https://github.com/git-cola/git-cola/issues/35>`_)
4180 * Optimized startup time by removing several calls to `git`.
4185 * `git cola` is once again compatible with PyQt 4.3.x.
4189 * `cola.gitcmds` was added to factor out git command-line utilities
4191 * `cola.gitcfg` was added for interacting with `git config`
4193 * `cola.models.browser` was added to factor out repo browser data
4205 * Fix launching external applications on Windows
4207 * Ensure that the `amend` checkbox is unchecked when switching modes
4209 * Update the status tree when amending commits
4219 * Fix Lintian warnings
4229 * Fix X11 warnings on application startup
4239 * Added missing 'Exit Diff Mode' button for 'Diff Expression' mode
4240 (`#31 <https://github.com/git-cola/git-cola/issues/31>`_)
4242 * Fix a bug when initializing fonts on Windows
4243 (`#32 <https://github.com/git-cola/git-cola/issues/32>`_)
4253 * Keep entries in sorted order in the `cola classic` tool
4255 * Fix staging untracked files
4256 (`#27 <https://github.com/git-cola/git-cola/issues/27>`_)
4258 * Fix the `show` command in the Stash dialog
4259 (`#29 <https://github.com/git-cola/git-cola/issues/29>`_)
4261 * Fix a typo when loading merge commit messages
4262 (`#30 <https://github.com/git-cola/git-cola/issues/30>`_)
4270 This release focuses on a redesign of the git-cola user interface,
4271 a tags interface, and better integration of the `cola classic` tool.
4272 A flexible interface based on configurable docks is used to manage the
4273 various cola widgets.
4275 Usability, bells and whistles
4276 -----------------------------
4277 * New GUI is flexible and user-configurable
4279 * Individual widgets can be detached and rearranged arbitrarily
4281 * Add an interface for creating tags
4283 * Provide a fallback `SSH_ASKPASS` implementation to prompt for
4284 SSH passwords on fetch/push/pull
4286 * The commit message editor displays the current row/column and
4287 warns when lines get too long
4289 * The `cola classic` tool displays upstream changes
4291 * `git cola --classic` launches `cola classic` in standalone mode
4293 * Provide more information in log messages
4297 * Inherit the window manager's font settings
4299 * Miscellaneous PyQt4 bug fixes and workarounds
4303 * Removed all usage of Qt Designer `.ui` files
4305 * Simpler model/view architecture
4307 * Selection is now shared across tools
4309 * Centralized notifications are used to keep views in sync
4311 * The `cola.git` command class was made thread-safe
4313 * Less coupling between model and view actions
4315 * The status view was rewritten to use the MVC architecture
4317 * Added more documentation and tests
4325 Usability, bells and whistles
4326 -----------------------------
4327 * Added a `cola classic` tool for browsing the entire repository
4329 * Handle diff expressions with spaces
4331 * Handle renamed files
4335 * Handle carat `^` characters in diff expressions on Windows
4337 * Worked around a PyQt 4.5/4.6 QThreadPool bug
4341 * Added a keyboard shortcuts reference page
4343 * Added developer API documentation
4347 * Fix the diff expression used when reviewing branches
4349 * Fix a bug when pushing branches
4351 * Fix X11 warnings at startup
4353 * Fix more interrupted system calls on Mac OS X
4361 Usability, bells and whistles
4362 -----------------------------
4363 * Fresh and tasty SVG logos
4365 * Added `Branch Review` mode for reviewing topic branches
4367 * Added diff modes for diffing between tags, branches,
4368 or arbitrary `git diff` expressions
4370 * The push dialog selects the current branch by default.
4371 This is in preparation for `git 1.7.0` where `git push`
4372 will refuse to push when run without specifying the remote name
4373 and branch. See the `git` release notes for more information
4375 * Support `open` and `clone` commands on Windows
4377 * Allow saving cola UI layouts
4379 * Re-enabled `double-click-to-stage` for unmerged entries.
4380 Disabling it for unmerged items was inconsistent, though safer.
4382 * Show diffs when navigating the status tree with the keyboard
4386 * Worked around `pyuic4` bugs in the `setup.py` build script
4388 * Added Mac OS X application bundles to the download page
4398 * `git difftool` became an official git command in `git 1.6.3`.
4400 * `git difftool` learned `--no-prompt` / `-y` and a corresponding
4401 `difftool.prompt` configuration variable
4403 Usability, bells and whistles
4404 -----------------------------
4405 * Warn when `non-fast-forward` is used with fetch, push or pull
4407 * Allow `Ctrl+C` to exit cola when run from the command line
4411 * Support Unicode font names
4413 * Handle interrupted system calls
4417 * More of the code base was updated to follow the `PEP-8` coding style
4423 * All resources are now installed into `$prefix/share/git-cola`.
4424 Closed Debian bug #519972
4426 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519972
4436 * Added support for Kompare in `git difftool`
4438 * Added a separate configuration namespace for `git difftool`
4440 * Added the `diff.tool` configuration variable to define the default diff tool
4442 Usability, bells and whistles
4443 -----------------------------
4444 * The stash dialog allows passing the `--keep-index` option to `git stash`
4446 * Amending a published commit warns at commit time
4448 * Simplified the file-across-revisions comparison dialog
4450 * `origin` is selected by default in fetch/push/pull
4452 * Removed the search field from the log widget
4454 * The log window moved into a drawer widget at the bottom of the UI
4456 * Log window display can be configured with
4457 `cola.showoutput` = `{never, always, errors}`. `errors` is the default.
4459 * `NOTE` -- `cola.showoutput` was removed with the GUI rewrite in 1.4.0.
4463 * Improved nose unittest usage
4467 * Added a Windows/msysGit installer
4469 * Included private versions of `simplejson` and `jsonpickle`
4470 for ease of installation and development