6 Usability, bells and whistles
7 -----------------------------
8 * The startup dialog now detects when Recent and Favorite repositories no
9 longer exist on disk, and offers to remove these entries when selected.
10 (`#1089 <https://github.com/git-cola/git-cola/pull/1089>`_)
12 * The startup dialog now includes a simpler and more condensed folder view
13 that can be used for selecting Favorites and Recent repositories.
14 (`#1086 <https://github.com/git-cola/git-cola/pull/1086>`_)
16 * The "Commit" menu now includes an "Undo Last Commit" action.
17 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
21 * Updated Polish translation.
22 (`#1107 <https://github.com/git-cola/git-cola/pull/1107>`_)
24 * Updated Japanese translation.
25 (`#1098 <https://github.com/git-cola/git-cola/pull/1098>`_)
27 * Updated Brazilian translation.
28 (`#1091 <https://github.com/git-cola/git-cola/pull/1091>`_)
32 * The ``--use-env-python`` option for ``setup.py`` is now Python3 compatible.
33 (`#1102 <https://github.com/git-cola/git-cola/issues/1102>`_)
40 Usability, bells and whistles
41 -----------------------------
42 * The submodules widget can now be used to add submodules.
43 Submodules are now updated recursively.
44 (`#534 <https://github.com/git-cola/git-cola/issues/534>`_)
46 * The image diff viewer can now be toggled between text and image modes.
47 This is helpful when, for example, diffing .svg files where it can be useful
48 to see diffs in both an image and text representation.
49 (`#859 <https://github.com/git-cola/git-cola/issues/859>`_)
50 (`#1035 <https://github.com/git-cola/git-cola/pull/1035>`_)
52 * The default `ssh-askpass` username + password dialog included with Git Cola
53 can now toggle between showing and masking the password input field.
54 (`#1069 <https://github.com/git-cola/git-cola/pull/1069>`_)
58 * Updated Polish translation.
59 (`#1076 <https://github.com/git-cola/git-cola/pull/1076>`_)
61 * Updated Hungarian translation.
62 (`#1067 <https://github.com/git-cola/git-cola/pull/1067>`_)
66 * The `share/appdata` AppStream data was renamed to `share/metainfo`
67 in accordance with `AppStream standard changes from 2016
68 <https://github.com/ximion/appstream/blob/master/NEWS#L1363>`_.
69 (`#1079 <https://github.com/git-cola/git-cola/pull/1079>`_)
71 * The ``cola`` modules are now installed into the Python ``site-packages``
72 directory by default. This allows distributions to package ``git-cola`` for
73 multiple versions of Python. See the PACKAGING NOTES section in the README
74 for details about suppressing the installation of the private
75 ``share/git-cola/lib/cola`` modules when building cola.
76 (`#181 <https://github.com/git-cola/git-cola/issues/181>`_)
78 * Git Cola's rebase / sequence editor, formerly known as ``git-xbase`` and
79 installed as ``share/git-cola/bin/git-xbase``, has been renamed to
80 ``git-cola-sequence-editor`` and is now installed into the default
81 ``bin/git-cola-sequence-editor`` executable location to enable external
82 reuse of this general-purpose tool.
84 * A workaround used by the pynsist installer preamble script was obsoleted by
85 `takluyver/pynsist#149 <https://github.com/takluyver/pynsist/pull/149>`_
86 and has now been removed.
87 (`#1073 <https://github.com/git-cola/git-cola/pull/1073>`_)
91 * `git dag` now uses integer widths when initializing its brushes.
92 (`#1080 <https://github.com/git-cola/git-cola/pull/1080>`_)
99 Usability, bells and whistles
100 -----------------------------
101 * The ``git-xbase`` rebase editor now includes a file list for filtering
102 the changes displayed in the diff view.
103 (`#1051 <https://github.com/git-cola/git-cola/pull/1051>`_)
105 * The fallback `ssh-askpass` script, which provides the Username/Password
106 login dialog when performing remote operations, previously presented both
107 the username and password input fields with ``***`` asterisks.
108 The dialog now uses asterisks for the password field only.
109 (`#1026 <https://github.com/git-cola/git-cola/pull/1026>`_)
111 * Stashes can now be applied using the `Ctrl + Enter` hotkey, popped with the
112 `Ctrl + Backspace` hotkey, and dropped with the `Ctrl + Shift + Backspace`
113 hotkey when inside the stash dialog. This enables a keyboard-centric
114 mouse-free workflow when using the stash dialog.
116 * When amending a commit, `git cola` will check whether the commit has been
117 published to a remote branch using ``git branch -r --contains HEAD``.
118 This command can be slow when operating on a repository with many
119 remote branches. The new `cola.checkpublishedcommits` configuration
120 variable allows you to opt-out of this check, which improves performance
121 when amending a commit. The settings widget exposes this variable as,
122 "Check Published Commits when Amending".
123 (`#1021 <https://github.com/git-cola/git-cola/issues/1021>`_)
124 (`#1027 <https://github.com/git-cola/git-cola/pull/1027>`_)
128 * Updated Polish translation.
129 (`#1033 <https://github.com/git-cola/git-cola/pull/1033>`_)
133 * ``git-dag.appdata.xml`` was updated to allow network access for author icons.
134 (`#1050 <https://github.com/git-cola/git-cola/pull/1050>`_)
136 * The inotify filesystem monitor now handles
137 `OSError: [Errno 24] Too many open files` errors by disabling inotify.
138 (`#1015 <https://github.com/git-cola/git-cola/issues/1015>`_)
140 * Typos in various documentation files have been fixed.
141 (`#1025 <https://github.com/git-cola/git-cola/pull/1025>`_)
143 * The "Recent Repositories" limit was off by one, and now correctly
144 remembers the configured number of repositories in the menu.
145 (`#1024 <https://github.com/git-cola/git-cola/pull/1024>`_)
147 * The "revert" action in the DAG and other tools now uses
148 ``git revert --no-edit``, which avoids launching an editor
149 when reverting the commit. Use `Ctrl+m` in the commit message
150 editor after reverting a commit to rewrite its commit message.
151 (`#1020 <https://github.com/git-cola/git-cola/issues/1020>`_)
158 Usability, bells and whistles
159 -----------------------------
160 * The remote editor is much faster since it no longer queries
161 remotes, and uses the cached information instead.
162 (`#986 <https://github.com/git-cola/git-cola/issues/986>`_)
164 * Commit message templates can now be loaded automatically by setting
165 ``git config cola.autoloadcommittemplate true``.
166 (`#1013 <https://github.com/git-cola/git-cola/pull/1013>`_)
167 (`#735 <https://github.com/git-cola/git-cola/pull/735>`_)
169 * The UI layout can now be reset back to its initial state by selecting
170 the "Reset Layout" action. This reverts the layout to the same state
171 as when the app first launched.
172 (`#1008 <https://github.com/git-cola/git-cola/pull/1008>`_)
173 (`#994 <https://github.com/git-cola/git-cola/issues/994>`_)
175 * Files can now be ignored in either the project's `.gitignore`, or in the
176 repository's private local `.git/info/exclude` ignore file.
177 (`#1006 <https://github.com/git-cola/git-cola/pull/1006>`_)
178 (`#1000 <https://github.com/git-cola/git-cola/issues/1000>`_)
180 * New remotes are now selected when they are added in the "Edit Remotes" tool.
181 (`#1002 <https://github.com/git-cola/git-cola/pull/1002>`_)
183 * The "Recent" repositories list is now saved to disk when opening a
184 repository. Previously, this list was only updated when exiting the app.
185 (`#1001 <https://github.com/git-cola/git-cola/pull/1001>`_)
187 * The bookmarks tool now has a "Delete" option in its right-click menu.
188 (`#999 <https://github.com/git-cola/git-cola/pull/999>`_)
190 * The current repository is no longer listed in the "File/Open Recent" menu.
191 (`#998 <https://github.com/git-cola/git-cola/pull/998>`_)
195 * Updated Hungarian translation.
196 (`#1005 <https://github.com/git-cola/git-cola/pull/1005>`_)
197 (`#1018 <https://github.com/git-cola/git-cola/pull/1018>`_)
199 * Updated Turkish translation.
200 (`#1003 <https://github.com/git-cola/git-cola/pull/1003>`_)
201 (`#1011 <https://github.com/git-cola/git-cola/pull/1011>`_)
205 * Better support for Python 3.8's line buffering modes.
206 (`#1014 <https://github.com/git-cola/git-cola/pull/1014>`_)
208 * The default `ssh-askpass` script now uses a more generic `#!` shebang line.
209 (`#1012 <https://github.com/git-cola/git-cola/pull/1012>`_)
211 * Fetch, push, and pull operations will now refresh the model and display when
213 (`#996 <https://github.com/git-cola/git-cola/issues/996>`_)
215 * The branches widget now refreshes its display when changing branches.
216 (`#992 <https://github.com/git-cola/git-cola/pull/992>`_)
220 * The `share/git-cola/bin/git-xbase` script will now have its `#!` lines
221 updated during installation.
222 (`#991 <https://github.com/git-cola/git-cola/pull/991>`_)
226 * The unit tests were made more platform-independent.
227 (`#993 <https://github.com/git-cola/git-cola/pull/993>`_)
234 Usability, bells and whistles
235 -----------------------------
236 * Auto-completion for filenames can now be disabled. This speeds up
237 revision completion when working in large repositories with many files.
238 (`#981 <https://github.com/git-cola/git-cola/pull/981>`_)
240 * The Stash dialog now shows the stash date as a tooltip when hovering
241 over a stashed change.
242 (`#982 <https://github.com/git-cola/git-cola/pull/982>`_)
244 * Qt HiDPI settings are overriden by the `git cola` HiDPI appearance settings.
245 These overrides can now be disabled by selecting the "Disable" mode.
246 This allows users to control Qt's HiDPI settings through environment
247 variables. Additionally, the "Auto" mode now detects the presence of
248 the Qt HiDPI variables and no longer overrides them when the user has
249 configured their environment explicitly.
250 (`#963 <https://github.com/git-cola/git-cola/issues/963>`_)
252 * Confirmation dialogs can now focus buttons using the Tab key.
253 Previously, the "Y" and "N" keys could be used to confirm or deny
254 using the keyboard, but "Tab" is more familiar.
255 (`#965 <https://github.com/git-cola/git-cola/issues/965>`_)
257 * Error dialogs (for example, when a commit hook fails) will now always
258 show the details. The details were previously hidden behind a toggle.
259 (`#968 <https://github.com/git-cola/git-cola/issues/968>`_)
263 * Updated Japanese translation.
264 (`#973 <https://github.com/git-cola/git-cola/pull/973>`_)
265 (`#974 <https://github.com/git-cola/git-cola/pull/974>`_)
267 * Updated Simplified Chinese translation.
268 (`#950 <https://github.com/git-cola/git-cola/pull/950>`_)
272 * The filesystem monitor no longer logs that it has been enabled after the
273 inotify watch limit is reached on Linux.
274 (`#984 <https://github.com/git-cola/git-cola/pull/984>`_)
276 * Better unicode robustness.
277 (`#990 <https://github.com/git-cola/git-cola/issues/990>`_)
278 (`#910 <https://github.com/git-cola/git-cola/issues/991>`_)
280 * The "Branches" widget did not always update itself when deleting branches
281 (for example, when inotify is disabled or unavailable).
282 (`#978 <https://github.com/git-cola/git-cola/issues/978>`_)
284 * Non-ascii unicode byte strings are more robustly handled by the log widget.
285 (`#977 <https://github.com/git-cola/git-cola/issues/977>`_)
287 * Non-unicode results from the `gettext` library are more robustly handled.
288 (`#969 <https://github.com/git-cola/git-cola/issues/969>`_)
290 * Launching `git cola` from within a directory that has since been deleted
291 would previously result in a traceback, and is now robustly handled.
292 (`#961 <https://github.com/git-cola/git-cola/issues/961>`_)
296 * The vendored `qtpy` library was updated to `v1.9`.
303 Usability, bells and whistles
304 -----------------------------
305 * The file browser now includes "Blame" in its context menu.
306 (`#953 <https://github.com/git-cola/git-cola/issues/953>`_)
308 * The "Push" action now uses "git push --force-with-lease" when using
309 the "Force" option with Git v1.8.5 and newer.
310 (`#946 <https://github.com/git-cola/git-cola/issues/946>`_)
312 * Updated German translation.
313 (`#936 <https://github.com/git-cola/git-cola/pull/936>`_)
315 * The `Status` widget learned to optionally display file counts in its
316 category headers, and indent the files displayed in each category.
317 (`#931 <https://github.com/git-cola/git-cola/pull/931>`_)
319 * The `Branches` widget can now sort branches by their most recent commit.
320 (`#930 <https://github.com/git-cola/git-cola/pull/930>`_)
322 * `git cola` now includes configurable GUI themes that can be used to style
323 the user interface. Enable the new themes by configuring `cola.theme`
324 in the preferences window. See the
325 `cola.theme documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-theme>`_
326 for more details. (`#924 <https://github.com/git-cola/git-cola/pull/924>`_)
328 * `git cola` now has built-in support for HiDPI displays by enabling
329 Qt's 5.6's `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
330 (`#938 <https://github.com/git-cola/git-cola/issues/938>`_)
332 * `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
333 icons have been updated to look sharp when displayed in HiDPI.
334 (`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
338 * `git cola`'s "Revert Unstaged Edits" previously checked out from "HEAD^",
339 when in "Amend" mode, and removing staged changes. This behavior has been
340 changed to always checkout from the index, which avoids data loss.
341 (`#947 <https://github.com/git-cola/git-cola/issues/947>`_)
343 * `git cola` has been updated to work with newer versions of `gnome-terminal`
344 and no longer shell-quotes its arguments when launching `gnome-terminal`.
345 The `cola.terminalshellquote` configuration variable can be set to `true` to
346 get the old behavior, or to handle other terminals that take the command to run
347 as a single string instead of as arguments to `execv()`.
348 (`#935 <https://github.com/git-cola/git-cola/pull/935>`_)
350 * `git dag` now properly handles arbitrary input on Python3.
351 Previously, an exception would be raised when entering `--grep=xxx` where
352 `xxx` is a quoted string with a missing end-quote.
353 (`#941 <https://github.com/git-cola/git-cola/pull/941>`_)
357 * The contribution guidelines for contributors has been updated to mention
358 how to regenerate the `*.mo` message files.
359 (`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
366 Usability, bells and whistles
367 -----------------------------
368 * `git dag` improved how it renders parent commits.
369 (`#921 <https://github.com/git-cola/git-cola/pull/921>`_)
371 * The `Branches` widget now checks out branches when double-clicked.
372 (`#920 <https://github.com/git-cola/git-cola/pull/920>`_)
374 * The new `Submodules` widget makes it easy to interact with submodules.
375 Additionally, submodules can now be updated using the `Status` widget.
376 (`#916 <https://github.com/git-cola/git-cola/pull/916>`_)
378 * Updated Japanese translation.
379 (`#914 <https://github.com/git-cola/git-cola/pull/914>`_)
381 * The "Open Terminal" action now launches a Git Bash shell on Windows.
382 (`#913 <https://github.com/git-cola/git-cola/pull/913>`_)
384 * New menu actions for updating all submodules.
385 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
387 * The status widget can now update submodules.
388 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
390 * The "Apply Patch" `git cola am` dialog now includes a diff viewer
391 to display the contents of the selected patch.
393 * The "Alt+D" diffstat hotkey now selects the staged/modified/etc.
394 header in the Status widget, which shows the totality of everything
395 that will be committed.
396 (`#771 <https://github.com/git-cola/git-cola/issues/771>`_)
398 * Running "Launch Editor" from the diff editor now opens the editor at the
400 (`#898 <https://github.com/git-cola/git-cola/pull/898>`_)
402 * The textwidth and tabwidth configuration values can now be set
403 per-repository, rather than globally only.
405 * Text entry widgets switched to using a block cursor in `v3.2`.
406 This has been reverted to the original line cursor for consistency
407 with other applications and user expectations.
408 (`#889 <https://github.com/git-cola/git-cola/issues/889>`_)
410 * The "edit at line" feature, used by the "Grep" tool, now supports
411 the Sublime text editor.
412 (`#894 <https://github.com/git-cola/git-cola/pull/894>`_)
416 * Launching external programs has been improved on Windows.
417 (`#925 <https://github.com/git-cola/git-cola/pull/925>`_)
419 * Improve compatibility when using PySide2.
420 (`#912 <https://github.com/git-cola/git-cola/pull/912>`_)
422 * The Diff Editor was not honoring the configured tab width on startup.
423 (`#900 <https://github.com/git-cola/git-cola/issues/900>`_)
425 * The "Delete Files" feature was creating an unreadable display when
426 many files were selected. Word-wrap the list of files so that the
427 display stays within a sensible size.
428 (`#895 <https://github.com/git-cola/git-cola/issues/895>`_)
430 * Spelling and grammar fixes.
431 (`#915 <https://github.com/git-cola/git-cola/pull/915>`_)
432 (`#891 <https://github.com/git-cola/git-cola/pull/891>`_)
436 * The logo was run through `tidy` to give it a consistent style.
437 Some technical issues with the logo were improved.
438 (`#877 <https://github.com/git-cola/git-cola/issues/877>`_)
440 * The entire codebase is now checked by `flake8`, rather than just
441 the module and test directories. This catches things like
442 the pynsist installer scripts.
443 (`#884 <https://github.com/git-cola/git-cola/issues/884>`_)
444 (`#882 <https://github.com/git-cola/git-cola/issues/882>`_)
445 (`#879 <https://github.com/git-cola/git-cola/pull/879>`_)
449 * The vendored `qtpy` library was updated to `v1.6`.
451 * The Windows installer's wrapper scripts were missing an import.
452 (`#878 <https://github.com/git-cola/git-cola/issues/878>`_)
459 Usability, bells and whistles
460 -----------------------------
461 * The `git cola dag` DAG window now supports `git revert`.
462 (`#843 <https://github.com/git-cola/git-cola/issues/843>`_)
464 * `git stash pop` is now supported by the stash dialog.
465 (`#844 <https://github.com/git-cola/git-cola/issues/844>`_)
467 * The status widget now ensures that each item is visible when selection
468 changes. Previously, if you scrolled to the right to see the name of
469 a long filename, and then selected a short filename above it, the widget
470 may not have shown the short filename in the viewport. We now ensure
471 that the filenames are visible when the selection changes.
472 (`#828 <https://github.com/git-cola/git-cola/pull/828>`_)
474 * The `git xbase` rebase editor no longer displays an error when
475 cancelling an interactive rebase.
476 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
478 * The dialog shown when renaming remotes has been simplified.
479 (`#840 <https://github.com/git-cola/git-cola/pull/840>`_)
480 (`#838 <https://github.com/git-cola/git-cola/issues/838>`_)
482 * The help dialog in the `git-xbase` Rebase editor is now scrollable.
483 (`#855 <https://github.com/git-cola/git-cola/issues/855>`_)
487 * Updated Brazilian translation.
488 (`#845 <https://github.com/git-cola/git-cola/pull/845>`_)
490 * Updated Czech translation.
491 (`#854 <https://github.com/git-cola/git-cola/pull/854>`_)
492 (`#853 <https://github.com/git-cola/git-cola/pull/853>`_)
493 (`#835 <https://github.com/git-cola/git-cola/pull/835>`_)
494 (`#813 <https://github.com/git-cola/git-cola/pull/813>`_)
496 * Update Spanish translation.
497 (`#862 <https://github.com/git-cola/git-cola/pull/862>`_)
498 (`#867 <https://github.com/git-cola/git-cola/pull/867>`_)
502 * The original `#!/usr/bin/env python` shebang lines can now be
503 retained by passing `USE_ENV_PYTHON=1` to `make` when installing.
504 (`#850 <https://github.com/git-cola/git-cola/issues/850>`_)
506 * The Makefile is now resilient to DESTDIR and prefix containing whitespace.
507 (`#858 <https://github.com/git-cola/git-cola/pull/858>`_)
509 * The vendored `qtpy` library was updated to `v1.4.2`.
511 * `python3-distutils` is needed to build cola on Debian.
512 (`#837 <https://github.com/git-cola/git-cola/issues/837>`_)
516 * The "C" key no longer closes the message dialogs, for example the
517 one that is shown when a commit fails its pre-commit hooks.
518 This allows "Ctrl+C" copy to work, rather than closing the dialog.
519 (`#734 <https://github.com/git-cola/git-cola/issues/734>`_)
521 * Dock widgets sizes are now properly saved and restored when the main
523 (`#848 <https://github.com/git-cola/git-cola/issues/848>`_)
525 * The spellcheck feature was broken under Python3.
526 (`#857 <https://github.com/git-cola/git-cola/issues/857>`_)
528 * A regression when saving stashes was fixed.
529 (`#847 <https://github.com/git-cola/git-cola/issues/847>`_)
531 * Diffing image files was not updating the available context menus,
532 which prevented the "Stage" action from being present in the menu.
533 (`#841 <https://github.com/git-cola/git-cola/issues/841>`_)
535 * `git cola` now detects when `git lfs uninstall` has been run. This allows
536 you to re-initialize "Git LFS" in an existing repository where it had been
537 previously uninstalled.
538 (`#842 <https://github.com/git-cola/git-cola/issues/842>`_)
540 * Custom color values that did not contain any hexadecimal digits in the
541 `a-f` range were being converted into integers by the config reader. This
542 then caused the configured colors to be ignored.
544 These color values are now interpreted correctly. Additionally, color
545 values can now use an optional HTML-like `#` prefix.
547 Example `.gitconfig` snippet::
552 (`#836 <https://github.com/git-cola/git-cola/pull/836>`_)
553 (`#849 <https://github.com/git-cola/git-cola/issues/849>`_)
555 * We now display an error message graphically when `Git` is not installed.
556 Previously, the message went to stderr only.
557 (`#830 <https://github.com/git-cola/git-cola/issues/830>`_)
559 * Changing diff options was causing resulting in an exception.
560 (`#833 <https://github.com/git-cola/git-cola/issues/833>`_)
561 (`#834 <https://github.com/git-cola/git-cola/pull/834>`_)
563 * The DAG window now updates itself when branches and tags are created.
564 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
566 * The user's `$PATH` environment variable can now contain utf-8
567 encoded paths. Previously, launching external commands could
569 (`#807 <https://github.com/git-cola/git-cola/issues/807>`_)
571 * Git Cola development sandboxes can now be stored on utf-8 encoded
572 filesystem paths. Previously, the interactive rebase feature
573 could be broken when running in that environment.
574 (`#825 <https://github.com/git-cola/git-cola/issues/825>`_)
576 * The log window now uses an ISO-8601 timestamp, which
577 avoids localized output in the log window.
578 (`#817 <https://github.com/git-cola/git-cola/issues/817>`_)
582 * The code base has been thoroughly sanitized using `pylint`, and
583 travis is now running pylint over the entire project.
585 * Miscellaneous improvements and code improvements.
586 (`#874 <https://github.com/git-cola/git-cola/issues/874>`_)
593 Usability, bells and whistles
594 -----------------------------
595 * The "Browser" widget learned to rename files using "git mv".
596 (`#239 <https://github.com/git-cola/git-cola/issues/239>`_)
598 * The "Diff" widget learned to diff images. Side-by-side and pixel diff
599 modes allow you to inspect changes to common images formats.
600 (`#444 <https://github.com/git-cola/git-cola/issues/444>`_)
601 (`#803 <https://github.com/git-cola/git-cola/pull/803>`_)
603 * Git LFS and Git Annex are natively supported by the image diff viewer.
605 * Git Annex operations are now included. `git annex init` can be performed on
606 repositories, and `git annex add` can be run on untracked files from the
607 status widget. Install `git-annex` to activate this feature.
609 * Git LFS operations are now included. `git lfs install` can be performed on
610 repositories, and `git lfs track` can be run on untracked files from the
611 status widget. Install `git-lfs` to activate this feature.
613 * The "Stash" tool learned to stash staged changes only. Select the
614 "Stage Index" option and only staged changes will be stashed away.
615 (`#413 <https://github.com/git-cola/git-cola/issues/413>`_)
617 * The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
618 shows error messages when things go wrong, and now saves the "Stash Index"
619 and "Keep Index" options across sessions.
621 * The Edit menu's "Copy" and "Select All" actions now forward to either the
622 diff, status, recent, or favorites widgets, based on which widget has focus.
624 * The "File" and "Edit" menu can now be activated using `Alt-{f,e}` hotkeys.
625 (`#759 <https://github.com/git-cola/git-cola/issues/759>`_)
627 * It was easy to accidentally trigger the first action in the `Status` tool's
628 context menu when using a quick right-click to bring up the menu.
629 A short sub-second delay was added to ensure that the top-most action is not
630 triggered unless enough time has passed. This prevents accidental
631 activation of the first item (typically "Stage" or "Unstage") without
632 burdening common use cases.
633 (`#755 <https://github.com/git-cola/git-cola/pull/755>`_)
634 (`#643 <https://github.com/git-cola/git-cola/issues/643>`_)
636 * The "Ctrl+S" hotkey now works for the header items in the Status tool.
637 Selected the "Modified" header item and activating the "Stage" hotkey,
638 for example, will stage all modified files. This works for the "Staged",
639 "Modified", and "Untracked" headers. This is not enabled for the
640 "Unmerged" header by design.
641 (`#772 <https://github.com/git-cola/git-cola/issues/772>`_)
643 * The list of "Recent" repositories previously capped the number of
644 repositories shown to 8 repositories. This can be set to a higher
645 value by setting the `cola.maxrecent` configuration variable.
646 (`#752 <https://github.com/git-cola/git-cola/issues/752>`_)
648 * The "Create Branch" dialog now prevents invalid branch names.
649 (`#765 <https://github.com/git-cola/git-cola/issues/765>`_)
651 * Updated Turkish translation.
652 (`#756 <https://github.com/git-cola/git-cola/pull/756>`_)
654 * Updated Ukrainian translation.
655 (`#753 <https://github.com/git-cola/git-cola/pull/753>`_)
657 * Updated German translation.
658 (`#802 <https://github.com/git-cola/git-cola/pull/802>`_)
660 * Updated Czech translation
661 (`#792 <https://github.com/git-cola/git-cola/pull/792>`_)
662 (`#806 <https://github.com/git-cola/git-cola/pull/806>`_)
664 * The window title can be configured to not display the absolute path of the
666 (`#775 <https://github.com/git-cola/git-cola/issues/775>`_)
668 * The "Edit Remotes" editor learned to edit remote URLS.
670 * Bare repositories can now be created by selecting the
671 "New Bare Repository..." action from the `File` menu.
673 * The "Branches" widget learned to configure upstream branches.
675 * A new `git cola clone` sub-command was added for cloning repositories.
679 * The vendored `qtpy` library was updated to `v1.3.1`.
681 * The macOS installation was made simpler for better compatibility with
683 (`#636 <https://github.com/git-cola/git-cola/issues/636>`_)
685 * The Windows installer is now much simpler. Git Cola now bundles
686 Python and PyQt5, so users need only install the "Git for Windows"
687 and "Git Cola" installers to get things working.
691 * Uninitialized difftool errors will now be displayed graphically.
692 They were previously going to the shell.
693 (`#457 <https://github.com/git-cola/git-cola/issues/457>`_)
695 * Translations marked "fuzzy" will no longer be used when translating strings.
696 (`#782 <https://github.com/git-cola/git-cola/issues/782>`_)
698 * Deleted unmerged files will now correctly use a deleted icon.
699 (`#479 <https://github.com/git-cola/git-cola/issues/479>`_)
701 * The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
702 (`#767 <https://github.com/git-cola/git-cola/issues/767>`_)
704 * The "Create Tag" dialog did not correctly handle the case when a signed
705 tag is requested, but no message is provided, and the user chooses to
706 create an unannotated tag instead. This convenience fallback will now
707 properly create an unsigned, unannotated tag.
708 (`#696 <https://github.com/git-cola/git-cola/issues/696>`_)
710 * `.gitconfig` and `.git/config` values editable by the Preferences dialog
711 (aka `git cola config`) will now get unset when set to an empty value.
712 For example, setting a different `user.email` in the current repository,
713 followed by a subsequent emptying of that field, would previously result in
714 an empty string getting stored in the config. This has been fixed so that
715 the value will now get unset in the config instead.
716 (`#406 <https://github.com/git-cola/git-cola/issues/406>`_)
718 * Spelling and typofixes.
719 (`#748 <https://github.com/git-cola/git-cola/pull/748>`_)
721 * `core.commentChar` is now honored when set in the local repository
723 (`#766 <https://github.com/git-cola/git-cola/issues/766>`_)
725 * The log window was using a format string that did not display
726 correctly in all locales. A locale-aware format is now used.
727 (`#800 <https://github.com/git-cola/git-cola/pull/800>`_)
729 * The dialog displayed when prompting for a reference could sometimes
731 (`#804 <https://github.com/git-cola/git-cola/pull/804>`_)
738 Usability, bells and whistles
739 -----------------------------
740 * Updated Simplified Chinese translation.
741 (`#726 <https://github.com/git-cola/git-cola/pull/726>`_)
743 * Updated Ukrainian translation.
744 (`#723 <https://github.com/git-cola/git-cola/pull/723>`_)
746 * New Czech translation.
747 (`#736 <https://github.com/git-cola/git-cola/pull/736>`_)
748 (`#737 <https://github.com/git-cola/git-cola/pull/737>`_)
749 (`#740 <https://github.com/git-cola/git-cola/pull/740>`_)
750 (`#743 <https://github.com/git-cola/git-cola/pull/743>`_)
752 * The "name" field in the "Create Tag" dialog now includes autocompletion,
753 which makes it easy to see which tags currently exist.
755 * `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
756 menu item to add a toolbar.
758 * Setting `cola.expandtab` to `true` will now expand tabs into spaces
759 in the commit message editor. The number of spaces to insert is determined
760 by consulting `cola.tabwidth`, which defaults to `8`.
762 * The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
763 ability to copy text from the DAG window.
764 (`#705 <https://github.com/git-cola/git-cola/pull/705>`_)
766 * The "Prepare Commit Message" action can now be invoked via the
767 `Ctrl+Shift+Return` shortcut.
768 (`#707 <https://github.com/git-cola/git-cola/pull/707>`_)
770 * The `Branches` pane now has a filter field that highlights branches whose
771 names match the string entered into its text field.
772 (`#713 <https://github.com/git-cola/git-cola/pull/713>`_)
774 * Actions that are triggered in response to button presses were being
775 triggered when the button was pressed, rather than when it was released,
776 which was a usability flaw. All buttons now respond when clicked
777 rather than when pressed.
778 (`#715 <https://github.com/git-cola/git-cola/pull/715>`_)
780 * The DAG window will now only refresh when object IDs change.
781 Previously, the DAG would redraw itself in response to inotify events,
782 such as filesystem operations, which was disruptive when inspecting a large
783 diff in its diff viewer. The DAG will now only redraw when the object IDs
784 corresponding to its query input changes. Furthermore, when redrawing, the
785 scrollbar positions are retained to minimize disruption to the viewport
787 (`#620 <https://github.com/git-cola/git-cola/issues/620>`_)
788 (`#724 <https://github.com/git-cola/git-cola/issues/724>`_)
790 * The "About" dialog now includes the SHA-1 where Git Cola was built.
791 (`#530 <https://github.com/git-cola/git-cola/issues/530>`_)
793 * The "Status" widget now has "Copy Leading Path to Clipboard" and
794 "Copy Basename to Clipboard" actions.
795 (`#435 <https://github.com/git-cola/git-cola/issues/435>`_)
796 (`#436 <https://github.com/git-cola/git-cola/issues/436>`_)
798 * The "Status" widget now supports custom "Copy ... to Clipboard" actions.
799 (`#437 <https://github.com/git-cola/git-cola/issues/437>`_)
801 * The main menu now has an "Edit" menu.
802 (`#725 <https://github.com/git-cola/git-cola/issues/725>`_)
804 * `git dag` learned to checkout commits into a detached HEAD state.
805 (`#698 <https://github.com/git-cola/git-cola/issues/698>`_)
807 * The `status` widget's context menus now omit actions selection-dependent
808 actions when no file is selected.
809 (`#731 <https://github.com/git-cola/git-cola/pull/731>`_)
811 * The startup dialog now focuses the repository list so that repositories
812 can be selected with the keyboard without mouse intervention.
813 (`#741 <https://github.com/git-cola/git-cola/issues/741>`_)
817 * `git dag` now prevents nodes from overlapping in more situations.
818 (`#689 <https://github.com/git-cola/git-cola/pull/689>`_)
820 * Adding untracked Git submodule repo directories previously ran
821 `git add submodule/` but we now call `git add submodule` without
822 the trailing slash (`/`) to avoid staging files that belong to the
823 submodule (which is possibly a `git` bug). By working around the
824 buggy behavior we allow users to recover by issuing the appropriate
825 `git submodule add` command to properly register the submodule.
826 (`#681 <https://github.com/git-cola/git-cola/pull/681>`_)
828 * We now avoid `git for-each-ref --sort=version:refname` on versions
829 of `git` older than `v2.7.0`. Previously we only avoided it for
830 versions older than `v2.0.0`, which was a mistake.
831 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
833 * The error message displayed when `git` is not installed has been fixed.
834 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
836 * Adding new remotes was silently broken.
837 (`#684 <https://github.com/git-cola/git-cola/issues/684>`_)
838 (`#685 <https://github.com/git-cola/git-cola/pull/685>`_)
840 * The repo selection dialog had errors during startup when the
841 `cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
842 (`#690 <https://github.com/git-cola/git-cola/issues/690>`_)
844 * Restored support for PyQt 4.6 (Centos 6.8)
845 (`#692 <https://github.com/git-cola/git-cola/issues/692>`_)
847 * Switching repositories now resets the "Amend Mode" and other settings
849 (`#710 <https://github.com/git-cola/git-cola/issues/710>`_)
851 * `git rebase` error messages now displayed when rebasing fails or stops
852 via the standalone `git cola rebase` front-end.
853 (`#721 <https://github.com/git-cola/git-cola/issues/721>`_)
855 * `git cola` learned to stage broken symlinks.
856 (`#727 <https://github.com/git-cola/git-cola/issues/727>`_)
858 * The "View History" feature in the `Browser` tool was fixed, and now
859 disambiguates between refs and paths.
860 (`#732 <https://github.com/git-cola/git-cola/issues/732>`_)
862 * The diff editor now has better support for files with CRLF `\r\n`
864 (`#730 <https://github.com/git-cola/git-cola/issues/730>`_)
866 * `cola.inotify` in a repo-local config is now honored
867 when `git cola` is launched from a desktop entry (`git cola --prompt`).
868 (`#695 <https://github.com/git-cola/git-cola/issues/695>`_)
875 Usability, bells and whistles
876 -----------------------------
877 * New Ukrainian translation.
878 (`#670 <https://github.com/git-cola/git-cola/pull/670>`_)
879 (`#672 <https://github.com/git-cola/git-cola/pull/672>`_)
881 * New and improved French translations.
883 * The new `Branches` widget makes it easier to checkout, merge, push,
884 and pull branches from a single interface.
886 * `git cola` now includes a dark icon theme. The dark icon theme can be
887 activated either by setting the `GIT_COLA_ICON_THEME` environment variable
888 to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
889 `--icon-theme=dark` on the command line.
890 (`#638 <https://github.com/git-cola/git-cola/pull/638>`_)
892 * Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.
894 * The commit message editor now remembers the "Spellcheck" setting
896 (`#645 <https://github.com/git-cola/git-cola/pull/645>`_)
898 * `git dag` now uses an improved algorithm for laying out the graph,
899 which avoids collisions under certain graph configurations, and
900 avoids overlapping tag with commits.
901 (`#648 <https://github.com/git-cola/git-cola/pull/648>`_)
902 (`#651 <https://github.com/git-cola/git-cola/pull/651>`_)
903 (`#654 <https://github.com/git-cola/git-cola/pull/654>`_)
904 (`#656 <https://github.com/git-cola/git-cola/pull/656>`_)
905 (`#659 <https://github.com/git-cola/git-cola/pull/659>`_)
907 * `git dag` now remembers its column sizes across sessions.
908 (`#674 <https://github.com/git-cola/git-cola/issues/674>`_)
910 * `Grep` now shows a preview of the selected file's content in a split window
911 below the grep results.
913 * `Grep` now includes line numbers in the preview pane's output.
915 * `Edit Remotes` now remembers its window settings after exiting.
917 * `Diff` now has an option to display line numbers in the editor.
918 (`#136 <https://github.com/git-cola/git-cola/issues/136>`_)
920 * `Amend Last Commit` can now be triggered via the `Commit` menu in addition
921 to the commit message editor's options.
922 (`#640 <https://github.com/git-cola/git-cola/issues/640>`_)
924 * The `File Browser` tool was made much faster and can now operate on
925 much larger repositories.
926 (`#499 <https://github.com/git-cola/git-cola/issues/499>`_)
928 * A new "turbo" mode was added that allows you to opt-out of operations
929 that can slow `git cola` on large repositories. The turbo mode is
930 enabled by configuring `git config cola.turbo true`. Turbo mode
931 disables the background loading of Git commit messages and other
932 details in the `File Browser` widget.
934 * A new GitIgnore dialog allows adding custom gitignore patterns.
935 (`#653 <https://github.com/git-cola/git-cola/pull/653>`_)
937 * The spellchecker in `git cola` can now use an additional dictionary
938 by configuring `cola.dictionary` to the path to a file containing
939 a newline-separated list of words.
940 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
942 * The stash, export patches, diff, and gitignore dialogs now remember
945 * A new `git cola recent` sub-command was added for finding recently
948 * The `Fetch` dialog now allows pruning remote branches.
949 (`#639 <https://github.com/git-cola/git-cola/issues/639>`_)
950 (`#680 <https://github.com/git-cola/git-cola/pull/680>`_)
954 * `git cola`'s spellchecker now supports the new `dict-common` filesystem
955 layout, and prefers the `/usr/share/dict/cracklib-small` file over the
956 `/usr/share/dict/words` provided on older distributions.
957 This makes the spellchecker compatible with Arch, which does not provide
958 a `words` symlink like Debian.
959 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
961 * Properly handle the case where an existing file is untracked using
964 * Fix a quirk where the "Create Branch" dialog sometimes required clicking
965 twice on the radio buttons.
966 (`#662 <https://github.com/git-cola/git-cola/pull/662>`_)
968 * Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
969 be executed with the press of a single enter key after being shown.
970 (`#661 <https://github.com/git-cola/git-cola/issues/661>`_)
972 * Committing is now allowed in when resolving a merge results in no
973 changes. This state was previously prevented by the commit message editor,
974 which prevented users from resolving merges that result in no changes.
975 (`#679 <https://github.com/git-cola/git-cola/pull/679>`_)
977 * The filesystem monitor would sometimes emit backtraces when directories
978 are modified. This has been fixed.
979 (`bz #1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)
981 * Absolute paths are now returned when querying for `.git`-relative paths
982 from within a submodule, which uses `.git`-files.
983 This fixes launching `git cola` from within a subdirectory of a submodule.
984 (`#675 <https://github.com/git-cola/git-cola/pull/675>`_)
991 Usability, bells and whistles
992 -----------------------------
993 * `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
994 hook to update the commit message. This hook takes the same parameters
995 as Git's `prepare-commit-message` hook. The default path to this hook
996 can be overridden by setting the `cola.prepareCommitMessageHook`
997 configuration variable.
998 (`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)
1000 * `git cola diff` (and the corresponding `Diff` menu actions) can now
1001 launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
1002 also added for launching an editor.
1004 * Traditional Chinese (Taiwan) translation updates.
1008 * `git cola` now works when installed in non-ascii, utf8-encoded paths.
1009 (`#629 <https://github.com/git-cola/git-cola/issues/629>`_)
1011 * Styling issues that caused black backgrounds in various widgets when using
1012 PyQ5 on Mac OS X have been fixed.
1013 (`#624 <https://github.com/git-cola/git-cola/issues/624>`_)
1015 * The "Open Recent" menu action was broken and has been fixed.
1016 (`#634 <https://github.com/git-cola/git-cola/issues/634>`_)
1018 * Exiting `git cola` with a maximized main window would hang when reopened
1020 (`#641 <https://github.com/git-cola/git-cola/issues/641>`_)
1024 * `appdata.xml` files are now provided at
1025 `share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
1026 for use by the Linux software gallery.
1027 (`#627 <https://github.com/git-cola/git-cola/pull/627>`_)
1028 (`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)
1037 * The "Open Recent" menu was updated to new bookmarks format.
1038 (`#628 <https://github.com/git-cola/git-cola/issues/628>`_)
1045 Usability, bells and whistles
1046 -----------------------------
1047 * New Polish translation thanks to Łukasz Wojniłowicz
1048 (`#598 <https://github.com/git-cola/git-cola/pull/598>`_)
1050 * The `Bypass Commit Hooks` feature now disables itself automatically
1051 when a new commit is created. The new behavior turns the option into a
1052 single-use flag, which helps prevent users from accidentally leaving it
1053 active longer than intended.
1054 (`#595 <https://github.com/git-cola/git-cola/pull/595>`_)
1056 * `git dag` learned to launch an external diff viewer on selected commits.
1057 The standard `Ctrl+D` shortcut can be used to view diffs.
1058 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1060 * `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
1061 The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
1062 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1064 * Items in the "Favorites" list can now be renamed, which makes it
1065 easier to differentiate between several checkouts of the same repository.
1066 (`#599 <https://github.com/git-cola/git-cola/issues/599>`_)
1067 (`#601 <https://github.com/git-cola/git-cola/pull/601>`_)
1069 * The startup screen now includes a logo and `git cola` version information.
1070 (`#526 <https://github.com/git-cola/git-cola/issues/526>`_)
1072 * The `About` page was revamped to contain multiple tabs. A new tab was added
1073 that provides details about `git cola`''s dependencies. New tabs were also
1074 added for giving credit to `git cola`'s authors and translators.
1076 * The `About` page can now be accessed via `git cola about`.
1078 * The "Fast-forward only" and "No fast-forward" options supported by
1079 `git pull` are now accessible via `git cola pull`.
1081 * Doing a forced push no longer requires selecting the remote branch.
1082 (`#618 <https://github.com/git-cola/git-cola/pull/618>`_)
1084 * `git cola push` now has an option to suppress the prompt that is shown
1085 when pushing would create new remote branches.
1086 (`#605 <https://github.com/git-cola/git-cola/issues/605>`_)
1088 * `git dag` now shows commit messages in a more readable color.
1089 (`#574 <https://github.com/git-cola/git-cola/issues/574>`_)
1091 * `git cola browse` and the `status` widget learned to launch the OS-specified
1092 default action for a file. When used on directories via `git cola browse`,
1093 or when "Open Parent Directory" is used on files, the OS-specified
1094 file browser will typically be used.
1096 * `git cola browse` and the `status` widget learned to launch terminals.
1100 * `git cola browse` was not updating when expanding items.
1101 (`#588 <https://github.com/git-cola/git-cola/issues/588>`_)
1103 * Typofixes in comments, naming, and strings have been applied.
1104 (`#593 <https://github.com/git-cola/git-cola/pull/593>`_)
1106 * The inotify and win32 filesystem monitoring no longer refreshes
1107 when updates are made to ignored files.
1108 (`#517 <https://github.com/git-cola/git-cola/issues/517>`_)
1109 (`#516 <https://github.com/git-cola/git-cola/issues/516>`_)
1111 * The `Refresh` button on the actions panel no longer raises an
1112 exception when using PyQt5.
1113 (`#604 <https://github.com/git-cola/git-cola/issues/604>`_)
1115 * Fixed a typo in the inotify backend that is triggered when files are removed.
1116 (`#607 <https://github.com/git-cola/git-cola/issues/607>`_)
1118 * Fixed a typo when recovering from a failed attempt to open a repository.
1119 (`#606 <https://github.com/git-cola/git-cola/issues/606>`_)
1121 * `git dag` now properly updates itself when launched from the menubar.
1122 (`#613 <https://github.com/git-cola/git-cola/pull/613>`_)
1124 * If git-cola is invoked on Windows using `start pythonw git-cola`,
1125 a console window will briefly flash on the screen each time
1126 `git cola` invokes `git`. The console window is now suppressed.
1128 * We now avoid some problematic Popen flags on Windows which were
1129 breaking the `git rebase` feature on Windows.
1131 * The `Save` button in `git dag`'s "Grab File..." feature now properly
1132 prompts for a filename when saving files.
1133 (`#617 <https://github.com/git-cola/git-cola/pull/617>`_)
1137 * The `qtpy` symlink in the source tree has been removed to allow for easier
1138 development on Windows.
1139 (`#626 <https://github.com/git-cola/git-cola/issues/626>`_)
1146 Usability, bells and whistles
1147 -----------------------------
1148 * `git cola push` learned to configure upstream branches.
1149 (`#563 <https://github.com/git-cola/git-cola/issues/563>`_)
1153 * The diffstat view is now properly updated when notifications are
1154 received via inotify filesystem monitoring.
1155 (`#577 <https://github.com/git-cola/git-cola/issues/577>`_)
1157 * Python3 with PyQt5 had a bug that prevented `git cola` from starting.
1158 (`#589 <https://github.com/git-cola/git-cola/pull/589>`_)
1168 * When repositories stored in non-ASCII, UTF-8-encoded filesystem paths
1169 were operated upon with `LC_ALL=C` set in the environment, unicode errors
1170 would occur when using `python2`. `git cola` was made more robust and will
1171 now operate correctly within this environment.
1172 (`#581 <https://github.com/git-cola/git-cola/issues/581>`_)
1174 * Support for the `GIT_WORK_TREE` environment variable was fixed.
1175 (`#582 <https://github.com/git-cola/git-cola/pull/582>`_)
1180 * The `unittest.mock` module is now used instead of the original `mock` module
1181 when running the `git cola` test suite using Python3.
1182 (`#569 <https://github.com/git-cola/git-cola/issues/569>`_)
1187 * `git cola` is now compatible with *PyQt5*, *PyQt4*, and *Pyside*.
1188 `git cola` previously supported *PyQt4* only, but will now use whichever
1189 library is available. Users are not required to upgrade at this time,
1190 but *PyQt5* support can be enabled anytime by making its python
1192 (`#232 <https://github.com/git-cola/git-cola/issues/232>`_)
1194 *NOTE*: We do not yet recommend using *PyQt5* because there are known
1195 exit-on-segfault bugs in *Qt5* that have not yet been addressed.
1196 `git cola` is sensitive to this bug and is known to crash on exit
1197 when using `git dag` or the interactive rebase feature on *PyQt5*.
1199 https://bugreports.qt.io/browse/QTBUG-52988
1201 *PyQt4* is stable and there are no known issues when using it so
1202 we recommend using it until the Qt5 bugs have been resolved.
1204 * `git cola` now depends on *QtPy* and includes a bundled copy of the
1205 `qtpy` library. If you are packaging `git cola` and would prefer to use
1206 `qtpy` from your distribution instead of the built-in version then use
1207 `make NO_VENDOR_LIBS=1` when building `git cola`. This will prevent
1208 vendored libraries from being installed.
1215 Usability, bells and whistles
1216 -----------------------------
1218 * A new "Reset" sub-menu provides access to running "git reset --mixed"
1219 when resetting branch heads and "git reset --merge" when resetting
1221 (`#542 <https://github.com/git-cola/git-cola/issues/542>`_)
1223 * `git cola` now supports linked worktrees, i.e. worktrees created by
1225 (`#554 <https://github.com/git-cola/git-cola/issues/554>`_)
1230 * Diff highlighting is now robust to the user having
1231 diff.supressBlankEmpty=true in their git config.
1232 (`#541 <https://github.com/git-cola/git-cola/issues/541>`_)
1234 * The filesystem monitor now properly handles repositories that use
1235 `.git`-files, e.g. when using submodules.
1236 (`#545 <https://github.com/git-cola/git-cola/issues/545>`_)
1237 (`#546 <https://github.com/git-cola/git-cola/pulls/546>`_)
1239 * Per-repository git configuration is now properly detected when launching
1240 `git cola` from an application launcher.
1241 (`#548 <https://github.com/git-cola/git-cola/issues/548>`_)
1243 * `git cola` now cleans up after itself immediately to avoid leaving behind
1244 empty `/tmp/git-cola-XXXXXX` directories when the user uses `Ctrl+C`
1246 (`#566 <https://github.com/git-cola/git-cola/issues/566>`_)
1251 * It is now possible to install `git cola` to and from utf8-encoded filesystem
1252 paths. Previously, Python's stdlib would throw an encoding error during
1253 installation. We workaround the stdlib by forcing python2 to use utf-8,
1254 thus fixing assumptions in the stdlib library code.
1255 (`#551 <https://github.com/git-cola/git-cola/issues/551>`_)
1262 Usability, bells and whistles
1263 -----------------------------
1265 * The icon for untracked files was adjusted to better differentiate
1266 between files and the "Untracked" header.
1267 (`#509 <https://github.com/git-cola/git-cola/issues/509>`_)
1269 * Ctrl+O was added as a hotkey for opening repositories.
1270 (`#507 <https://github.com/git-cola/git-cola/pull/507>`_)
1272 * `git dag` now uses consistent edge colors across updates.
1273 (`#512 <https://github.com/git-cola/git-cola/issues/512>`_)
1275 * `git cola`'s Bookmarks widget can now be used to set a "Default Repository".
1276 Under the hood, we set the `cola.defaultrepo` configuration variable.
1277 The default repository is used whenever `git cola` is launched outside of
1278 a Git repository. When unset, or when set to a bogus value, `git cola`
1279 will prompt for a repository, as it previously did.
1280 (`#513 <https://github.com/git-cola/git-cola/issues/513>`_)
1282 * `git cola`'s Russian and Spanish translations were improved
1283 thanks to Vaiz and Zeioth.
1284 (`#514 <https://github.com/git-cola/git-cola/pull/514>`_)
1285 (`#515 <https://github.com/git-cola/git-cola/pull/515>`_)
1286 (`#523 <https://github.com/git-cola/git-cola/pull/523>`_)
1288 * `git cola` was translated to Turkish thanks to Barış ÇELİK.
1289 (`#520 <https://github.com/git-cola/git-cola/pull/520>`_)
1291 * The status view now supports launching `git gui blame`. It can be
1292 configured to use a different command by setting `cola.blameviewer`.
1293 (`#521 <https://github.com/git-cola/git-cola/pull/521>`_)
1295 * `git dag` now allows selecting non-contiguous ranges in the log widget.
1296 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1298 * Any font can now be chosen for the diff editor, not just monospace fonts.
1299 (`#525 <https://github.com/git-cola/git-cola/issues/525>`_)
1304 * `xfce4-terminal` and `gnome-terminal` are now supported when launching
1305 `git mergetool` to resolve merges. These terminals require that the command
1306 to execute is shell-quoted and passed as a single string argument to `-e`
1307 rather than as additional command line arguments.
1308 (`#524 <https://github.com/git-cola/git-cola/issues/524>`_)
1310 * Fixed a unicode problem when formatting the error message that is shown
1311 when `gitk` is not installed. We now handle unicode data in tracebacks
1312 generated by python itself.
1313 (`#528 <https://github.com/git-cola/git-cola/issues/528>`_)
1315 * The `New repository` feature was fixed.
1316 (`#533 <https://github.com/git-cola/git-cola/pull/533>`_)
1318 * We now use omit the extended description when creating "fixup!" commits,
1319 for consistency with the Git CLI. We now include only the one-line summary
1320 in the final commit message.
1321 (`#522 <https://github.com/git-cola/git-cola/issues/522>`_)
1328 Usability, bells and whistles
1329 -----------------------------
1331 * The user interface is now HiDPI-capable. git-cola now uses SVG
1332 icons, and its interface can be scaled by setting the `GIT_COLA_SCALE`
1333 environment variable.
1335 * `git dag` now supports the standard editor, difftool, and history hotkeys.
1336 It is now possible to invoke these actions from file widget's context
1337 menu and through the standard hotkeys.
1338 (`#473 <https://github.com/git-cola/git-cola/pull/473>`_)
1340 * The `Status` tool also learned about the history hotkey.
1341 Additionally, the `Alt-{j,k}` aliases are also supported in the `Status`
1342 tool for consistency with the other tools where the non-Alt hotkeys are not
1344 (`#488 <https://github.com/git-cola/git-cola/pull/488>`_)
1346 * The `File Browser` tool now has better default column sizes,
1347 and remembers its window size and placement.
1349 * The `File Browser` now supports the refresh hotkey, and has better
1350 behavior when refreshing. The selection is now retained, and new and
1351 removed files are found when refreshing.
1353 * A new `git-cola-completion.bash` completion script is provided in the
1354 `contrib/` directory. It must be used alongside Git's completion script.
1355 Source it from your `~/.bashrc` (or `~/.zshrc`, etc) after sourcing
1356 the `git-completion.bash` script and you will have command-line completion
1357 support for the `git cola` and `git dag` sub-commands.
1359 * The "checkout" dialog now offers completion for remote branches and other
1360 git refs. This makes it easier to checkout remote branches in a detached
1361 head state. Additionally, the checkout dialog also offers completion for
1362 remote branches that have not yet been checked out, which makes it easier to
1363 create a local tracking branch by just completing for that potential name.
1364 (`#390 <https://github.com/git-cola/git-cola/issues/390>`_)
1366 * The "create branch" and "create tag" dialogs now save and restore their
1369 * The "status" widget can now be configured to use a bold font with a darker
1370 background for the header items.
1371 (`#506 <https://github.com/git-cola/git-cola/pull/506>`_)
1373 * The "status" widget now remembers its horizontol scrollbar position across
1374 updates. This is helpful when working on projects with long paths.
1375 (`#494 <https://github.com/git-cola/git-cola/issues/494>`_)
1380 * When using *Git for Windows*, a `git` window would appear
1381 when running *Windows 8*. We now pass additional flags to
1382 `subprocess.Popen` to prevent a `git` window from appearing.
1383 (`#477 <https://github.com/git-cola/git-cola/issues/477>`_)
1384 (`#486 <https://github.com/git-cola/git-cola/pull/486>`_)
1386 * Launching difftool with `.PY` in `$PATHEXT` on Windows was fixed.
1387 (`#492 <https://github.com/git-cola/git-cola/issues/492>`_)
1389 * Creating a local branch tracking a remote branch that contains
1390 slashes in its name is now properly handled.
1391 (`#496 <https://github.com/git-cola/git-cola/issues/496>`_)
1393 * The "Browse Other Branch" feature was broken by Python3, and is now fixed.
1394 (`#501 <https://github.com/git-cola/git-cola/issues/501>`_)
1396 * We now avoid `long` for better Python3 compatibility.
1397 (`#502 <https://github.com/git-cola/git-cola/issues/502>`_)
1399 * We now use Git's default merge message when merging branches.
1400 (`#508 <https://github.com/git-cola/git-cola/issues/508>`_)
1402 * Miscellaneous fixes
1403 (`#485 <https://github.com/git-cola/git-cola/pull/485>`_)
1408 * git-cola's documentation no longer uses an intersphinx link mapping
1409 to docs.python.org. This fixes warnings when building rpms using koji,
1410 where network access is prevented.
1412 https://bugzilla.redhat.com/show_bug.cgi?id=1231812
1419 Usability, bells and whistles
1420 -----------------------------
1422 * The Interactive Rebase feature now works on Windows!
1423 (`#463 <https://github.com/git-cola/git-cola/issues/463>`_)
1425 * The `diff` editor now understands vim-style `hjkl` navigation hotkeys.
1426 (`#476 <https://github.com/git-cola/git-cola/issues/476>`_)
1428 * `Alt-{j,k}` navigation hotkeys were added to allow changing to the
1429 next/previous file from the diff and commit editors.
1431 * The `Rename branch` menu action is now disabled in empty repositories.
1432 (`#475 <https://github.com/git-cola/git-cola/pull/475>`_)
1433 (`#459 <https://github.com/git-cola/git-cola/issues/459>`_)
1435 * `git cola` now checks unmerged files for conflict markers before
1436 staging them. This feature can be disabled in the preferences.
1437 (`#464 <https://github.com/git-cola/git-cola/issues/464>`_)
1439 * `git dag` now remembers which commits were selected when refreshing
1440 so that it can restore the selection afterwards.
1441 (`#480 <https://github.com/git-cola/git-cola/issues/480>`_)
1443 * "Launch Editor", "Launch Difftool", "Stage/Unstage",
1444 and "Move Up/Down" hotkeys now work when the commit message
1446 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1448 * The diff editor now supports the `Ctrl+u` hotkey for reverting
1449 diff hunks and selected lines.
1451 * The `core.commentChar` Git configuration value is now honored.
1452 Commit messages and rebase instruction sheets will now use
1453 the configured character for comments. This allows having
1454 commit messages that start with `#` when `core.commentChar`
1455 is configured to its non-default value.
1456 (`#446 <https://github.com/git-cola/git-cola/issues/446>`_)
1461 * Diff syntax highlighting was improved to handle more edge cases
1462 and false positives.
1463 (`#467 <https://github.com/git-cola/git-cola/pull/467>`_)
1465 * Setting commands in the interactive rebase editor was fixed.
1466 (`#472 <https://github.com/git-cola/git-cola/issues/472>`_)
1468 * git-cola no longer clobbers the Ctrl+Backspace text editing shortcut
1469 in the commit message editor.
1470 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1472 * The copy/paste clipboard now persists after `git cola` exits.
1473 (`#484 <https://github.com/git-cola/git-cola/issues/484>`_)
1482 * Fixed the "Sign off" feature in the commit message editor.
1489 Usability, bells and whistles
1490 -----------------------------
1491 * Double-click will now choose a commit in the "Select commit" dialog.
1493 * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the
1494 commit message when a merge is in-progress. Upon refresh, `git cola` will
1495 now detect when a merge has completed and reset the commit message back to
1496 its previous state. It is only reset if the editor contains a message
1497 that was read from the file and has not been manually edited by the user.
1499 * The commit message editor's context menu now has a "Clear..." action for
1500 clearing the message across both the summary and description fields.
1502 * Traditional Chinese (Taiwan) translation updates.
1504 * The system theme's icons are now used wherever possible.
1505 (`#458 <https://github.com/git-cola/git-cola/pull/458>`_)
1509 * The stash viewer now uses ``git show --no-ext-diff`` to avoid running
1510 user-configured diff tools.
1512 * `git cola` now uses the `setsid()` system call to ensure that the
1513 `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing
1514 changes using `git`. The askpass helpers will now be used even when
1515 `git cola` is launched from a terminal.
1517 The behavior without `setsid()` is that `git cola` can appear to hang while
1518 pushing changes. The hang happens when `git` prompts the user for a
1519 password using the terminal, but the user never sees the prompt. `setsid()`
1520 detaches the terminal, which ensures that the askpass helpers are used.
1521 (`#218 <https://github.com/git-cola/git-cola/issues/218>`_)
1522 (`#262 <https://github.com/git-cola/git-cola/issues/262>`_)
1523 (`#377 <https://github.com/git-cola/git-cola/issues/377>`_)
1525 * `git dag`'s file list tool was updated to properly handle unicode paths.
1527 * `gnome-terminal` is no longer used by default when `cola.terminal` is unset.
1528 It is broken, as was detailed in #456.
1529 (`#456 <https://github.com/git-cola/git-cola/issues/456>`_)
1531 * The interactive rebase feature was not always setting `$GIT_EDITOR`
1532 to the value of `gui.editor`, thus there could be instances where rebase
1533 will seem to not stop, or hang, when performing "reword" actions.
1535 We now set the `$GIT_EDITOR` environment variable when performing the
1536 "Continue", "Skip", and "Edit Todo" rebase actions so that the correct
1537 editor is used during the rebase.
1538 (`#445 <https://github.com/git-cola/git-cola/issues/445>`_)
1542 * `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y"
1543 version number. Most of our releases tend to contain new features.
1549 Usability, bells and whistles
1550 -----------------------------
1551 * Updated zh_TW translations.
1553 * `git cola rebase` now defaults to `@{upstream}`, and generally uses the same
1554 CLI syntax as `git rebase`.
1556 * The commit message editor now allows you to bypass commit hooks by selecting
1557 the "Bypass Commit Hooks" option. This is equivalent to passing the
1558 `--no-verify` option to `git commit`.
1559 (`#357 <https://github.com/git-cola/git-cola/issues/357>`_)
1561 * We now prevent the "Delete Files" action from creating a dialog that does
1563 (`#378 <https://github.com/git-cola/git-cola/issues/378>`_)
1565 * `git xbase` learned to edit rebase instruction sheets that contain
1568 * The diff colors are now configurable. `cola.color.{text,add,remove,header}`
1569 can now be set with 6-digit hexadecimal colors.
1570 See the `git cola manual <https://git-cola.readthedocs.io/en/latest/git-cola.html#configuration-variables>_`
1573 * Improved hotkey documentation.
1577 * `git cola` will now allow starting an interactive rebase with a dirty
1578 worktree when `rebase.autostash` is set.
1579 (`#360 <https://github.com/git-cola/git-cola/issues/360>`_)
1585 Usability, bells and whistles
1586 -----------------------------
1587 * A new "Find files" widget was added, and can be activated by
1588 using the `Ctrl+t` or `t` hotkeys.
1590 * A new `git cola find` sub-command was added for finding files.
1592 * `git cola` now remembers the text cursor's position when staging
1593 interactively with the keyboard. This makes it easier to use the keyboard
1594 arrows to select and stage lines.
1596 * The completion widgets will now select the top completion item
1597 when `Enter` or `Return` are pressed.
1599 * You can now refresh using `F5` in addition to the existing `Ctrl+R` hotkey.
1603 * `git cola` now passes `--no-abbrev-commit` to `git log` to override
1604 having `log.abbrevCommit = true` set in `.gitconfig`.
1610 Usability, bells and whistles
1611 -----------------------------
1612 * `git dag` now forwards all unknown arguments along to `git log`.
1613 (`#389 <https://github.com/git-cola/git-cola/issues/389>`_)
1615 * Line-by-line interactive staging was made more robust.
1616 (`#399 <https://github.com/git-cola/git-cola/pull/399>`_)
1618 * "Bookmarks" was renamed to "Favorites".
1619 (`#392 <https://github.com/git-cola/git-cola/issues/392>`_)
1621 * Untracked files are now displayed using a unique icon.
1622 (`#388 <https://github.com/git-cola/git-cola/pull/388>`_)
1626 * `git dag` was triggering a traceback on Fedora when parsing Git logs.
1627 (`bz #181676 <https://bugzilla.redhat.com/show_bug.cgi?id=1181686>`_)
1629 * inotify expects unicode paths on Python3.
1630 (`#393 <https://github.com/git-cola/git-cola/pull/393>`_)
1632 * Untracked files are now assumed to be utf-8 encoded.
1633 (`#401 <https://github.com/git-cola/git-cola/issues/401>`_)
1639 Usability, bells and whistles
1640 -----------------------------
1641 * `git cola` can now create GPG-signed commits and merges.
1642 See the documentation for details about setting up a GPG agent.
1643 (`#149 <https://github.com/git-cola/git-cola/issues/149>`_)
1645 * The status widget learned to copy relative paths when `Ctrl+x` is pressed.
1646 (`#358 <https://github.com/git-cola/git-cola/issues/358>`_)
1648 * Custom GUI actions can now define their own keyboard shortcuts by
1649 setting `guitool.$name.shortcut` to a string understood by Qt's
1650 `QAction::setShortcut()` API, e.g. `Alt+X`.
1652 `Qt docs <http://qt-project.org/doc/qt-4.8/qkeysequence.html#QKeySequence-2>`_
1653 for more details about the supported values.
1655 * `git cola` learned to rename branches.
1656 (`#364 <https://github.com/git-cola/git-cola/pull/364>`_)
1657 (`#278 <https://github.com/git-cola/git-cola/issues/278>`_)
1659 * `git dag` now has a "Show history" context menu which can be used to filter
1660 history using the selected paths.
1664 * `sphinxtogithub.py` was fixed for Python3.
1665 (`#353 <https://github.com/git-cola/git-cola/pull/353>`_)
1667 * The commit that changed how we read remotes from `git remote`
1668 to parsing `git config` was reverted since it created problems
1671 * Fixed a crash when using the `rebase edit` feature.
1672 (`#351 <https://github.com/git-cola/git-cola/issues/351>`_)
1674 * Better drag-and-drop behavior when dropping into gnome-terminal.
1675 (`#373 <https://github.com/git-cola/git-cola/issues/373>`_)
1679 * The `git-cola-folder-handler.desktop` file handler was fixed
1680 to pass validation by `desktop-file-validate`.
1681 (`#356 <https://github.com/git-cola/git-cola/issues/356>`_)
1683 * The `git.svg` icon was renamed to `git-cola.svg`, and `git cola` was taught
1684 to prefer icons from the desktop theme when available.
1690 Usability, bells and whistles
1691 -----------------------------
1692 * New hotkey: `Ctrl+Shift+M` merges branches.
1694 * New hotkey: `Ctrl+R` refreshes the DAG viewer.
1695 (`#347 <https://github.com/git-cola/git-cola/issues/347>`_)
1699 * We now use `git config` to parse the list of remotes
1700 instead of parsing the output of `git remote`, which
1701 is a Git porcelain and should not be used by scripts.
1703 * Avoid "C++ object has been deleted" errors from PyQt4.
1704 (`#346 <https://github.com/git-cola/git-cola/issues/346>`_)
1708 * The `make install` target now uses `install` instead of `cp`.
1714 Usability, bells and whistles
1715 -----------------------------
1716 * Updated Brazillian Portuguese translation.
1718 * The status and browse widgets now allow drag-and-drop into
1719 external applications.
1720 (`#335 <https://github.com/git-cola/git-cola/issues/335>`_)
1722 * We now show a progress bar when cloning repositories.
1723 (`#312 <https://github.com/git-cola/git-cola/issues/312>`_)
1725 * The bookmarks widget was simplified to not need a
1727 (`#289 <https://github.com/git-cola/git-cola/issues/289>`_)
1729 * Updated Traditional Chinese translation.
1731 * We now display a warning when trying to rebase with uncommitted changes.
1732 (`#338 <https://github.com/git-cola/git-cola/issues/338>`_)
1734 * The status widget learned to filter paths.
1735 `Ctrl+Shift+S` toggles the filter widget.
1736 (`#337 <https://github.com/git-cola/git-cola/issues/337>`_)
1737 (`#339 <https://github.com/git-cola/git-cola/pull/339>`_)
1739 * The status widget learned to move files to the trash
1740 when the `send2trash <https://github.com/hsoft/send2trash>`_
1741 module is installed.
1742 (`#341 <https://github.com/git-cola/git-cola/issues/341>`_)
1744 * "Recent repositories" is now a dedicated widget.
1745 (`#342 <https://github.com/git-cola/git-cola/issues/342>`_)
1747 * New Spanish translation thanks to Pilar Molina Lopez.
1748 (`#344 <https://github.com/git-cola/git-cola/pull/344>`_)
1752 * Newly added remotes are now properly seen by the fetch/push/pull dialogs.
1753 (`#343 <https://github.com/git-cola/git-cola/issues/343>`_)
1759 Usability, bells and whistles
1760 -----------------------------
1761 * New Brazillian Portuguese translation thanks to Vitor Lobo.
1763 * New Indonesian translation thanks to Samsul Ma'arif.
1765 * Updated Simplified Chinese translation thanks to Zhang Han.
1767 * `Ctrl+Backspace` is now a hotkey for "delete untracked files" in
1770 * Fetch/Push/Pull dialogs now use the configured remote of the current
1772 (`#324 <https://github.com/git-cola/git-cola/pull/324>`_)
1776 * We now use `os.getcwd()` on Python3.
1777 (`#316 <https://github.com/git-cola/git-cola/pull/316>`_)
1778 (`#326 <https://github.com/git-cola/git-cola/pull/326>`_)
1780 * The `Ctrl+P` hotkey was overloaded to both "push" and "cherry-pick",
1781 so "cherry-pick" was moved to `Ctrl+Shift+C`.
1783 * Custom GUI tools with mixed-case names are now properly supported.
1785 * "Diff Region" is now referred to as "Diff Hunk" for consistency
1786 with common terminology from diff/patch tools.
1787 (`#328 <https://github.com/git-cola/git-cola/issues/328>`_)
1789 * git-cola's test suite is now portable to MS Windows.
1790 (`#332 <https://github.com/git-cola/git-cola/pull/332>`_)
1796 Usability, bells and whistles
1797 -----------------------------
1798 * We now handle the case when inotify `add_watch()` fails
1799 and display instructions on how to increase the number of watches.
1800 (`#263 <https://github.com/git-cola/git-cola/issues/263>`_)
1802 * New and improved zh_TW localization thanks to V字龍(Vdragon).
1803 (`#265 <https://github.com/git-cola/git-cola/pull/265>`_)
1804 (`#267 <https://github.com/git-cola/git-cola/pull/267>`_)
1805 (`#268 <https://github.com/git-cola/git-cola/pull/268>`_)
1806 (`#269 <https://github.com/git-cola/git-cola/issues/269>`_)
1807 (`#270 <https://github.com/git-cola/git-cola/pull/270>`_)
1808 (`#271 <https://github.com/git-cola/git-cola/pull/271>`_)
1809 (`#272 <https://github.com/git-cola/git-cola/pull/272>`_)
1811 * New hotkeys: `Ctrl+F` for fetch, `Ctrl+P` for push,
1812 and `Ctrl+Shift+P` for pull.
1814 * The bookmarks widget's context menu actions were made clearer.
1815 (`#281 <https://github.com/git-cola/git-cola/issues/281>`_)
1817 * The term "Staging Area" is used consistently in the UI
1818 to allow for better localization.
1819 (`#283 <https://github.com/git-cola/git-cola/issues/283>`_)
1821 * The "Section" term is now referred to as "Diff Region"
1823 (`#297 <https://github.com/git-cola/git-cola/issues/297>`_)
1825 * The localization documentation related to the LANGUAGE
1826 environment variable was improved.
1827 (`#293 <https://github.com/git-cola/git-cola/pull/293>`_)
1829 * The "Actions" panel now contains tooltips for each button
1830 in case the button labels gets truncated by Qt.
1831 (`#292 <https://github.com/git-cola/git-cola/issues/292>`_)
1833 * Custom `git config`-defined actions can now be run in the
1834 background by setting `guitool.<name>.background` to `true`.
1838 * We now use bold fonts instead of SmallCaps to avoid
1839 artifacts on several configurations.
1841 * We now pickup `user.email`, `cola.tabwidth`, and similar settings
1842 when defined in /etc/gitconfig.
1843 (`#259 <https://github.com/git-cola/git-cola/issues/259>`_)
1845 * Better support for unicode paths when using inotify.
1846 (`bz #1104181 <https://bugzilla.redhat.com/show_bug.cgi?id=1104181>`_)
1848 * Unicode fixes for non-ascii locales.
1849 (`#266 <https://github.com/git-cola/git-cola/issues/266>`_)
1850 (`#273 <https://github.com/git-cola/git-cola/issues/273>`_)
1851 (`#276 <https://github.com/git-cola/git-cola/issues/276>`_)
1852 (`#282 <https://github.com/git-cola/git-cola/issues/282>`_)
1853 (`#298 <https://github.com/git-cola/git-cola/issues/298>`_)
1854 (`#302 <https://github.com/git-cola/git-cola/issues/302>`_)
1855 (`#303 <https://github.com/git-cola/git-cola/issues/303>`_)
1856 (`#305 <https://github.com/git-cola/git-cola/issues/305>`_)
1858 * Viewing history from the file browser was fixed for Python3.
1859 (`#274 <https://github.com/git-cola/git-cola/issues/274>`_)
1861 * setup.py was fixed to install the `*.rst` documentation.
1862 (`#279 <https://github.com/git-cola/git-cola/issues/279>`_)
1864 * Patch export was fixed for Python3.
1865 (`#290 <https://github.com/git-cola/git-cola/issues/290>`_)
1867 * Fixed adding a bookmark with trailing slashes.
1868 (`#295 <https://github.com/git-cola/git-cola/pull/295>`_)
1870 * The default `git dag` layout is now setup so that its widgets
1871 can be freely resized on Linux.
1872 (`#299 <https://github.com/git-cola/git-cola/issues/299>`_)
1874 * Invalid tag names are now reported when creating tags.
1875 (`#296 <https://github.com/git-cola/git-cola/pull/296>`_)
1881 Usability, bells and whistles
1882 -----------------------------
1883 * `git cola` no longer prompts after successfully creating a new branch.
1884 (`#251 <https://github.com/git-cola/git-cola/pull/251>`_)
1886 * Hitting enter on simple dialogs now accepts them.
1887 (`#255 <https://github.com/git-cola/git-cola/pull/255>`_)
1891 * `git dag` no longer relies on `sys.maxint`, which is
1892 not available in Python3.
1893 (`#249 <https://github.com/git-cola/git-cola/issues/249>`_)
1895 * Python3-related fixes.
1896 (`#254 <https://github.com/git-cola/git-cola/pull/254>`_)
1898 * Python3-on-Windows-related fixes.
1899 (`#250 <https://github.com/git-cola/git-cola/pull/250>`_)
1900 (`#252 <https://github.com/git-cola/git-cola/pull/252>`_)
1901 (`#253 <https://github.com/git-cola/git-cola/pull/253>`_)
1903 * Switching repositories using the bookmarks widget was not
1904 refreshing the inotify watcher.
1905 (`#256 <https://github.com/git-cola/git-cola/pull/256>`_)
1907 * Special commit messages trailers (e.g. "Acked-by:") are now special-cased to
1908 fix word wrapping lines that start with "foo:".
1909 (`#257 <https://github.com/git-cola/git-cola/issues/257>`_)
1911 * `git dag` sometimes left behind selection artifacts.
1912 We now refresh the view to avoid them.
1913 (`#204 <https://github.com/git-cola/git-cola/issues/204>`_)
1919 Usability, bells and whistles
1920 -----------------------------
1921 * Better inotify support for file creation and deletion.
1922 (`#240 <https://github.com/git-cola/git-cola/issues/240>`_)
1924 * `git cola` now supports the X11 Session Management Protocol
1925 and remembers its state across logout/reboot.
1926 (`#164 <https://github.com/git-cola/git-cola/issues/164>`_)
1928 * `git cola` has a new icon.
1929 (`#190 <https://github.com/git-cola/git-cola/issues/190>`_)
1933 * Building the documentation no longer requires `asciidoc`.
1934 We now use `Sphinx <http://sphinx-doc.org/>`_ for building
1935 html documentation and man pages.
1939 * Reworked the git-dag gravatar icon code to avoid a unicode
1942 * Commit message line-wrapping was made to better match the GUI editor.
1943 (`#242 <https://github.com/git-cola/git-cola/issues/242>`_)
1945 * Better support for Python3 on Windows
1946 (`#246 <https://github.com/git-cola/git-cola/issues/246>`_)
1950 * git-cola no longer depends on Asciidoc for building its documentation
1951 and man-pages. We now depend on [Sphinx](http://sphinx-doc.org/) only.
1957 Usability, bells and whistles
1958 -----------------------------
1959 * Some context menu actions are now hidden when selected
1961 (`#238 <https://github.com/git-cola/git-cola/issues/238>`_)
1965 * The build-git-cola.sh contrib script was improved.
1966 (`#235 <https://github.com/git-cola/git-cola/pull/235>`_)
1968 * Non-ascii worktrees work properly again.
1969 (`#234 <https://github.com/git-cola/git-cola/issues/234>`_)
1971 * The browser now guards itself against missing files.
1972 (`bz #1041378 <https://bugzilla.redhat.com/show_bug.cgi?id=1071378>`_)
1974 * Saving widget state now works under Python3.
1975 (`#236 <https://github.com/git-cola/git-cola/pull/236>`_)
1983 * git-cola now runs on Python 3 thanks to Virgil Dupras.
1984 (`#233 <https://github.com/git-cola/git-cola/pull/233>`_)
1986 * Python 2.6, 2.7, and 3.2+ are now supported.
1987 Python 2.5 is no longer supported.
1991 * i18n test fixes thanks to Virgil Dupras.
1992 (`#231 <https://github.com/git-cola/git-cola/pull/231>`_)
1994 * git-cola.app build fixes thanks to Maicon D. Filippsen.
1995 (`#230 <https://github.com/git-cola/git-cola/pull/230>`_)
1997 * Lots of pylint improvements thanks to Alex Chernetz.
1998 (`#229 <https://github.com/git-cola/git-cola/pull/229>`_)
2004 Usability, bells and whistles
2005 -----------------------------
2006 * The new `Bookmarks` tool makes it really easy to switch between repositories.
2008 * There is now a dedicated dialog for applying patches.
2009 See the ``File -> Apply Patches`` menu item.
2010 (`#215 <https://github.com/git-cola/git-cola/issues/215>`_)
2012 * A new `git cola am` sub-command was added for applying patches.
2016 * Fixed a typo that caused inotify events to be silently ignored.
2018 * Fixed the sys.path setup for Mac OS X (Homebrew).
2019 (`#221 <https://github.com/git-cola/git-cola/issues/221>`_)
2021 * Lots of pylint fixes thanks to Alex Chernetz.
2027 Usability, bells and whistles
2028 -----------------------------
2029 * `git cola --amend` now starts the editor in `amend` mode.
2030 (`#187 <https://github.com/git-cola/git-cola/issues/187>`_)
2032 * Multiple lines of text can now be pasted into the `summary` field.
2033 All text beyond the first newline will be automatically moved to the
2034 `extended description` field.
2035 (`#212 <https://github.com/git-cola/git-cola/issues/212>`_)
2039 * Stray whitespace in `.git` files is now ignored.
2040 (`#213 <https://github.com/git-cola/git-cola/issues/213>`_)
2042 * Fix "known incorrect sRGB profile" in `staged-item.png`.
2043 (`gentoo-devel message #85066
2044 <http://comments.gmane.org/gmane.linux.gentoo.devel/85066>`_)
2052 * Fix a traceback when `git push` fails.
2053 (`bz #1034778 <https://bugzilla.redhat.com/show_bug.cgi?id=1034778>`_)
2057 * Most of the git-cola sub-packages have been removed.
2058 The only remaining packages are `cola`, `cola.models`,
2061 * The translation file for Simplified Chinese was renamed
2063 (`#209 <https://github.com/git-cola/git-cola/issues/209>`_)
2071 * `git cola version --brief` now prints the brief version number.
2075 * Resurrected the "make dist" target, for those that prefer to create
2078 * Fixed the typo that broke the preferences dialog.
2084 Usability, bells and whistles
2085 -----------------------------
2086 * We now ship a full-featured interactive `git rebase` editor.
2087 The rebase todo file is edited using the `git xbase` script which
2088 is provided at `$prefix/share/git-cola/bin/git-xbase`.
2089 This script can be used standalone by setting the `$GIT_SEQUENCE_EDITOR`
2090 before running `git rebase --interactive`.
2091 (`#1 <https://github.com/git-cola/git-cola/issues/1>`_)
2093 * Fixup commit messages can now be loaded from the commit message editor.
2095 * Tool widgets can be locked in place by using the "Tools/Lock Layout"
2097 (`#202 <https://github.com/git-cola/git-cola/issues/202>`_)
2099 * You can now push to several remotes simultaneously by selecting
2100 multiple remotes in the "Push" dialog.
2101 (`#148 <https://github.com/git-cola/git-cola/issues/148>`_)
2103 * The `grep` tool learned to search using three different modes:
2104 basic regular expressions (default), extended regular expressions,
2109 * `git cola` now depends on the `argparse` Python module.
2110 This module is part of the stdlib in Python 2.7 and must
2111 be installed separately when using Python 2.6 and below.
2115 * Support unicode in the output from `fetch`, `push`, and `pull`.
2121 Usability, bells and whistles
2122 -----------------------------
2123 * We now detect when the editor or history browser are misconfigured.
2124 (`#197 <https://github.com/git-cola/git-cola/issues/197>`_)
2125 (`bz #886826 <https://bugzilla.redhat.com/show_bug.cgi?id=886826>`_)
2127 * Display of untracked files can be disabled from the Preferences dialog
2128 or by setting the `gui.displayuntracked` configuration variable to `false`.
2129 (`Git Mailing List on 2013-08-21
2130 <https://public-inbox.org/git/20130821032913.GA6092@wheezy.local/>`_)
2134 * Unicode stash names are now supported
2135 (`#198 <https://github.com/git-cola/git-cola/issues/198>`_)
2137 * The diffs produced when reverting workspace changes were made more robust.
2143 Usability, bells and whistles
2144 -----------------------------
2145 * Brand new German translation thanks to Sven Claussner.
2147 * The "File" menu now provides a "New Repository..." menu action.
2149 * `git dag` now uses a dock-widget interface so that its widgets can
2150 be laid-out and arranged. Customizations are saved and restored
2151 the next time `git dag` is launched.
2153 * `git dag` now has a "Zoom Best Fit" button next alongside the
2154 "Zoom In" and "Zoom Out" buttons.
2156 * `Ctrl+L` now focuses the "Search" field in the `git dag` tool.
2158 * Right-clicking in the "diff" viewer now updates the cursor position
2159 before performing actions, which makes it much easier to click around
2160 and selectively stage sections. Previously, the current cursor position
2161 was used which meant that it required two clicks (left-click to update
2162 the position followed by right-click to get the context menu) for the
2163 desired section to be used. This is now a single right-click operation.
2165 * The `Ctrl+D` "Launch Diff Tool" action learned to automatically choose
2166 between `git difftool` and `git mergetool`. If the file is unmerged then
2167 we automatically launch `git mergetool` on the path, otherwise we use
2168 `git difftool`. We do this because `git difftool` is not intended to
2169 be used on unmerged paths. Automatically using `git mergetool` when
2170 appropriate is the most intuitive and muscle-memory-friendly thing to do.
2172 * You can now right-click on folders in your standard file browser
2173 and choose "Open With -> Git Cola" (Linux-only).
2177 * Python 2.6 on Mac OS X Snow Leopard does not provide a namedtuple
2178 at `sys.version_info`. We now avoid using that variable for better
2181 * We now read the user's Git configuration from `~/.config/git/config`
2182 if that file is available, otherwise we use the traditional `~/.gitconfig`
2183 path, just like Git itself.
2185 * Some edge cases were fixed when applying partial/selected diffs.
2187 * The diff viewer is now properly cleared when refreshing.
2188 (`#194 <https://github.com/git-cola/git-cola/issues/194>`_)
2194 Usability, bells and whistles
2195 -----------------------------
2196 * The diff viewer now has an "Options" menu which can be
2197 used to set "git diff" options. This can be used to
2198 ignore whitespace changes or to show a change with its
2199 surrounding function as context.
2200 (`#150 <https://github.com/git-cola/git-cola/issues/150>`_)
2202 * `git cola` now remembers your commit message and will restore it
2203 when `git cola` is restarted.
2204 (`#175 <https://github.com/git-cola/git-cola/pull/175>`_)
2206 * `Ctrl+M` can now be used to toggle the "Amend last commit"
2207 checkbox in the commit message editor.
2208 (`#161 <https://github.com/git-cola/git-cola/pull/161>`_)
2210 * Deleting remote branches can now be done from the "Branch" menu.
2211 (`#152 <https://github.com/git-cola/git-cola/issues/152>`_)
2213 * The commit message editor now has a built-in spell checker.
2217 * We now avoid invoking external diffs when showing diffstats.
2218 (`#163 <https://github.com/git-cola/git-cola/pull/163>`_)
2220 * The `Status` tool learned to reselect files when refreshing.
2221 (`#165 <https://github.com/git-cola/git-cola/issues/165>`_)
2223 * `git cola` now remembers whether it has been maximized and will restore the
2224 maximized state when `git cola` is restarted.
2225 (`#172 <https://github.com/git-cola/git-cola/issues/172>`_)
2227 * Performance is now vastly improved when staging hundreds or
2230 * `git cola` was not correctly saving repo-specific configuration.
2231 (`#174 <https://github.com/git-cola/git-cola/issues/174>`_)
2233 * Fix a UnicodeDecode in sphinxtogithub when building from source.
2240 Usability, bells and whistles
2241 -----------------------------
2242 * We now automatically remove missing repositories from the
2243 "Select Repository" dialog.
2244 (`#145 <https://github.com/git-cola/git-cola/issues/145>`_)
2246 * A new `git cola diff` sub-command was added for diffing changed files.
2250 * The inotify auto-refresh feature makes it difficult to select text in
2251 the "diff" editor when files are being continually modified by another
2252 process. The auto-refresh causes it to lose the currently selected text,
2253 which is not wanted. We now avoid this problem by saving and restoring
2254 the selection when refreshing the editor.
2255 (`#155 <https://github.com/git-cola/git-cola/issues/155>`_)
2257 * More strings have been marked for l10n.
2258 (`#157 <https://github.com/git-cola/git-cola/issues/157>`_)
2260 * Fixed the Alt+D Diffstat shortcut.
2261 (`#159 <https://github.com/git-cola/git-cola/issues/159>`_)
2265 * Better error handling when cloning repositories.
2267 We were not handling the case where a git URL has
2268 no basename, e.g. `https://git.example.com/`.
2269 `git cola` originally rejected these URLs instead of
2270 allowing users to clone them. It now allows these URLs
2271 when they point to valid git repositories.
2273 Additionally, `git cola` learned to echo the errors
2274 reported by `git clone` when it fails.
2275 (`#156 <https://github.com/git-cola/git-cola/issues/156>`_)
2282 Usability, bells and whistles
2283 -----------------------------
2284 * `git dag` got a big visual upgrade.
2286 * `Ctrl+G` now launches the "Grep" tool.
2288 * `Ctrl+D` launches difftool and `Ctrl+E` launches your editor
2289 when in the diff panel.
2291 * git-cola can now be told to use an alternative language.
2292 For example, if the native language is German and we want git-cola to
2293 use English then we can create a `~/.config/git-cola/language` file with
2294 "en" as its contents: ``echo en >~/.config/git-cola/language``
2295 (`#140 <https://github.com/git-cola/git-cola/issues/140>`_)
2297 * A new `git cola merge` sub-command was added for merging branches.
2299 * Less blocking in the main UI
2303 * Autocomplete issues on KDE
2304 (`#144 <https://github.com/git-cola/git-cola/issues/144>`_)
2306 * The "recently opened repositories" startup dialog did not
2307 display itself in the absence of bookmarks.
2308 (`#139 <https://github.com/git-cola/git-cola/issues/139>`_)
2315 Usability, bells and whistles
2316 -----------------------------
2317 * `git cola` learned to honor `.gitattributes` when showing and
2318 interactively applying diffs. This makes it possible to store
2319 files in git using a non-utf-8 encoding and `git cola` will
2320 properly accept them. This must be enabled by settings
2321 `cola.fileattributes` to true, as it incurs a small performance
2323 (`#96 <https://github.com/git-cola/git-cola/issues/96>`_)
2325 * `git cola` now wraps commit messages at 72 columns automatically.
2326 This is configurable using the `cola.linebreak` variable to enable/disable
2327 the feature, and `cola.textwidth` to configure the limit.
2328 (`#133 <https://github.com/git-cola/git-cola/issues/133>`_)
2330 * A new "Open Recent" sub-menu was added to the "File" menu.
2331 This makes it easy to open a recently-edited repository.
2332 (`#135 <https://github.com/git-cola/git-cola/issues/135>`_)
2334 * We now show a preview for untracked files when they are clicked
2335 using the `Status` tool.
2336 * A new "Open Using Default Application" action was added to the
2337 `Status` tool. It is activated using either `Spacebar` or through
2338 the context menu. This action uses `xdg-open` on Linux and
2340 * A new "Open Parent Directory" action was added to the `Status` tool.
2341 It is activated using either `Shift+Spacebar` or through the
2343 * `git dag` learned to honor the `log.date` git configuration variable.
2344 This makes the date display follow whatever format the user has
2346 * A new `git cola config` sub-command was added for quickly
2347 tweaking `git cola`'s git configuration settings.
2348 * Some small usability tweaks -- some user confirmation prompts
2349 were defaulting to "Cancel" when they should have been defaulting
2350 to the affirmative option instead.
2354 * Properly handle arbitrarily-named branches.
2355 * We went back to launching `git mergetool` using an xterm.
2356 The reason is that there are a couple of places where `git mergetool`
2357 requires a terminal for user interaction not covered by `--no-prompt`.
2358 * We now properly handle an edge case when applying short diffs at
2359 the start of a file.
2366 Usability, bells and whistles
2367 -----------------------------
2368 * New and improved `grep` mode lets you instantly find and edit files.
2369 * New `git cola grep` standalone mode.
2370 * Support for passing arguments to the configured editors, e.g. `gvim -p`
2371 This makes it possible to select multiple files in the status
2372 window and use `Ctrl-e` to edit them all at once.
2373 * Remote operations now prompt on errors only.
2374 * The `Tab` key now jumps to the extended description when editing the summary.
2375 * More shortcut key labels and misc. UX improvements.
2379 * Selecting an item no longer copies its filename to the copy/paste buffer.
2380 `Ctrl-c` or the "Copy" context-menu action can be used instead.
2381 * The repository monitoring feature on Windows learned to ignore
2382 changes within the ".git" directory. Thanks to Andreas Sommer.
2383 (`#120 <https://github.com/git-cola/git-cola/issues/120>`_)
2390 Usability, bells and whistles
2391 -----------------------------
2392 * `git dag` learned to color-code branchy edges.
2393 The edge colors change when a new branch is detected,
2394 which makes the history much easier to follow.
2395 A huge thanks to Uri Okrent for making it happen.
2397 * New GUI for editing remote repositories.
2399 * New `git cola archive` and `git cola remote` sub-commands.
2401 * `git cola browser` learned an 'Untrack' command.
2403 * The diff editor learned to staged/unstaged while amending.
2405 * The status tool can now scroll horizontally.
2407 * New git repositories can be created by clicking 'New' on the
2408 `git cola --prompt` startup screen.
2415 Usability, bells and whistles
2416 -----------------------------
2417 * Auto-completion was added to more tools.
2419 * `git dag` is easier to use on smaller displays -- the author
2420 field elides its text which allows for a more compact display.
2422 * Selected commits in `git dag` were made more prominent and
2425 * 'Create Branch' learned to fetch remote branches and uses a
2426 background thread to do so.
2428 * User-configured GUI tools are listed alphabetically in the 'Actions' menu.
2430 * The 'Pull' dialog remembers the value of the 'Rebase' checkbox
2431 between invocations.
2440 * Detect Homebrew so that OS X users do not need to set PYTHONPATH.
2442 * `git dag` can export patches again.
2449 Usability, bells and whistles
2450 -----------------------------
2451 * The 'Classic' tool was renamed to 'Browser' and learned to
2452 limit history to the current branch.
2454 * `git dag` learned about gravatar and uses it to show images
2457 * `git dag` learned to use OpenGL for rendering resulting in
2458 much faster rendering.
2460 * More dialogs learned vim-style keyboard shortcuts.
2462 * The commit message editor learned better arrow key navigation.
2469 Usability, bells and whistles
2470 -----------------------------
2471 * `git cola` learned a few new sub commands:
2479 * `Return` in the summary field jumps to the extended description.
2481 * `Ctrl+Return` is now a shortcut for 'Commit'.
2483 * Better French translation for 'Sign-off'.
2485 * The 'Search' widget now has a much simpler and streamlined
2488 * vim-style `h,j,k,l` navigation shortcuts were added to the DAG widget.
2490 * `git dag` no longer prompts for files when diffing commits if the
2491 text field contains paths.
2493 * General user interface and performance improvements.
2497 * The diff viewer no longer changes font size when holding `Control`
2498 while scrolling with the mouse wheel.
2500 * Files with a typechange (e.g. symlinks that become files, etc.)
2501 are now correctly identified as being modified.
2505 * The `cola.controllers` and `cola.views` packages were removed.
2512 Usability, bells and whistles
2513 -----------------------------
2514 * `git cola` can now launch sub commands, e.g.:
2525 * `git dag` is more responsive when gathering auto-completions.
2527 * Keyboard shortcuts are displayed when the '?' key is pressed.
2529 * Various keyboard shortcuts were added for improved usability.
2531 * The status widget now lists unmerged files before modified files.
2533 * vim-style `h,j,k,l` navigation shortcuts were added to the status widget.
2535 * A 'Recently Modified Files...' tool was added.
2537 * Tools can now be hidden with `Alt + #` (where `#` is a keyboard number)
2538 and focused with `Alt + Shift + #`.
2540 * The syntax highlighting colors for diffs was made less intrusive.
2542 * The commit message editor was redesigned to have a more compact
2543 and keyboard-convenient user interface.
2545 * Keyboard shortcuts for adding a Signed-off-by (`Ctrl + i`)
2546 and creating a commit (`Ctrl + m`) were added.
2548 * The status widget was adjusted to use less screen real-estate.
2552 * Avoid updating the index when responding to inotify events.
2553 This avoids interfering with operations such as `git rebase --interactive`.
2554 (`#99 <https://github.com/git-cola/git-cola/issues/99>`_)
2558 * Create `git-dag.pyw` in the win32 installer.
2560 * win32 shortcuts now contain explicit calls to `pythonw.exe` instead of
2561 calling the `.pyw` file directly.
2565 * The 'Apply Changes from Branch...' feature was removed.
2566 `git dag`'s 'Grab File...' feature used alongside the index/worktree editor
2567 is a simpler alternative.
2576 * Further enhanced the staging/unstaging behavior in the status widget.
2577 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
2579 * Unmerged files are no longer listed as modified.
2583 The `cola-$version` tarballs on github were originally setup to
2584 have the same contents as the old tarballs hosted on tuxfamily.
2585 The `make dist` target was changed to write files to a
2586 `git-cola-$version` subdirectory and tarball.
2588 This makes the filenames consistent for the source tarball,
2589 the darwin .app tarball, and the win32 .exe installer.
2596 Usability, bells and whistles
2597 -----------------------------
2598 * Refined the staging/unstaging behavior for code reviews.
2599 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
2601 * Added more styling and icons to menus and buttons.
2603 * Adjusted some terminology to more closely match the git CLI.
2607 * Boolean `git config` settings with no value are now supported
2608 (these are not created by git these days but exist in legacy repositories).
2610 * Unicode branches and tags are supported in the "branch diff" tool.
2612 * Guard against low-memory conditions and more interrupted system calls.
2616 * Added desktop launchers for git-cola.desktop and git-dag.desktop.
2617 This replaces the old cola.desktop, so some adjustments to RPM .spec
2618 and debian/ files will be needed.
2620 * Fixed the darwin app-tarball Makefile target to create relative paths.
2624 * The `--style` option was removed. `git cola` follows the system theme
2625 so there's no need for this option these days.
2632 Usability, bells and whistles
2633 -----------------------------
2634 * Export a patch series from `git dag` into a `patches/` directory.
2636 * `git dag` learned to diff commits, slice history along paths, etc.
2638 * Added instant-preview to the `git stash` widget.
2640 * A simpler preferences editor is used to edit `git config` values.
2641 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
2642 (`#89 <https://github.com/git-cola/git-cola/issues/89>`_)
2644 * Previous commit messages can be re-loaded from the message editor.
2645 (`#33 <https://github.com/git-cola/git-cola/issues/33>`_)
2649 * Display commits with no file changes.
2650 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
2652 * Improved the diff editor's copy/paste behavior
2653 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
2657 * Bumped version number to ceil(minimum git version).
2658 `git cola` now requires `git` >= 1.6.3.
2660 * Simplified git-cola's versioning when building from tarballs
2661 outside of git. We no longer check for a 'version' file at
2662 the root of the repository. We instead keep a default version
2663 in `cola/version.py` and use it when `git cola`'s `.git` repository
2671 Usability, bells and whistles
2672 -----------------------------
2673 * inotify is much snappier and available on Windows
2674 thanks to Karl Bielefeldt.
2676 * New right-click command to add untracked files to .gitignore
2677 thanks to Audrius Karabanovas.
2679 * Stash, fetch, push, and pull usability improvements
2681 * General usability improvements
2683 * stderr is logged when applying partial diffs.
2687 * Files can be unstaged when amending.
2688 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
2690 * Show the configured remote.$remote.pushurl in the GUI
2691 (`#83 <https://github.com/git-cola/git-cola/issues/83>`_)
2693 * Removed usage of the "user" module.
2694 (`#86 <https://github.com/git-cola/git-cola/issues/86>`_)
2696 * Avoids an extra `git update-index` call during startup.
2704 Usability, bells and whistles
2705 -----------------------------
2706 * We now provide better feedback when `git push` fails.
2707 (`#69 <https://github.com/git-cola/git-cola/issues/69>`_)
2709 * The Fetch, Push, and Pull dialogs now give better feedback
2710 when interacting with remotes. The dialogs are modal and
2711 a progress dialog is used.
2715 * More unicode fixes, again. It is now possible to have
2716 unicode branch names, repository paths, home directories, etc.
2717 This continued the work initiated by Redhat's bugzilla #694806.
2719 https://bugzilla.redhat.com/show_bug.cgi?id=694806
2726 Usability, bells and whistles
2727 -----------------------------
2728 * The `git cola` desktop launchers now prompt for a repo
2729 by default. This is done by using the new `--prompt`
2730 flag which tells `git cola` to ignore any git repositories
2731 in the current directory and prompt for one instead.
2735 * More Unicode fixes for repositories and home directories with
2736 embedded unicode characters. Thanks to Christian Jann for
2737 patience and helpful bug reports.
2739 * Fix the 'Clone' button in the startup dialog.
2746 Usability, bells and whistles
2747 -----------------------------
2748 * Faster startup time! `git cola` now offloads initialization
2749 to a background thread so that the GUI appears almost instantly.
2751 * Specialized diff options for p4merge, vimdiff, araxis, emerge,
2752 and ecmerge in difftool (backported from git.git).
2756 * Fix launching commands in the background on Windows
2757 (e.g. when launching `git difftool`).
2759 * Fix unicode errors when home or repository directories contain
2761 (`#74 <https://github.com/git-cola/git-cola/issues/74>`_)
2762 (`bz #694806 <https://bugzilla.redhat.com/show_bug.cgi?id=694806>`_)
2769 Usability, bells and whistles
2770 -----------------------------
2771 * The `cola classic` tool can be now configured to be dockable.
2772 (`#56 <https://github.com/git-cola/git-cola/issues/56>`_)
2774 * The `cola classic` tool now uses visual sigils to indicate a file's status.
2775 The idea and icons were provided by Uri Okrent.
2777 * Include the 'Rescan' button in the 'Actions' widget regardless
2778 of whether inotify is installed.
2782 * Fix installation of translations per Fedora
2783 This incorporates Fedora's fix for the translations path
2784 which originally appeared in cola-1.4.3-translations.patch.
2786 * Mac OS X git-cola developers can now generate git-cola.app
2787 application bundles using 'make app-bundle'.
2791 * Fixed a stacktrace when trying to use "Get Commit Message Template"
2792 with an unconfigured "commit.template" git config variable.
2793 (`bz #67521 <https://bugzilla.redhat.com/show_bug.cgi?id=675721>`_)
2794 (`#72 <https://github.com/git-cola/git-cola/issues/72>`_)
2796 * Properly raise the main window on Mac OS X.
2798 * Properly handle staging a huge numbers of files at once.
2800 * Speed up 'git config' usage by fixing cola's caching proxy.
2802 * Guard against damaged ~/.cola files.
2809 Usability, bells and whistles
2810 -----------------------------
2811 * `git dag` now has a separate display area
2812 for displaying commit metadata. This area will soon
2813 grow additional functionality such as cherry-picking,
2818 * Fixed tests from a previous refactoring.
2820 * Guard against 'diff.external' configuration by always
2821 calling 'git diff' with the '--no-ext-diff' option.
2822 (`#67 <https://github.com/git-cola/git-cola/issues/67>`_)
2824 * Respect 'gui.diffcontext' so that cola's diff display
2825 shows the correct number of context lines.
2827 * Raise the GUI so that it is in the foreground on OS X.
2831 * We now allow distutils to rewrite cola's shebang line.
2832 This allows us to run on systems where "which python"
2833 is Python3k. This is exposed by setting the `PYTHON`
2834 Makefile variable to the location of python2.x.
2836 * git-cola.app is now a tiny download because it no longer
2837 contains Qt and PyQt. These libraries are provided as a
2839 (`Link <http://code.google.com/p/git-cola/downloads/list>`_)
2846 Usability, bells and whistles
2847 -----------------------------
2848 * Clicking on paths in the status widget copies them into the
2849 copy/paste buffer for easy middle-clicking into terminals.
2851 * `Ctrl+C` in diff viewer copies the selected diff to the clipboard.
2855 * Fixed the disappearing actions buttons on PyQt 4.7.4
2856 as reported by Arch and Ubuntu 10.10.
2857 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
2859 * Fixed mouse interaction with the status widget where some
2860 items could not be de-selected.
2864 * Removed hard-coded reference to lib/ when calculating Python's
2865 site-packages directory.
2872 Usability, bells and whistles
2873 -----------------------------
2874 * Removed "single-click to (un)stage" in the status view.
2875 This is a usability improvement since we no longer perform
2876 different actions depending on where a row is clicked.
2878 * Added ability to create unsigned, annotated tags.
2882 * Updated documentation to use `cola.git` instead of `cola.gitcmd`.
2889 Usability, bells and whistles
2890 -----------------------------
2891 * Allow un/staging by right-clicking top-level items
2892 (`#57 <https://github.com/git-cola/git-cola/issues/57>`_)
2894 * Running 'commit' with no staged changes prompts to allow
2896 (`#55 <https://github.com/git-cola/git-cola/issues/55>`_)
2898 * Fetch, Push, and Pull are now available via the menus
2899 (`#58 <https://github.com/git-cola/git-cola/issues/58>`_)
2903 * Simplified the actions widget to work around a regression
2905 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
2912 Usability, bells and whistles
2913 -----------------------------
2914 * `git dag` interaction was made faster.
2918 * Added '...' indicators to the buttons for
2919 'Fetch...', 'Push...', 'Pull...', and 'Stash...'.
2920 (`#51 <https://github.com/git-cola/git-cola/issues/51>`_)
2922 * Fixed a hang-on-exit bug in the cola-provided
2923 'ssh-askpass' implementation.
2930 Usability, bells and whistles
2931 -----------------------------
2932 * Staging and unstaging is faster.
2933 (`#48 <https://github.com/git-cola/git-cola/issues/48>`_)
2935 * `git dag` reads history in a background thread.
2939 * Added :data:`cola.compat.hashlib` for `Python 2.4` compatibility
2940 * Improved `PyQt 4.1.x` compatibility.
2944 * Configured menu actions use ``sh -c`` for Windows portability.
2952 Usability, bells and whistles
2953 -----------------------------
2954 * Added support for the configurable ``guitool.<tool>.*``
2955 actions as described in the ``git config`` documentation.
2956 (`git-config(1) <https://git-scm.com/docs/git-config>`_)
2957 (`#44 <https://github.com/git-cola/git-cola/issues/44>`_)
2959 This makes it possible to add new actions to `git cola`
2960 by simply editing ``~/.gitconfig``. This implements the
2961 same guitool support as `git gui`.
2963 * Introduced a stat cache to speed up `git config` and
2964 repository status checks.
2966 * Added Alt-key shortcuts to the main `git cola` interface.
2968 * The `Actions` dock widget switches between a horizontal
2969 and vertical layout when resized.
2971 * We now use ``git diff --submodule`` for submodules
2972 (used when git >= 1.6.6).
2974 * The context menu for modified submodules includes an option
2975 to launch `git cola`.
2976 (`#17 <https://github.com/git-cola/git-cola/issues/17>`_)
2978 * Prefer ``$VISUAL`` over ``$EDITOR`` when both are defined.
2979 These are used to set a default editor in lieu of `core.editor`
2982 * Force the editor to be ``gvim`` when we see ``vim``.
2983 This prevents us from launching an editor in the (typically
2984 unattached) parent terminal and creating zombie editors
2985 that cannot be easily killed.
2987 * Selections are remembered and restored across updates.
2988 This makes the `partial-staging` workflow easier since the
2989 diff view will show the updated diff after staging.
2991 * Show the path to the current repository in a tooltip
2992 over the commit message editor.
2993 (`#45 <https://github.com/git-cola/git-cola/issues/45>`_)
2995 * Log internal ``git`` commands when ``GIT_COLA_TRACE`` is defined.
2996 (`#39 <https://github.com/git-cola/git-cola/issues/39>`_)
3000 * Improved backwards compatibility for Python 2.4.
3002 * `Review mode` can now review the current branch; it no longer
3003 requires you to checkout the branch into which the reviewed
3004 branch will be merged.
3006 * Guard against `color.ui = always` configuration when using
3007 `git log` by passing ``--no-color``.
3009 * ``yes`` and ``no`` are now supported as valid booleans
3010 by the `git config` parser.
3012 * Better defaults are used for `fetch`, `push`, and `pull`..
3013 (`#43 <https://github.com/git-cola/git-cola/issues/43>`_)
3017 * Removed colon (`:`) from the applilcation name on Windows
3018 (`#41 <https://github.com/git-cola/git-cola/issues/41>`_)
3020 * Fixed bugs with the Windows installer
3021 (`#40 <https://github.com/git-cola/git-cola/issues/40>`_)
3023 * Added a more standard i18n infrastructure. The install
3024 tree now has the common ``share/locale/$lang/LC_MESSAGES/git-cola.mo``
3025 layout in use by several projects.
3027 * Started trying to accommodate Mac OSX 10.6 (Snow Leopard)
3028 in the ``darwin/`` build scripts but our tester is yet to
3029 report success building a `.app` bundle.
3031 * Replaced use of ``perl`` in Sphinx/documentation Makefile
3032 with more-portable ``sed`` constructs. Thanks to
3033 Stefan Naewe for discovering the portability issues and
3034 providing msysgit-friendly patches.
3041 Usability, bells and whistles
3042 -----------------------------
3043 * It is now possible to checkout from the index as well
3044 as from `HEAD`. This corresponds to the
3045 `Removed Unstaged Changes` action in the `Repository Status` tool.
3047 * The `remote` dialogs (fetch, push, pull) are now slightly
3050 * Bookmarks can be selected when `git cola` is run outside of a git repository.
3052 * Added more user documentation. We now include many links to
3053 external git resources.
3055 * Added `git dag` to the available tools.
3056 `git dag` is a node-based DAG history browser.
3057 It doesn't do much yet, but it's been merged so that we can start
3058 building and improving upon it.
3062 * Fixed a missing ``import`` when showing `right-click` actions
3063 for unmerged files in the `Repository Status` tool.
3065 * ``git update-index --refresh`` is no longer run every time
3066 ``git cola version`` is run.
3068 * Don't try to watch non-existent directories when using `inotify`.
3070 * Use ``git rev-parse --symbolic-full-name`` plumbing to find
3071 the name of the current branch.
3075 * The ``Makefile`` will now conditionally include a ``config.mak``
3076 file located at the root of the project. This allows for user
3077 customizations such as changes to the `prefix` variable
3078 to be stored in a file so that custom settings do not need to
3079 be specified every time on the command-line.
3081 * The build scripts no longer require a ``.git`` directory to
3082 generate the ``builtin_version.py`` module. The release tarballs
3083 now include a ``version`` file at the root of the project which
3084 is used in lieu of having the git repository available.
3085 This allows for ``make clean && make`` to function outside of
3088 * Added maintainer's ``make dist`` target to the ``Makefile``.
3090 * The built-in `simplejson` and `jsonpickle` libraries can be
3091 excluded from ``make install`` by specifying the ``standalone=true``
3092 `make` variable. For example, ``make standalone=true install``.
3093 This corresponds to the ``--standalone`` option to ``setup.py``.
3101 Usability, bells and whistles
3102 -----------------------------
3103 * We now use patience diff by default when it is available via
3104 `git diff --patience`.
3106 * Allow closing the `cola classic` tool with `Ctrl+W`.
3110 * Fixed an unbound variable error in the `push` dialog.
3114 * Don't include `simplejson` in MANIFEST.in.
3116 * Update desktop entry to read `Cola Git GUI`.
3124 This feature release adds two new features directly from
3125 `git cola`'s github issues backlog. On the developer
3126 front, further work was done towards modularizing the code base.
3128 Usability, bells and whistles
3129 -----------------------------
3130 * Dragging and dropping patches invokes `git am`
3131 (`#3 <https://github.com/git-cola/git-cola/issues/3>`_)
3133 * A dialog to allow opening or cloning a repository
3134 is presented when `git cola` is launched outside of a git repository.
3135 (`#22 <https://github.com/git-cola/git-cola/issues/22>`_)
3137 * Warn when `push` is used to create a new branch
3138 (`#35 <https://github.com/git-cola/git-cola/issues/35>`_)
3140 * Optimized startup time by removing several calls to `git`.
3145 * `git cola` is once again compatible with PyQt 4.3.x.
3149 * `cola.gitcmds` was added to factor out git command-line utilities
3151 * `cola.gitcfg` was added for interacting with `git config`
3153 * `cola.models.browser` was added to factor out repobrowser data
3165 * Fix launching external applications on Windows
3167 * Ensure that the `amend` checkbox is unchecked when switching modes
3169 * Update the status tree when amending commits
3179 * Fix Lintian warnings
3189 * Fix X11 warnings on application startup
3199 * Added missing 'Exit Diff Mode' button for 'Diff Expression' mode
3200 (`#31 <https://github.com/git-cola/git-cola/issues/31>`_)
3202 * Fix a bug when initializing fonts on Windows
3203 (`#32 <https://github.com/git-cola/git-cola/issues/32>`_)
3213 * Keep entries in sorted order in the `cola classic` tool
3215 * Fix staging untracked files
3216 (`#27 <https://github.com/git-cola/git-cola/issues/27>`_)
3218 * Fix the `show` command in the Stash dialog
3219 (`#29 <https://github.com/git-cola/git-cola/issues/29>`_)
3221 * Fix a typo when loading merge commit messages
3222 (`#30 <https://github.com/git-cola/git-cola/issues/30>`_)
3230 This release focuses on a redesign of the git-cola user interface,
3231 a tags interface, and better integration of the `cola classic` tool.
3232 A flexible interface based on configurable docks is used to manage the
3233 various cola widgets.
3235 Usability, bells and whistles
3236 -----------------------------
3237 * New GUI is flexible and user-configurable
3239 * Individual widgets can be detached and rearranged arbitrarily
3241 * Add an interface for creating tags
3243 * Provide a fallback `SSH_ASKPASS` implementation to prompt for
3244 SSH passwords on fetch/push/pull
3246 * The commit message editor displays the current row/column and
3247 warns when lines get too long
3249 * The `cola classic` tool displays upstream changes
3251 * `git cola --classic` launches `cola classic` in standalone mode
3253 * Provide more information in log messages
3257 * Inherit the window manager's font settings
3259 * Miscellaneous PyQt4 bug fixes and workarounds
3263 * Removed all usage of Qt Designer `.ui` files
3265 * Simpler model/view architecture
3267 * Selection is now shared across tools
3269 * Centralized notifications are used to keep views in sync
3271 * The `cola.git` command class was made thread-safe
3273 * Less coupling between model and view actions
3275 * The status view was rewritten to use the MVC architecture
3277 * Added more documentation and tests
3285 Usability, bells and whistles
3286 -----------------------------
3287 * Added a `cola classic` tool for browsing the entire repository
3289 * Handle diff expressions with spaces
3291 * Handle renamed files
3295 * Handle carat `^` characters in diff expressions on Windows
3297 * Worked around a PyQt 4.5/4.6 QThreadPool bug
3301 * Added a keyboard shortcuts reference page
3303 * Added developer API documentation
3307 * Fix the diff expression used when reviewing branches
3309 * Fix a bug when pushing branches
3311 * Fix X11 warnings at startup
3313 * Fix more interrupted system calls on Mac OS X
3321 Usability, bells and whistles
3322 -----------------------------
3323 * Fresh and tasty SVG logos
3325 * Added `Branch Review` mode for reviewing topic branches
3327 * Added diff modes for diffing between tags, branches,
3328 or arbitrary `git diff` expressions
3330 * The push dialog selects the current branch by default.
3331 This is in preparation for `git 1.7.0` where unconfigured `git push`
3332 will refuse to push when run without specifying the remote name
3333 and branch. See the `git` release notes for more information
3335 * Support `open` and `clone` commands on Windows
3337 * Allow saving cola UI layouts
3339 * Re-enabled `double-click-to-stage` for unmerged entries.
3340 Disabling it for unmerged items was inconsistent, though safer.
3342 * Show diffs when navigating the status tree with the keyboard
3346 * Worked around `pyuic4` bugs in the `setup.py` build script
3348 * Added Mac OSX application bundles to the download page
3358 * `git difftool` became an official git command in `git 1.6.3`.
3360 * `git difftool` learned `--no-prompt` / `-y` and a corresponding
3361 `difftool.prompt` configuration variable
3363 Usability, bells and whistles
3364 -----------------------------
3365 * Warn when `non-fast-forward` is used with fetch, push or pull
3367 * Allow `Ctrl+C` to exit cola when run from the command line
3371 * Support Unicode font names
3373 * Handle interrupted system calls
3377 * `PEP-8`-ified more of the cola code base
3383 * All resources are now installed into `$prefix/share/git-cola`.
3384 Closed Debian bug #519972
3386 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519972
3396 * Added support for Kompare in `git difftool`
3398 * Added a separate configuration namespace for `git difftool`
3400 * Added the `diff.tool` configuration variable to define the default diff tool
3402 Usability, bells and whistles
3403 -----------------------------
3404 * The stash dialog allows passing the `--keep-index` option to `git stash`
3406 * Amending a published commit warns at commit time
3408 * Simplified the file-across-revisions comparison dialog
3410 * `origin` is selected by default in fetch/push/pull
3412 * Removed the search field from the log widget
3414 * The log window moved into a drawer widget at the bottom of the UI
3416 * Log window display can be configured with
3417 `cola.showoutput` = `{never, always, errors}`. `errors` is the default.
3419 * `NOTE` -- `cola.showoutput` was removed with the GUI rewrite in 1.4.0.
3423 * Improved nose unittest usage
3427 * Added a Windows/msysGit installer
3429 * Included private versions of `simplejson` and `jsonpickle`
3430 for ease of installation and development