8 :ref:`v3.6 <v3.6>` is the latest stable release.
13 Clone the git-cola repo to get the latest development version:
15 ``git clone git://github.com/git-cola/git-cola.git``
19 Usability, bells and whistles
20 -----------------------------
21 * The fallback `ssh-askpass` script, which provides the Username/Password
22 login dialog when performing remote operations, previously presented both
23 the username and password input fields with ``***`` asterisks.
24 The dialog now uses asterisks for the password field only.
25 (`#1026 <https://github.com/git-cola/git-cola/pull/1026>`_)
27 * Stashes can now be applied using the `Ctrl + Enter` hotkey, popped with the
28 `Ctrl + Backspace` hotkey, and dropped with the `Ctrl + Shift + Backspace`
29 hotkey when inside the stash dialog. This enables a keyboard-centric
30 mouse-free workflow when using the stash dialog.
32 * When amending a commit, `git cola` will check whether the commit has been
33 published to a remote branch using ``git branch -r --contains HEAD``.
34 This command can be slow when operating on a repository with many
35 remote branches. The new `cola.checkpublishedcommits` configuration
36 variable allows you to opt-out of this check, which improves performance
37 when amending a commit. The settings widget exposes this variable as,
38 "Check Published Commits when Amending".
39 (`#1021 <https://github.com/git-cola/git-cola/issues/1021>`_)
40 (`#1027 <https://github.com/git-cola/git-cola/pull/1027>`_)
44 * Updated Polish translation.
45 (`#1033 <https://github.com/git-cola/git-cola/pull/1033>`_)
49 * The inotify filesystem monitor now handles
50 `OSError: [Errno 24] Too many open files` errors by disabling inotify.
51 (`#1015 <https://github.com/git-cola/git-cola/issues/1015>`_)
53 * Typos in various documentation files have been fixed.
54 (`#1025 <https://github.com/git-cola/git-cola/pull/1025>`_)
56 * The "Recent Repositories" limit was off by one, and now correctly
57 remembers the configured number of repositories in the menu.
58 (`#1024 <https://github.com/git-cola/git-cola/pull/1024>`_)
60 * The "revert" action in the DAG and other tools now uses
61 ``git revert --no-edit``, which avoids launching an editor
62 when reverting the commit. Use `Ctrl+m` in the commit message
63 editor after reverting a commit to rewrite its commit message.
64 (`#1020 <https://github.com/git-cola/git-cola/issues/1020>`_)
68 Usability, bells and whistles
69 -----------------------------
70 * The remote editor is much faster since it no longer queries
71 remotes, and uses the cached information instead.
72 (`#986 <https://github.com/git-cola/git-cola/issues/986>`_)
74 * Commit message templates can now be loaded automatically by setting
75 ``git config cola.autoloadcommittemplate true``.
76 (`#1013 <https://github.com/git-cola/git-cola/pull/1013>`_)
77 (`#735 <https://github.com/git-cola/git-cola/pull/735>`_)
79 * The UI layout can now be reset back to its initial state by selecting
80 the "Reset Layout" action. This reverts the layout to the same state
81 as when the app first launched.
82 (`#1008 <https://github.com/git-cola/git-cola/pull/1008>`_)
83 (`#994 <https://github.com/git-cola/git-cola/issues/994>`_)
85 * Files can now be ignored in either the project's `.gitignore`, or in the
86 repository's private local `.git/info/exclude` ignore file.
87 (`#1006 <https://github.com/git-cola/git-cola/pull/1006>`_)
88 (`#1000 <https://github.com/git-cola/git-cola/issues/1000>`_)
90 * New remotes are now selected when they are added in the "Edit Remotes" tool.
91 (`#1002 <https://github.com/git-cola/git-cola/pull/1002>`_)
93 * The "Recent" repositories list is now saved to disk when opening a
94 repository. Previously, this list was only updated when exiting the app.
95 (`#1001 <https://github.com/git-cola/git-cola/pull/1001>`_)
97 * The bookmarks tool now has a "Delete" option in its right-click menu.
98 (`#999 <https://github.com/git-cola/git-cola/pull/999>`_)
100 * The current repository is no longer listed in the "File/Open Recent" menu.
101 (`#998 <https://github.com/git-cola/git-cola/pull/998>`_)
105 * Updated Hungarian translation.
106 (`#1005 <https://github.com/git-cola/git-cola/pull/1005>`_)
107 (`#1018 <https://github.com/git-cola/git-cola/pull/1018>`_)
109 * Updated Turkish translation.
110 (`#1003 <https://github.com/git-cola/git-cola/pull/1003>`_)
111 (`#1011 <https://github.com/git-cola/git-cola/pull/1011>`_)
115 * Better support for Python 3.8's line buffering modes.
116 (`#1014 <https://github.com/git-cola/git-cola/pull/1014>`_)
118 * The default `ssh-askpass` script now uses a more generic `#!` shebang line.
119 (`#1012 <https://github.com/git-cola/git-cola/pull/1012>`_)
121 * Fetch, push, and pull operations will now refresh the model and display when
123 (`#996 <https://github.com/git-cola/git-cola/issues/996>`_)
125 * The branches widget now refreshes its display when changing branches.
126 (`#992 <https://github.com/git-cola/git-cola/pull/992>`_)
130 * The `share/git-cola/bin/git-xbase` script will now have its `#!` lines
131 updated during installation.
132 (`#991 <https://github.com/git-cola/git-cola/pull/991>`_)
136 * The unit tests were made more platform-independent.
137 (`#993 <https://github.com/git-cola/git-cola/pull/993>`_)
141 Usability, bells and whistles
142 -----------------------------
143 * Auto-completion for filenames can now be disabled. This speeds up
144 revision completion when working in large repositories with many files.
145 (`#981 <https://github.com/git-cola/git-cola/pull/981>`_)
147 * The Stash dialog now shows the stash date as a tooltip when hovering
148 over a stashed change.
149 (`#982 <https://github.com/git-cola/git-cola/pull/982>`_)
151 * Qt HiDPI settings are overriden by the `git cola` HiDPI appearance settings.
152 These overrides can now be disabled by selecting the "Disable" mode.
153 This allows users to control Qt's HiDPI settings through environment
154 variables. Additionally, the "Auto" mode now detects the presence of
155 the Qt HiDPI variables and no longer overrides them when the user has
156 configured their environment explicitly.
157 (`#963 <https://github.com/git-cola/git-cola/issues/963>`_)
159 * Confirmation dialogs can now focus buttons using the Tab key.
160 Previously, the "Y" and "N" keys could be used to confirm or deny
161 using the keyboard, but "Tab" is more familiar.
162 (`#965 <https://github.com/git-cola/git-cola/issues/965>`_)
164 * Error dialogs (for example, when a commit hook fails) will now always
165 show the details. The details were previously hidden behind a toggle.
166 (`#968 <https://github.com/git-cola/git-cola/issues/968>`_)
170 * Updated Japanese translation.
171 (`#973 <https://github.com/git-cola/git-cola/pull/973>`_)
172 (`#974 <https://github.com/git-cola/git-cola/pull/974>`_)
174 * Updated Simplified Chinese translation.
175 (`#950 <https://github.com/git-cola/git-cola/pull/950>`_)
179 * The filesystem monitor no longer logs that it has been enabled after the
180 inotify watch limit is reached on Linux.
181 (`#984 <https://github.com/git-cola/git-cola/pull/984>`_)
183 * Better unicode robustness.
184 (`#990 <https://github.com/git-cola/git-cola/issues/990>`_)
185 (`#910 <https://github.com/git-cola/git-cola/issues/991>`_)
187 * The "Branches" widget did not always update itself when deleting branches
188 (for example, when inotify is disabled or unavailable).
189 (`#978 <https://github.com/git-cola/git-cola/issues/978>`_)
191 * Non-ascii unicode byte strings are more robustly handled by the log widget.
192 (`#977 <https://github.com/git-cola/git-cola/issues/977>`_)
194 * Non-unicode results from the `gettext` library are more robustly handled.
195 (`#969 <https://github.com/git-cola/git-cola/issues/969>`_)
197 * Launching `git cola` from within a directory that has since been deleted
198 would previously result in a traceback, and is now robustly handled.
199 (`#961 <https://github.com/git-cola/git-cola/issues/961>`_)
203 * The vendored `qtpy` library was updated to `v1.9`.
210 Usability, bells and whistles
211 -----------------------------
212 * The file browser now includes "Blame" in its context menu.
213 (`#953 <https://github.com/git-cola/git-cola/issues/953>`_)
215 * The "Push" action now uses "git push --force-with-lease" when using
216 the "Force" option with Git v1.8.5 and newer.
217 (`#946 <https://github.com/git-cola/git-cola/issues/946>`_)
219 * Updated German translation.
220 (`#936 <https://github.com/git-cola/git-cola/pull/936>`_)
222 * The `Status` widget learned to optionally display file counts in its
223 category headers, and indent the files displayed in each category.
224 (`#931 <https://github.com/git-cola/git-cola/pull/931>`_)
226 * The `Branches` widget can now sort branches by their most recent commit.
227 (`#930 <https://github.com/git-cola/git-cola/pull/930>`_)
229 * `git cola` now includes configurable GUI themes that can be used to style
230 the user interface. Enable the new themes by configuring `cola.theme`
231 in the preferences window. See the
232 `cola.theme documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-theme>`_
233 for more details. (`#924 <https://github.com/git-cola/git-cola/pull/924>`_)
235 * `git cola` now has built-in support for HiDPI displays by enabling
236 Qt's 5.6's `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
237 (`#938 <https://github.com/git-cola/git-cola/issues/938>`_)
239 * `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
240 icons have been updated to look sharp when displayed in HiDPI.
241 (`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
245 * `git cola`'s "Revert Unstaged Edits" previously checked out from "HEAD^",
246 when in "Amend" mode, and removing staged changes. This behavior has been
247 changed to always checkout from the index, which avoids data loss.
248 (`#947 <https://github.com/git-cola/git-cola/issues/947>`_)
250 * `git cola` has been updated to work with newer versions of `gnome-terminal`
251 and no longer shell-quotes its arguments when launching `gnome-terminal`.
252 The `cola.terminalshellquote` configuration variable can be set to `true` to
253 get the old behavior, or to handle other terminals that take the command to run
254 as a single string instead of as arguments to `execv()`.
255 (`#935 <https://github.com/git-cola/git-cola/pull/935>`_)
257 * `git dag` now properly handles arbitrary input on Python3.
258 Previously, an exception would be raised when entering `--grep=xxx` where
259 `xxx` is a quoted string with a missing end-quote.
260 (`#941 <https://github.com/git-cola/git-cola/pull/941>`_)
264 * The contribution guidelines for contributors has been updated to mention
265 how to regenerate the `*.mo` message files.
266 (`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
273 Usability, bells and whistles
274 -----------------------------
275 * `git dag` improved how it renders parent commits.
276 (`#921 <https://github.com/git-cola/git-cola/pull/921>`_)
278 * The `Branches` widget now checks out branches when double-clicked.
279 (`#920 <https://github.com/git-cola/git-cola/pull/920>`_)
281 * The new `Submodules` widget makes it easy to interact with submodules.
282 Additionally, submodules can now be updated using the `Status` widget.
283 (`#916 <https://github.com/git-cola/git-cola/pull/916>`_)
285 * Updated Japanese translation.
286 (`#914 <https://github.com/git-cola/git-cola/pull/914>`_)
288 * The "Open Terminal" action now launches a Git Bash shell on Windows.
289 (`#913 <https://github.com/git-cola/git-cola/pull/913>`_)
291 * New menu actions for updating all submodules.
292 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
294 * The status widget can now update submodules.
295 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
297 * The "Apply Patch" `git cola am` dialog now includes a diff viewer
298 to display the contents of the selected patch.
300 * The "Alt+D" diffstat hotkey now selects the staged/modified/etc.
301 header in the Status widget, which shows the totality of everything
302 that will be committed.
303 (`#771 <https://github.com/git-cola/git-cola/issues/771>`_)
305 * Running "Launch Editor" from the diff editor now opens the editor at the
307 (`#898 <https://github.com/git-cola/git-cola/pull/898>`_)
309 * The textwidth and tabwidth configuration values can now be set
310 per-repository, rather than globally only.
312 * Text entry widgets switched to using a block cursor in `v3.2`.
313 This has been reverted to the original line cursor for consistency
314 with other applications and user expectations.
315 (`#889 <https://github.com/git-cola/git-cola/issues/889>`_)
317 * The "edit at line" feature, used by the "Grep" tool, now supports
318 the Sublime text editor.
319 (`#894 <https://github.com/git-cola/git-cola/pull/894>`_)
323 * Launching external programs has been improved on Windows.
324 (`#925 <https://github.com/git-cola/git-cola/pull/925>`_)
326 * Improve compatibility when using PySide2.
327 (`#912 <https://github.com/git-cola/git-cola/pull/912>`_)
329 * The Diff Editor was not honoring the configured tab width on startup.
330 (`#900 <https://github.com/git-cola/git-cola/issues/900>`_)
332 * The "Delete Files" feature was creating an unreadable display when
333 many files were selected. Word-wrap the list of files so that the
334 display stays within a sensible size.
335 (`#895 <https://github.com/git-cola/git-cola/issues/895>`_)
337 * Spelling and grammar fixes.
338 (`#915 <https://github.com/git-cola/git-cola/pull/915>`_)
339 (`#891 <https://github.com/git-cola/git-cola/pull/891>`_)
343 * The logo was run through `tidy` to give it a consistent style.
344 Some technical issues with the logo were improved.
345 (`#877 <https://github.com/git-cola/git-cola/issues/877>`_)
347 * The entire codebase is now checked by `flake8`, rather than just
348 the module and test directories. This catches things like
349 the pynsist installer scripts.
350 (`#884 <https://github.com/git-cola/git-cola/issues/884>`_)
351 (`#882 <https://github.com/git-cola/git-cola/issues/882>`_)
352 (`#879 <https://github.com/git-cola/git-cola/pull/879>`_)
356 * The vendored `qtpy` library was updated to `v1.6`.
358 * The Windows installer's wrapper scripts were missing an import.
359 (`#878 <https://github.com/git-cola/git-cola/issues/878>`_)
366 Usability, bells and whistles
367 -----------------------------
368 * The `git cola dag` DAG window now supports `git revert`.
369 (`#843 <https://github.com/git-cola/git-cola/issues/843>`_)
371 * `git stash pop` is now supported by the stash dialog.
372 (`#844 <https://github.com/git-cola/git-cola/issues/844>`_)
374 * The status widget now ensures that each item is visible when selection
375 changes. Previously, if you scrolled to the right to see the name of
376 a long filename, and then selected a short filename above it, the widget
377 may not have shown the short filename in the viewport. We now ensure
378 that the filenames are visible when the selection changes.
379 (`#828 <https://github.com/git-cola/git-cola/pull/828>`_)
381 * The `git xbase` rebase editor no longer displays an error when
382 cancelling an interactive rebase.
383 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
385 * The dialog shown when renaming remotes has been simplified.
386 (`#840 <https://github.com/git-cola/git-cola/pull/840>`_)
387 (`#838 <https://github.com/git-cola/git-cola/issues/838>`_)
389 * The help dialog in the `git-xbase` Rebase editor is now scrollable.
390 (`#855 <https://github.com/git-cola/git-cola/issues/855>`_)
394 * Updated Brazilian translation.
395 (`#845 <https://github.com/git-cola/git-cola/pull/845>`_)
397 * Updated Czech translation.
398 (`#854 <https://github.com/git-cola/git-cola/pull/854>`_)
399 (`#853 <https://github.com/git-cola/git-cola/pull/853>`_)
400 (`#835 <https://github.com/git-cola/git-cola/pull/835>`_)
401 (`#813 <https://github.com/git-cola/git-cola/pull/813>`_)
403 * Update Spanish translation.
404 (`#862 <https://github.com/git-cola/git-cola/pull/862>`_)
405 (`#867 <https://github.com/git-cola/git-cola/pull/867>`_)
409 * The original `#!/usr/bin/env python` shebang lines can now be
410 retained by passing `USE_ENV_PYTHON=1` to `make` when installing.
411 (`#850 <https://github.com/git-cola/git-cola/issues/850>`_)
413 * The Makefile is now resilient to DESTDIR and prefix containing whitespace.
414 (`#858 <https://github.com/git-cola/git-cola/pull/858>`_)
416 * The vendored `qtpy` library was updated to `v1.4.2`.
418 * `python3-distutils` is needed to build cola on Debian.
419 (`#837 <https://github.com/git-cola/git-cola/issues/837>`_)
423 * The "C" key no longer closes the message dialogs, for example the
424 one that is shown when a commit fails its pre-commit hooks.
425 This allows "Ctrl+C" copy to work, rather than closing the dialog.
426 (`#734 <https://github.com/git-cola/git-cola/issues/734>`_)
428 * Dock widgets sizes are now properly saved and restored when the main
430 (`#848 <https://github.com/git-cola/git-cola/issues/848>`_)
432 * The spellcheck feature was broken under Python3.
433 (`#857 <https://github.com/git-cola/git-cola/issues/857>`_)
435 * A regression when saving stashes was fixed.
436 (`#847 <https://github.com/git-cola/git-cola/issues/847>`_)
438 * Diffing image files was not updating the available context menus,
439 which prevented the "Stage" action from being present in the menu.
440 (`#841 <https://github.com/git-cola/git-cola/issues/841>`_)
442 * `git cola` now detects when `git lfs uninstall` has been run. This allows
443 you to re-initialize "Git LFS" in an existing repository where it had been
444 previously uninstalled.
445 (`#842 <https://github.com/git-cola/git-cola/issues/842>`_)
447 * Custom color values that did not contain any hexadecimal digits in the
448 `a-f` range were being converted into integers by the config reader. This
449 then caused the configured colors to be ignored.
451 These color values are now interpreted correctly. Additionally, color
452 values can now use an optional HTML-like `#` prefix.
454 Example `.gitconfig` snippet::
459 (`#836 <https://github.com/git-cola/git-cola/pull/836>`_)
460 (`#849 <https://github.com/git-cola/git-cola/issues/849>`_)
462 * We now display an error message graphically when `Git` is not installed.
463 Previously, the message went to stderr only.
464 (`#830 <https://github.com/git-cola/git-cola/issues/830>`_)
466 * Changing diff options was causing resulting in an exception.
467 (`#833 <https://github.com/git-cola/git-cola/issues/833>`_)
468 (`#834 <https://github.com/git-cola/git-cola/pull/834>`_)
470 * The DAG window now updates itself when branches and tags are created.
471 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
473 * The user's `$PATH` environment variable can now contain utf-8
474 encoded paths. Previously, launching external commands could
476 (`#807 <https://github.com/git-cola/git-cola/issues/807>`_)
478 * Git Cola development sandboxes can now be stored on utf-8 encoded
479 filesystem paths. Previously, the interactive rebase feature
480 could be broken when running in that environment.
481 (`#825 <https://github.com/git-cola/git-cola/issues/825>`_)
483 * The log window now uses an ISO-8601 timestamp, which
484 avoids localized output in the log window.
485 (`#817 <https://github.com/git-cola/git-cola/issues/817>`_)
489 * The code base has been thoroughly sanitized using `pylint`, and
490 travis is now running pylint over the entire project.
492 * Miscellaneous improvements and code improvements.
493 (`#874 <https://github.com/git-cola/git-cola/issues/874>`_)
500 Usability, bells and whistles
501 -----------------------------
502 * The "Browser" widget learned to rename files using "git mv".
503 (`#239 <https://github.com/git-cola/git-cola/issues/239>`_)
505 * The "Diff" widget learned to diff images. Side-by-side and pixel diff
506 modes allow you to inspect changes to common images formats.
507 (`#444 <https://github.com/git-cola/git-cola/issues/444>`_)
508 (`#803 <https://github.com/git-cola/git-cola/pull/803>`_)
510 * Git LFS and Git Annex are natively supported by the image diff viewer.
512 * Git Annex operations are now included. `git annex init` can be performed on
513 repositories, and `git annex add` can be run on untracked files from the
514 status widget. Install `git-annex` to activate this feature.
516 * Git LFS operations are now included. `git lfs install` can be performed on
517 repositories, and `git lfs track` can be run on untracked files from the
518 status widget. Install `git-lfs` to activate this feature.
520 * The "Stash" tool learned to stash staged changes only. Select the
521 "Stage Index" option and only staged changes will be stashed away.
522 (`#413 <https://github.com/git-cola/git-cola/issues/413>`_)
524 * The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
525 shows error messages when things go wrong, and now saves the "Stash Index"
526 and "Keep Index" options across sessions.
528 * The Edit menu's "Copy" and "Select All" actions now forward to either the
529 diff, status, recent, or favorites widgets, based on which widget has focus.
531 * The "File" and "Edit" menu can now be activated using `Alt-{f,e}` hotkeys.
532 (`#759 <https://github.com/git-cola/git-cola/issues/759>`_)
534 * It was easy to accidentally trigger the first action in the `Status` tool's
535 context menu when using a quick right-click to bring up the menu.
536 A short sub-second delay was added to ensure that the top-most action is not
537 triggered unless enough time has passed. This prevents accidental
538 activation of the first item (typically "Stage" or "Unstage") without
539 burdening common use cases.
540 (`#755 <https://github.com/git-cola/git-cola/pull/755>`_)
541 (`#643 <https://github.com/git-cola/git-cola/issues/643>`_)
543 * The "Ctrl+S" hotkey now works for the header items in the Status tool.
544 Selected the "Modified" header item and activating the "Stage" hotkey,
545 for example, will stage all modified files. This works for the "Staged",
546 "Modified", and "Untracked" headers. This is not enabled for the
547 "Unmerged" header by design.
548 (`#772 <https://github.com/git-cola/git-cola/issues/772>`_)
550 * The list of "Recent" repositories previously capped the number of
551 repositories shown to 8 repositories. This can be set to a higher
552 value by setting the `cola.maxrecent` configuration variable.
553 (`#752 <https://github.com/git-cola/git-cola/issues/752>`_)
555 * The "Create Branch" dialog now prevents invalid branch names.
556 (`#765 <https://github.com/git-cola/git-cola/issues/765>`_)
558 * Updated Turkish translation.
559 (`#756 <https://github.com/git-cola/git-cola/pull/756>`_)
561 * Updated Ukrainian translation.
562 (`#753 <https://github.com/git-cola/git-cola/pull/753>`_)
564 * Updated German translation.
565 (`#802 <https://github.com/git-cola/git-cola/pull/802>`_)
567 * Updated Czech translation
568 (`#792 <https://github.com/git-cola/git-cola/pull/792>`_)
569 (`#806 <https://github.com/git-cola/git-cola/pull/806>`_)
571 * The window title can be configured to not display the absolute path of the
573 (`#775 <https://github.com/git-cola/git-cola/issues/775>`_)
575 * The "Edit Remotes" editor learned to edit remote URLS.
577 * Bare repositories can now be created by selecting the
578 "New Bare Repository..." action from the `File` menu.
580 * The "Branches" widget learned to configure upstream branches.
582 * A new `git cola clone` sub-command was added for cloning repositories.
586 * The vendored `qtpy` library was updated to `v1.3.1`.
588 * The macOS installation was made simpler for better compatibility with
590 (`#636 <https://github.com/git-cola/git-cola/issues/636>`_)
592 * The Windows installer is now much simpler. Git Cola now bundles
593 Python and PyQt5, so users need only install the "Git for Windows"
594 and "Git Cola" installers to get things working.
598 * Uninitialized difftool errors will now be displayed graphically.
599 They were previously going to the shell.
600 (`#457 <https://github.com/git-cola/git-cola/issues/457>`_)
602 * Translations marked "fuzzy" will no longer be used when translating strings.
603 (`#782 <https://github.com/git-cola/git-cola/issues/782>`_)
605 * Deleted unmerged files will now correctly use a deleted icon.
606 (`#479 <https://github.com/git-cola/git-cola/issues/479>`_)
608 * The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
609 (`#767 <https://github.com/git-cola/git-cola/issues/767>`_)
611 * The "Create Tag" dialog did not correctly handle the case when a signed
612 tag is requested, but no message is provided, and the user chooses to
613 create an unannotated tag instead. This convenience fallback will now
614 properly create an unsigned, unannotated tag.
615 (`#696 <https://github.com/git-cola/git-cola/issues/696>`_)
617 * `.gitconfig` and `.git/config` values editable by the Preferences dialog
618 (aka `git cola config`) will now get unset when set to an empty value.
619 For example, setting a different `user.email` in the current repository,
620 followed by a subsequent emptying of that field, would previously result in
621 an empty string getting stored in the config. This has been fixed so that
622 the value will now get unset in the config instead.
623 (`#406 <https://github.com/git-cola/git-cola/issues/406>`_)
625 * Spelling and typofixes.
626 (`#748 <https://github.com/git-cola/git-cola/pull/748>`_)
628 * `core.commentChar` is now honored when set in the local repository
630 (`#766 <https://github.com/git-cola/git-cola/issues/766>`_)
632 * The log window was using a format string that did not display
633 correctly in all locales. A locale-aware format is now used.
634 (`#800 <https://github.com/git-cola/git-cola/pull/800>`_)
636 * The dialog displayed when prompting for a reference could sometimes
638 (`#804 <https://github.com/git-cola/git-cola/pull/804>`_)
645 Usability, bells and whistles
646 -----------------------------
647 * Updated Simplified Chinese translation.
648 (`#726 <https://github.com/git-cola/git-cola/pull/726>`_)
650 * Updated Ukrainian translation.
651 (`#723 <https://github.com/git-cola/git-cola/pull/723>`_)
653 * New Czech translation.
654 (`#736 <https://github.com/git-cola/git-cola/pull/736>`_)
655 (`#737 <https://github.com/git-cola/git-cola/pull/737>`_)
656 (`#740 <https://github.com/git-cola/git-cola/pull/740>`_)
657 (`#743 <https://github.com/git-cola/git-cola/pull/743>`_)
659 * The "name" field in the "Create Tag" dialog now includes autocompletion,
660 which makes it easy to see which tags currently exist.
662 * `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
663 menu item to add a toolbar.
665 * Setting `cola.expandtab` to `true` will now expand tabs into spaces
666 in the commit message editor. The number of spaces to insert is determined
667 by consulting `cola.tabwidth`, which defaults to `8`.
669 * The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
670 ability to copy text from the DAG window.
671 (`#705 <https://github.com/git-cola/git-cola/pull/705>`_)
673 * The "Prepare Commit Message" action can now be invoked via the
674 `Ctrl+Shift+Return` shortcut.
675 (`#707 <https://github.com/git-cola/git-cola/pull/707>`_)
677 * The `Branches` pane now has a filter field that highlights branches whose
678 names match the string entered into its text field.
679 (`#713 <https://github.com/git-cola/git-cola/pull/713>`_)
681 * Actions that are triggered in response to button presses were being
682 triggered when the button was pressed, rather than when it was released,
683 which was a usability flaw. All buttons now respond when clicked
684 rather than when pressed.
685 (`#715 <https://github.com/git-cola/git-cola/pull/715>`_)
687 * The DAG window will now only refresh when object IDs change.
688 Previously, the DAG would redraw itself in response to inotify events,
689 such as filesystem operations, which was disruptive when inspecting a large
690 diff in its diff viewer. The DAG will now only redraw when the object IDs
691 corresponding to its query input changes. Furthermore, when redrawing, the
692 scrollbar positions are retained to minimize disruption to the viewport
694 (`#620 <https://github.com/git-cola/git-cola/issues/620>`_)
695 (`#724 <https://github.com/git-cola/git-cola/issues/724>`_)
697 * The "About" dialog now includes the SHA-1 where Git Cola was built.
698 (`#530 <https://github.com/git-cola/git-cola/issues/530>`_)
700 * The "Status" widget now has "Copy Leading Path to Clipboard" and
701 "Copy Basename to Clipboard" actions.
702 (`#435 <https://github.com/git-cola/git-cola/issues/435>`_)
703 (`#436 <https://github.com/git-cola/git-cola/issues/436>`_)
705 * The "Status" widget now supports custom "Copy ... to Clipboard" actions.
706 (`#437 <https://github.com/git-cola/git-cola/issues/437>`_)
708 * The main menu now has an "Edit" menu.
709 (`#725 <https://github.com/git-cola/git-cola/issues/725>`_)
711 * `git dag` learned to checkout commits into a detached HEAD state.
712 (`#698 <https://github.com/git-cola/git-cola/issues/698>`_)
714 * The `status` widget's context menus now omit actions selection-dependent
715 actions when no file is selected.
716 (`#731 <https://github.com/git-cola/git-cola/pull/731>`_)
718 * The startup dialog now focuses the repository list so that repositories
719 can be selected with the keyboard without mouse intervention.
720 (`#741 <https://github.com/git-cola/git-cola/issues/741>`_)
724 * `git dag` now prevents nodes from overlapping in more situations.
725 (`#689 <https://github.com/git-cola/git-cola/pull/689>`_)
727 * Adding untracked Git submodule repo directories previously ran
728 `git add submodule/` but we now call `git add submodule` without
729 the trailing slash (`/`) to avoid staging files that belong to the
730 submodule (which is possibly a `git` bug). By working around the
731 buggy behavior we allow users to recover by issuing the appropriate
732 `git submodule add` command to properly register the submodule.
733 (`#681 <https://github.com/git-cola/git-cola/pull/681>`_)
735 * We now avoid `git for-each-ref --sort=version:refname` on versions
736 of `git` older than `v2.7.0`. Previously we only avoided it for
737 versions older than `v2.0.0`, which was a mistake.
738 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
740 * The error message displayed when `git` is not installed has been fixed.
741 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
743 * Adding new remotes was silently broken.
744 (`#684 <https://github.com/git-cola/git-cola/issues/684>`_)
745 (`#685 <https://github.com/git-cola/git-cola/pull/685>`_)
747 * The repo selection dialog had errors during startup when the
748 `cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
749 (`#690 <https://github.com/git-cola/git-cola/issues/690>`_)
751 * Restored support for PyQt 4.6 (Centos 6.8)
752 (`#692 <https://github.com/git-cola/git-cola/issues/692>`_)
754 * Switching repositories now resets the "Amend Mode" and other settings
756 (`#710 <https://github.com/git-cola/git-cola/issues/710>`_)
758 * `git rebase` error messages now displayed when rebasing fails or stops
759 via the standalone `git cola rebase` front-end.
760 (`#721 <https://github.com/git-cola/git-cola/issues/721>`_)
762 * `git cola` learned to stage broken symlinks.
763 (`#727 <https://github.com/git-cola/git-cola/issues/727>`_)
765 * The "View History" feature in the `Browser` tool was fixed, and now
766 disambiguates between refs and paths.
767 (`#732 <https://github.com/git-cola/git-cola/issues/732>`_)
769 * The diff editor now has better support for files with CRLF `\r\n`
771 (`#730 <https://github.com/git-cola/git-cola/issues/730>`_)
773 * `cola.inotify` in a repo-local config is now honored
774 when `git cola` is launched from a desktop entry (`git cola --prompt`).
775 (`#695 <https://github.com/git-cola/git-cola/issues/695>`_)
782 Usability, bells and whistles
783 -----------------------------
784 * New Ukrainian translation.
785 (`#670 <https://github.com/git-cola/git-cola/pull/670>`_)
786 (`#672 <https://github.com/git-cola/git-cola/pull/672>`_)
788 * New and improved French translations.
790 * The new `Branches` widget makes it easier to checkout, merge, push,
791 and pull branches from a single interface.
793 * `git cola` now includes a dark icon theme. The dark icon theme can be
794 activated either by setting the `GIT_COLA_ICON_THEME` environment variable
795 to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
796 `--icon-theme=dark` on the command line.
797 (`#638 <https://github.com/git-cola/git-cola/pull/638>`_)
799 * Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.
801 * The commit message editor now remembers the "Spellcheck" setting
803 (`#645 <https://github.com/git-cola/git-cola/pull/645>`_)
805 * `git dag` now uses an improved algorithm for laying out the graph,
806 which avoids collisions under certain graph configurations, and
807 avoids overlapping tag with commits.
808 (`#648 <https://github.com/git-cola/git-cola/pull/648>`_)
809 (`#651 <https://github.com/git-cola/git-cola/pull/651>`_)
810 (`#654 <https://github.com/git-cola/git-cola/pull/654>`_)
811 (`#656 <https://github.com/git-cola/git-cola/pull/656>`_)
812 (`#659 <https://github.com/git-cola/git-cola/pull/659>`_)
814 * `git dag` now remembers its column sizes across sessions.
815 (`#674 <https://github.com/git-cola/git-cola/issues/674>`_)
817 * `Grep` now shows a preview of the selected file's content in a split window
818 below the grep results.
820 * `Grep` now includes line numbers in the preview pane's output.
822 * `Edit Remotes` now remembers its window settings after exiting.
824 * `Diff` now has an option to display line numbers in the editor.
825 (`#136 <https://github.com/git-cola/git-cola/issues/136>`_)
827 * `Amend Last Commit` can now be triggered via the `Commit` menu in addition
828 to the commit message editor's options.
829 (`#640 <https://github.com/git-cola/git-cola/issues/640>`_)
831 * The `File Browser` tool was made much faster and can now operate on
832 much larger repositories.
833 (`#499 <https://github.com/git-cola/git-cola/issues/499>`_)
835 * A new "turbo" mode was added that allows you to opt-out of operations
836 that can slow `git cola` on large repositories. The turbo mode is
837 enabled by configuring `git config cola.turbo true`. Turbo mode
838 disables the background loading of Git commit messages and other
839 details in the `File Browser` widget.
841 * A new GitIgnore dialog allows adding custom gitignore patterns.
842 (`#653 <https://github.com/git-cola/git-cola/pull/653>`_)
844 * The spellchecker in `git cola` can now use an additional dictionary
845 by configuring `cola.dictionary` to the path to a file containing
846 a newline-separated list of words.
847 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
849 * The stash, export patches, diff, and gitignore dialogs now remember
852 * A new `git cola recent` sub-command was added for finding recently
855 * The `Fetch` dialog now allows pruning remote branches.
856 (`#639 <https://github.com/git-cola/git-cola/issues/639>`_)
857 (`#680 <https://github.com/git-cola/git-cola/pull/680>`_)
861 * `git cola`'s spellchecker now supports the new `dict-common` filesystem
862 layout, and prefers the `/usr/share/dict/cracklib-small` file over the
863 `/usr/share/dict/words` provided on older distributions.
864 This makes the spellchecker compatible with Arch, which does not provide
865 a `words` symlink like Debian.
866 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
868 * Properly handle the case where an existing file is untracked using
871 * Fix a quirk where the "Create Branch" dialog sometimes required clicking
872 twice on the radio buttons.
873 (`#662 <https://github.com/git-cola/git-cola/pull/662>`_)
875 * Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
876 be executed with the press of a single enter key after being shown.
877 (`#661 <https://github.com/git-cola/git-cola/issues/661>`_)
879 * Committing is now allowed in when resolving a merge results in no
880 changes. This state was previously prevented by the commit message editor,
881 which prevented users from resolving merges that result in no changes.
882 (`#679 <https://github.com/git-cola/git-cola/pull/679>`_)
884 * The filesystem monitor would sometimes emit backtraces when directories
885 are modified. This has been fixed.
886 (`bz #1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)
888 * Absolute paths are now returned when querying for `.git`-relative paths
889 from within a submodule, which uses `.git`-files.
890 This fixes launching `git cola` from within a subdirectory of a submodule.
891 (`#675 <https://github.com/git-cola/git-cola/pull/675>`_)
898 Usability, bells and whistles
899 -----------------------------
900 * `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
901 hook to update the commit message. This hook takes the same parameters
902 as Git's `prepare-commit-message` hook. The default path to this hook
903 can be overridden by setting the `cola.prepareCommitMessageHook`
904 configuration variable.
905 (`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)
907 * `git cola diff` (and the corresponding `Diff` menu actions) can now
908 launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
909 also added for launching an editor.
911 * Traditional Chinese (Taiwan) translation updates.
915 * `git cola` now works when installed in non-ascii, utf8-encoded paths.
916 (`#629 <https://github.com/git-cola/git-cola/issues/629>`_)
918 * Styling issues that caused black backgrounds in various widgets when using
919 PyQ5 on Mac OS X have been fixed.
920 (`#624 <https://github.com/git-cola/git-cola/issues/624>`_)
922 * The "Open Recent" menu action was broken and has been fixed.
923 (`#634 <https://github.com/git-cola/git-cola/issues/634>`_)
925 * Exiting `git cola` with a maximized main window would hang when reopened
927 (`#641 <https://github.com/git-cola/git-cola/issues/641>`_)
931 * `appdata.xml` files are now provided at
932 `share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
933 for use by the Linux software gallery.
934 (`#627 <https://github.com/git-cola/git-cola/pull/627>`_)
935 (`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)
944 * The "Open Recent" menu was updated to new bookmarks format.
945 (`#628 <https://github.com/git-cola/git-cola/issues/628>`_)
952 Usability, bells and whistles
953 -----------------------------
954 * New Polish translation thanks to Łukasz Wojniłowicz
955 (`#598 <https://github.com/git-cola/git-cola/pull/598>`_)
957 * The `Bypass Commit Hooks` feature now disables itself automatically
958 when a new commit is created. The new behavior turns the option into a
959 single-use flag, which helps prevent users from accidentally leaving it
960 active longer than intended.
961 (`#595 <https://github.com/git-cola/git-cola/pull/595>`_)
963 * `git dag` learned to launch an external diff viewer on selected commits.
964 The standard `Ctrl+D` shortcut can be used to view diffs.
965 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
967 * `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
968 The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
969 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
971 * Items in the "Favorites" list can now be renamed, which makes it
972 easier to differentiate between several checkouts of the same repository.
973 (`#599 <https://github.com/git-cola/git-cola/issues/599>`_)
974 (`#601 <https://github.com/git-cola/git-cola/pull/601>`_)
976 * The startup screen now includes a logo and `git cola` version information.
977 (`#526 <https://github.com/git-cola/git-cola/issues/526>`_)
979 * The `About` page was revamped to contain multiple tabs. A new tab was added
980 that provides details about `git cola`''s dependencies. New tabs were also
981 added for giving credit to `git cola`'s authors and translators.
983 * The `About` page can now be accessed via `git cola about`.
985 * The "Fast-forward only" and "No fast-forward" options supported by
986 `git pull` are now accessible via `git cola pull`.
988 * Doing a forced push no longer requires selecting the remote branch.
989 (`#618 <https://github.com/git-cola/git-cola/pull/618>`_)
991 * `git cola push` now has an option to suppress the prompt that is shown
992 when pushing would create new remote branches.
993 (`#605 <https://github.com/git-cola/git-cola/issues/605>`_)
995 * `git dag` now shows commit messages in a more readable color.
996 (`#574 <https://github.com/git-cola/git-cola/issues/574>`_)
998 * `git cola browse` and the `status` widget learned to launch the OS-specified
999 default action for a file. When used on directories via `git cola browse`,
1000 or when "Open Parent Directory" is used on files, the OS-specified
1001 file browser will typically be used.
1003 * `git cola browse` and the `status` widget learned to launch terminals.
1007 * `git cola browse` was not updating when expanding items.
1008 (`#588 <https://github.com/git-cola/git-cola/issues/588>`_)
1010 * Typofixes in comments, naming, and strings have been applied.
1011 (`#593 <https://github.com/git-cola/git-cola/pull/593>`_)
1013 * The inotify and win32 filesystem monitoring no longer refreshes
1014 when updates are made to ignored files.
1015 (`#517 <https://github.com/git-cola/git-cola/issues/517>`_)
1016 (`#516 <https://github.com/git-cola/git-cola/issues/516>`_)
1018 * The `Refresh` button on the actions panel no longer raises an
1019 exception when using PyQt5.
1020 (`#604 <https://github.com/git-cola/git-cola/issues/604>`_)
1022 * Fixed a typo in the inotify backend that is triggered when files are removed.
1023 (`#607 <https://github.com/git-cola/git-cola/issues/607>`_)
1025 * Fixed a typo when recovering from a failed attempt to open a repository.
1026 (`#606 <https://github.com/git-cola/git-cola/issues/606>`_)
1028 * `git dag` now properly updates itself when launched from the menubar.
1029 (`#613 <https://github.com/git-cola/git-cola/pull/613>`_)
1031 * If git-cola is invoked on Windows using `start pythonw git-cola`,
1032 a console window will briefly flash on the screen each time
1033 `git cola` invokes `git`. The console window is now suppressed.
1035 * We now avoid some problematic Popen flags on Windows which were
1036 breaking the `git rebase` feature on Windows.
1038 * The `Save` button in `git dag`'s "Grab File..." feature now properly
1039 prompts for a filename when saving files.
1040 (`#617 <https://github.com/git-cola/git-cola/pull/617>`_)
1044 * The `qtpy` symlink in the source tree has been removed to allow for easier
1045 development on Windows.
1046 (`#626 <https://github.com/git-cola/git-cola/issues/626>`_)
1053 Usability, bells and whistles
1054 -----------------------------
1055 * `git cola push` learned to configure upstream branches.
1056 (`#563 <https://github.com/git-cola/git-cola/issues/563>`_)
1060 * The diffstat view is now properly updated when notifications are
1061 received via inotify filesystem monitoring.
1062 (`#577 <https://github.com/git-cola/git-cola/issues/577>`_)
1064 * Python3 with PyQt5 had a bug that prevented `git cola` from starting.
1065 (`#589 <https://github.com/git-cola/git-cola/pull/589>`_)
1075 * When repositories stored in non-ASCII, UTF-8-encoded filesystem paths
1076 were operated upon with `LC_ALL=C` set in the environment, unicode errors
1077 would occur when using `python2`. `git cola` was made more robust and will
1078 now operate correctly within this environment.
1079 (`#581 <https://github.com/git-cola/git-cola/issues/581>`_)
1081 * Support for the `GIT_WORK_TREE` environment variable was fixed.
1082 (`#582 <https://github.com/git-cola/git-cola/pull/582>`_)
1087 * The `unittest.mock` module is now used instead of the original `mock` module
1088 when running the `git cola` test suite using Python3.
1089 (`#569 <https://github.com/git-cola/git-cola/issues/569>`_)
1094 * `git cola` is now compatible with *PyQt5*, *PyQt4*, and *Pyside*.
1095 `git cola` previously supported *PyQt4* only, but will now use whichever
1096 library is available. Users are not required to upgrade at this time,
1097 but *PyQt5* support can be enabled anytime by making its python
1099 (`#232 <https://github.com/git-cola/git-cola/issues/232>`_)
1101 *NOTE*: We do not yet recommend using *PyQt5* because there are known
1102 exit-on-segfault bugs in *Qt5* that have not yet been addressed.
1103 `git cola` is sensitive to this bug and is known to crash on exit
1104 when using `git dag` or the interactive rebase feature on *PyQt5*.
1106 https://bugreports.qt.io/browse/QTBUG-52988
1108 *PyQt4* is stable and there are no known issues when using it so
1109 we recommend using it until the Qt5 bugs have been resolved.
1111 * `git cola` now depends on *QtPy* and includes a bundled copy of the
1112 `qtpy` library. If you are packaging `git cola` and would prefer to use
1113 `qtpy` from your distribution instead of the built-in version then use
1114 `make NO_VENDOR_LIBS=1` when building `git cola`. This will prevent
1115 vendored libraries from being installed.
1122 Usability, bells and whistles
1123 -----------------------------
1125 * A new "Reset" sub-menu provides access to running "git reset --mixed"
1126 when resetting branch heads and "git reset --merge" when resetting
1128 (`#542 <https://github.com/git-cola/git-cola/issues/542>`_)
1130 * `git cola` now supports linked worktrees, i.e. worktrees created by
1132 (`#554 <https://github.com/git-cola/git-cola/issues/554>`_)
1137 * Diff highlighting is now robust to the user having
1138 diff.supressBlankEmpty=true in their git config.
1139 (`#541 <https://github.com/git-cola/git-cola/issues/541>`_)
1141 * The filesystem monitor now properly handles repositories that use
1142 `.git`-files, e.g. when using submodules.
1143 (`#545 <https://github.com/git-cola/git-cola/issues/545>`_)
1144 (`#546 <https://github.com/git-cola/git-cola/pulls/546>`_)
1146 * Per-repository git configuration is now properly detected when launching
1147 `git cola` from an application launcher.
1148 (`#548 <https://github.com/git-cola/git-cola/issues/548>`_)
1150 * `git cola` now cleans up after itself immediately to avoid leaving behind
1151 empty `/tmp/git-cola-XXXXXX` directories when the user uses `Ctrl+C`
1153 (`#566 <https://github.com/git-cola/git-cola/issues/566>`_)
1158 * It is now possible to install `git cola` to and from utf8-encoded filesystem
1159 paths. Previously, Python's stdlib would throw an encoding error during
1160 installation. We workaround the stdlib by forcing python2 to use utf-8,
1161 thus fixing assumptions in the stdlib library code.
1162 (`#551 <https://github.com/git-cola/git-cola/issues/551>`_)
1169 Usability, bells and whistles
1170 -----------------------------
1172 * The icon for untracked files was adjusted to better differentiate
1173 between files and the "Untracked" header.
1174 (`#509 <https://github.com/git-cola/git-cola/issues/509>`_)
1176 * Ctrl+O was added as a hotkey for opening repositories.
1177 (`#507 <https://github.com/git-cola/git-cola/pull/507>`_)
1179 * `git dag` now uses consistent edge colors across updates.
1180 (`#512 <https://github.com/git-cola/git-cola/issues/512>`_)
1182 * `git cola`'s Bookmarks widget can now be used to set a "Default Repository".
1183 Under the hood, we set the `cola.defaultrepo` configuration variable.
1184 The default repository is used whenever `git cola` is launched outside of
1185 a Git repository. When unset, or when set to a bogus value, `git cola`
1186 will prompt for a repository, as it previously did.
1187 (`#513 <https://github.com/git-cola/git-cola/issues/513>`_)
1189 * `git cola`'s Russian and Spanish translations were improved
1190 thanks to Vaiz and Zeioth.
1191 (`#514 <https://github.com/git-cola/git-cola/pull/514>`_)
1192 (`#515 <https://github.com/git-cola/git-cola/pull/515>`_)
1193 (`#523 <https://github.com/git-cola/git-cola/pull/523>`_)
1195 * `git cola` was translated to Turkish thanks to Barış ÇELİK.
1196 (`#520 <https://github.com/git-cola/git-cola/pull/520>`_)
1198 * The status view now supports launching `git gui blame`. It can be
1199 configured to use a different command by setting `cola.blameviewer`.
1200 (`#521 <https://github.com/git-cola/git-cola/pull/521>`_)
1202 * `git dag` now allows selecting non-contiguous ranges in the log widget.
1203 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1205 * Any font can now be chosen for the diff editor, not just monospace fonts.
1206 (`#525 <https://github.com/git-cola/git-cola/issues/525>`_)
1211 * `xfce4-terminal` and `gnome-terminal` are now supported when launching
1212 `git mergetool` to resolve merges. These terminals require that the command
1213 to execute is shell-quoted and passed as a single string argument to `-e`
1214 rather than as additional command line arguments.
1215 (`#524 <https://github.com/git-cola/git-cola/issues/524>`_)
1217 * Fixed a unicode problem when formatting the error message that is shown
1218 when `gitk` is not installed. We now handle unicode data in tracebacks
1219 generated by python itself.
1220 (`#528 <https://github.com/git-cola/git-cola/issues/528>`_)
1222 * The `New repository` feature was fixed.
1223 (`#533 <https://github.com/git-cola/git-cola/pull/533>`_)
1225 * We now use omit the extended description when creating "fixup!" commits,
1226 for consistency with the Git CLI. We now include only the one-line summary
1227 in the final commit message.
1228 (`#522 <https://github.com/git-cola/git-cola/issues/522>`_)
1235 Usability, bells and whistles
1236 -----------------------------
1238 * The user interface is now HiDPI-capable. git-cola now uses SVG
1239 icons, and its interface can be scaled by setting the `GIT_COLA_SCALE`
1240 environment variable.
1242 * `git dag` now supports the standard editor, difftool, and history hotkeys.
1243 It is now possible to invoke these actions from file widget's context
1244 menu and through the standard hotkeys.
1245 (`#473 <https://github.com/git-cola/git-cola/pull/473>`_)
1247 * The `Status` tool also learned about the history hotkey.
1248 Additionally, the `Alt-{j,k}` aliases are also supported in the `Status`
1249 tool for consistency with the other tools where the non-Alt hotkeys are not
1251 (`#488 <https://github.com/git-cola/git-cola/pull/488>`_)
1253 * The `File Browser` tool now has better default column sizes,
1254 and remembers its window size and placement.
1256 * The `File Browser` now supports the refresh hotkey, and has better
1257 behavior when refreshing. The selection is now retained, and new and
1258 removed files are found when refreshing.
1260 * A new `git-cola-completion.bash` completion script is provided in the
1261 `contrib/` directory. It must be used alongside Git's completion script.
1262 Source it from your `~/.bashrc` (or `~/.zshrc`, etc) after sourcing
1263 the `git-completion.bash` script and you will have command-line completion
1264 support for the `git cola` and `git dag` sub-commands.
1266 * The "checkout" dialog now offers completion for remote branches and other
1267 git refs. This makes it easier to checkout remote branches in a detached
1268 head state. Additionally, the checkout dialog also offers completion for
1269 remote branches that have not yet been checked out, which makes it easier to
1270 create a local tracking branch by just completing for that potential name.
1271 (`#390 <https://github.com/git-cola/git-cola/issues/390>`_)
1273 * The "create branch" and "create tag" dialogs now save and restore their
1276 * The "status" widget can now be configured to use a bold font with a darker
1277 background for the header items.
1278 (`#506 <https://github.com/git-cola/git-cola/pull/506>`_)
1280 * The "status" widget now remembers its horizontol scrollbar position across
1281 updates. This is helpful when working on projects with long paths.
1282 (`#494 <https://github.com/git-cola/git-cola/issues/494>`_)
1287 * When using *Git for Windows*, a `git` window would appear
1288 when running *Windows 8*. We now pass additional flags to
1289 `subprocess.Popen` to prevent a `git` window from appearing.
1290 (`#477 <https://github.com/git-cola/git-cola/issues/477>`_)
1291 (`#486 <https://github.com/git-cola/git-cola/pull/486>`_)
1293 * Launching difftool with `.PY` in `$PATHEXT` on Windows was fixed.
1294 (`#492 <https://github.com/git-cola/git-cola/issues/492>`_)
1296 * Creating a local branch tracking a remote branch that contains
1297 slashes in its name is now properly handled.
1298 (`#496 <https://github.com/git-cola/git-cola/issues/496>`_)
1300 * The "Browse Other Branch" feature was broken by Python3, and is now fixed.
1301 (`#501 <https://github.com/git-cola/git-cola/issues/501>`_)
1303 * We now avoid `long` for better Python3 compatibility.
1304 (`#502 <https://github.com/git-cola/git-cola/issues/502>`_)
1306 * We now use Git's default merge message when merging branches.
1307 (`#508 <https://github.com/git-cola/git-cola/issues/508>`_)
1309 * Miscellaneous fixes
1310 (`#485 <https://github.com/git-cola/git-cola/pull/485>`_)
1315 * git-cola's documentation no longer uses an intersphinx link mapping
1316 to docs.python.org. This fixes warnings when building rpms using koji,
1317 where network access is prevented.
1319 https://bugzilla.redhat.com/show_bug.cgi?id=1231812
1326 Usability, bells and whistles
1327 -----------------------------
1329 * The Interactive Rebase feature now works on Windows!
1330 (`#463 <https://github.com/git-cola/git-cola/issues/463>`_)
1332 * The `diff` editor now understands vim-style `hjkl` navigation hotkeys.
1333 (`#476 <https://github.com/git-cola/git-cola/issues/476>`_)
1335 * `Alt-{j,k}` navigation hotkeys were added to allow changing to the
1336 next/previous file from the diff and commit editors.
1338 * The `Rename branch` menu action is now disabled in empty repositories.
1339 (`#475 <https://github.com/git-cola/git-cola/pull/475>`_)
1340 (`#459 <https://github.com/git-cola/git-cola/issues/459>`_)
1342 * `git cola` now checks unmerged files for conflict markers before
1343 staging them. This feature can be disabled in the preferences.
1344 (`#464 <https://github.com/git-cola/git-cola/issues/464>`_)
1346 * `git dag` now remembers which commits were selected when refreshing
1347 so that it can restore the selection afterwards.
1348 (`#480 <https://github.com/git-cola/git-cola/issues/480>`_)
1350 * "Launch Editor", "Launch Difftool", "Stage/Unstage",
1351 and "Move Up/Down" hotkeys now work when the commit message
1353 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1355 * The diff editor now supports the `Ctrl+u` hotkey for reverting
1356 diff hunks and selected lines.
1358 * The `core.commentChar` Git configuration value is now honored.
1359 Commit messages and rebase instruction sheets will now use
1360 the configured character for comments. This allows having
1361 commit messages that start with `#` when `core.commentChar`
1362 is configured to its non-default value.
1363 (`#446 <https://github.com/git-cola/git-cola/issues/446>`_)
1368 * Diff syntax highlighting was improved to handle more edge cases
1369 and false positives.
1370 (`#467 <https://github.com/git-cola/git-cola/pull/467>`_)
1372 * Setting commands in the interactive rebase editor was fixed.
1373 (`#472 <https://github.com/git-cola/git-cola/issues/472>`_)
1375 * git-cola no longer clobbers the Ctrl+Backspace text editing shortcut
1376 in the commit message editor.
1377 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1379 * The copy/paste clipboard now persists after `git cola` exits.
1380 (`#484 <https://github.com/git-cola/git-cola/issues/484>`_)
1389 * Fixed the "Sign off" feature in the commit message editor.
1396 Usability, bells and whistles
1397 -----------------------------
1398 * Double-click will now choose a commit in the "Select commit" dialog.
1400 * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the
1401 commit message when a merge is in-progress. Upon refresh, `git cola` will
1402 now detect when a merge has completed and reset the commit message back to
1403 its previous state. It is only reset if the editor contains a message
1404 that was read from the file and has not been manually edited by the user.
1406 * The commit message editor's context menu now has a "Clear..." action for
1407 clearing the message across both the summary and description fields.
1409 * Traditional Chinese (Taiwan) translation updates.
1411 * The system theme's icons are now used wherever possible.
1412 (`#458 <https://github.com/git-cola/git-cola/pull/458>`_)
1416 * The stash viewer now uses ``git show --no-ext-diff`` to avoid running
1417 user-configured diff tools.
1419 * `git cola` now uses the `setsid()` system call to ensure that the
1420 `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing
1421 changes using `git`. The askpass helpers will now be used even when
1422 `git cola` is launched from a terminal.
1424 The behavior without `setsid()` is that `git cola` can appear to hang while
1425 pushing changes. The hang happens when `git` prompts the user for a
1426 password using the terminal, but the user never sees the prompt. `setsid()`
1427 detaches the terminal, which ensures that the askpass helpers are used.
1428 (`#218 <https://github.com/git-cola/git-cola/issues/218>`_)
1429 (`#262 <https://github.com/git-cola/git-cola/issues/262>`_)
1430 (`#377 <https://github.com/git-cola/git-cola/issues/377>`_)
1432 * `git dag`'s file list tool was updated to properly handle unicode paths.
1434 * `gnome-terminal` is no longer used by default when `cola.terminal` is unset.
1435 It is broken, as was detailed in #456.
1436 (`#456 <https://github.com/git-cola/git-cola/issues/456>`_)
1438 * The interactive rebase feature was not always setting `$GIT_EDITOR`
1439 to the value of `gui.editor`, thus there could be instances where rebase
1440 will seem to not stop, or hang, when performing "reword" actions.
1442 We now set the `$GIT_EDITOR` environment variable when performing the
1443 "Continue", "Skip", and "Edit Todo" rebase actions so that the correct
1444 editor is used during the rebase.
1445 (`#445 <https://github.com/git-cola/git-cola/issues/445>`_)
1449 * `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y"
1450 version number. Most of our releases tend to contain new features.
1457 Usability, bells and whistles
1458 -----------------------------
1459 * Updated zh_TW translations.
1461 * `git cola rebase` now defaults to `@{upstream}`, and generally uses the same
1462 CLI syntax as `git rebase`.
1464 * The commit message editor now allows you to bypass commit hooks by selecting
1465 the "Bypass Commit Hooks" option. This is equivalent to passing the
1466 `--no-verify` option to `git commit`.
1467 (`#357 <https://github.com/git-cola/git-cola/issues/357>`_)
1469 * We now prevent the "Delete Files" action from creating a dialog that does
1471 (`#378 <https://github.com/git-cola/git-cola/issues/378>`_)
1473 * `git xbase` learned to edit rebase instruction sheets that contain
1476 * The diff colors are now configurable. `cola.color.{text,add,remove,header}`
1477 can now be set with 6-digit hexadecimal colors.
1478 See the `git cola manual <https://git-cola.readthedocs.io/en/latest/git-cola.html#configuration-variables>_`
1481 * Improved hotkey documentation.
1485 * `git cola` will now allow starting an interactive rebase with a dirty
1486 worktree when `rebase.autostash` is set.
1487 (`#360 <https://github.com/git-cola/git-cola/issues/360>`_)
1494 Usability, bells and whistles
1495 -----------------------------
1496 * A new "Find files" widget was added, and can be activated by
1497 using the `Ctrl+t` or `t` hotkeys.
1499 * A new `git cola find` sub-command was added for finding files.
1501 * `git cola` now remembers the text cursor's position when staging
1502 interactively with the keyboard. This makes it easier to use the keyboard
1503 arrows to select and stage lines.
1505 * The completion widgets will now select the top completion item
1506 when `Enter` or `Return` are pressed.
1508 * You can now refresh using `F5` in addition to the existing `Ctrl+R` hotkey.
1512 * `git cola` now passes `--no-abbrev-commit` to `git log` to override
1513 having `log.abbrevCommit = true` set in `.gitconfig`.
1519 Usability, bells and whistles
1520 -----------------------------
1521 * `git dag` now forwards all unknown arguments along to `git log`.
1522 (`#389 <https://github.com/git-cola/git-cola/issues/389>`_)
1524 * Line-by-line interactive staging was made more robust.
1525 (`#399 <https://github.com/git-cola/git-cola/pull/399>`_)
1527 * "Bookmarks" was renamed to "Favorites".
1528 (`#392 <https://github.com/git-cola/git-cola/issues/392>`_)
1530 * Untracked files are now displayed using a unique icon.
1531 (`#388 <https://github.com/git-cola/git-cola/pull/388>`_)
1535 * `git dag` was triggering a traceback on Fedora when parsing Git logs.
1536 (`bz #181676 <https://bugzilla.redhat.com/show_bug.cgi?id=1181686>`_)
1538 * inotify expects unicode paths on Python3.
1539 (`#393 <https://github.com/git-cola/git-cola/pull/393>`_)
1541 * Untracked files are now assumed to be utf-8 encoded.
1542 (`#401 <https://github.com/git-cola/git-cola/issues/401>`_)
1548 Usability, bells and whistles
1549 -----------------------------
1550 * `git cola` can now create GPG-signed commits and merges.
1551 See the documentation for details about setting up a GPG agent.
1552 (`#149 <https://github.com/git-cola/git-cola/issues/149>`_)
1554 * The status widget learned to copy relative paths when `Ctrl+x` is pressed.
1555 (`#358 <https://github.com/git-cola/git-cola/issues/358>`_)
1557 * Custom GUI actions can now define their own keyboard shortcuts by
1558 setting `guitool.$name.shortcut` to a string understood by Qt's
1559 `QAction::setShortcut()` API, e.g. `Alt+X`.
1561 `Qt docs <http://qt-project.org/doc/qt-4.8/qkeysequence.html#QKeySequence-2>`_
1562 for more details about the supported values.
1564 * `git cola` learned to rename branches.
1565 (`#364 <https://github.com/git-cola/git-cola/pull/364>`_)
1566 (`#278 <https://github.com/git-cola/git-cola/issues/278>`_)
1568 * `git dag` now has a "Show history" context menu which can be used to filter
1569 history using the selected paths.
1573 * `sphinxtogithub.py` was fixed for Python3.
1574 (`#353 <https://github.com/git-cola/git-cola/pull/353>`_)
1576 * The commit that changed how we read remotes from `git remote`
1577 to parsing `git config` was reverted since it created problems
1580 * Fixed a crash when using the `rebase edit` feature.
1581 (`#351 <https://github.com/git-cola/git-cola/issues/351>`_)
1583 * Better drag-and-drop behavior when dropping into gnome-terminal.
1584 (`#373 <https://github.com/git-cola/git-cola/issues/373>`_)
1588 * The `git-cola-folder-handler.desktop` file handler was fixed
1589 to pass validation by `desktop-file-validate`.
1590 (`#356 <https://github.com/git-cola/git-cola/issues/356>`_)
1592 * The `git.svg` icon was renamed to `git-cola.svg`, and `git cola` was taught
1593 to prefer icons from the desktop theme when available.
1599 Usability, bells and whistles
1600 -----------------------------
1601 * New hotkey: `Ctrl+Shift+M` merges branches.
1603 * New hotkey: `Ctrl+R` refreshes the DAG viewer.
1604 (`#347 <https://github.com/git-cola/git-cola/issues/347>`_)
1608 * We now use `git config` to parse the list of remotes
1609 instead of parsing the output of `git remote`, which
1610 is a Git porcelain and should not be used by scripts.
1612 * Avoid "C++ object has been deleted" errors from PyQt4.
1613 (`#346 <https://github.com/git-cola/git-cola/issues/346>`_)
1617 * The `make install` target now uses `install` instead of `cp`.
1623 Usability, bells and whistles
1624 -----------------------------
1625 * Updated Brazillian Portuguese translation.
1627 * The status and browse widgets now allow drag-and-drop into
1628 external applications.
1629 (`#335 <https://github.com/git-cola/git-cola/issues/335>`_)
1631 * We now show a progress bar when cloning repositories.
1632 (`#312 <https://github.com/git-cola/git-cola/issues/312>`_)
1634 * The bookmarks widget was simplified to not need a
1636 (`#289 <https://github.com/git-cola/git-cola/issues/289>`_)
1638 * Updated Traditional Chinese translation.
1640 * We now display a warning when trying to rebase with uncommitted changes.
1641 (`#338 <https://github.com/git-cola/git-cola/issues/338>`_)
1643 * The status widget learned to filter paths.
1644 `Ctrl+Shift+S` toggles the filter widget.
1645 (`#337 <https://github.com/git-cola/git-cola/issues/337>`_)
1646 (`#339 <https://github.com/git-cola/git-cola/pull/339>`_)
1648 * The status widget learned to move files to the trash
1649 when the `send2trash <https://github.com/hsoft/send2trash>`_
1650 module is installed.
1651 (`#341 <https://github.com/git-cola/git-cola/issues/341>`_)
1653 * "Recent repositories" is now a dedicated widget.
1654 (`#342 <https://github.com/git-cola/git-cola/issues/342>`_)
1656 * New Spanish translation thanks to Pilar Molina Lopez.
1657 (`#344 <https://github.com/git-cola/git-cola/pull/344>`_)
1661 * Newly added remotes are now properly seen by the fetch/push/pull dialogs.
1662 (`#343 <https://github.com/git-cola/git-cola/issues/343>`_)
1668 Usability, bells and whistles
1669 -----------------------------
1670 * New Brazillian Portuguese translation thanks to Vitor Lobo.
1672 * New Indonesian translation thanks to Samsul Ma'arif.
1674 * Updated Simplified Chinese translation thanks to Zhang Han.
1676 * `Ctrl+Backspace` is now a hotkey for "delete untracked files" in
1679 * Fetch/Push/Pull dialogs now use the configured remote of the current
1681 (`#324 <https://github.com/git-cola/git-cola/pull/324>`_)
1685 * We now use `os.getcwd()` on Python3.
1686 (`#316 <https://github.com/git-cola/git-cola/pull/316>`_)
1687 (`#326 <https://github.com/git-cola/git-cola/pull/326>`_)
1689 * The `Ctrl+P` hotkey was overloaded to both "push" and "cherry-pick",
1690 so "cherry-pick" was moved to `Ctrl+Shift+C`.
1692 * Custom GUI tools with mixed-case names are now properly supported.
1694 * "Diff Region" is now referred to as "Diff Hunk" for consistency
1695 with common terminology from diff/patch tools.
1696 (`#328 <https://github.com/git-cola/git-cola/issues/328>`_)
1698 * git-cola's test suite is now portable to MS Windows.
1699 (`#332 <https://github.com/git-cola/git-cola/pull/332>`_)
1705 Usability, bells and whistles
1706 -----------------------------
1707 * We now handle the case when inotify `add_watch()` fails
1708 and display instructions on how to increase the number of watches.
1709 (`#263 <https://github.com/git-cola/git-cola/issues/263>`_)
1711 * New and improved zh_TW localization thanks to V字龍(Vdragon).
1712 (`#265 <https://github.com/git-cola/git-cola/pull/265>`_)
1713 (`#267 <https://github.com/git-cola/git-cola/pull/267>`_)
1714 (`#268 <https://github.com/git-cola/git-cola/pull/268>`_)
1715 (`#269 <https://github.com/git-cola/git-cola/issues/269>`_)
1716 (`#270 <https://github.com/git-cola/git-cola/pull/270>`_)
1717 (`#271 <https://github.com/git-cola/git-cola/pull/271>`_)
1718 (`#272 <https://github.com/git-cola/git-cola/pull/272>`_)
1720 * New hotkeys: `Ctrl+F` for fetch, `Ctrl+P` for push,
1721 and `Ctrl+Shift+P` for pull.
1723 * The bookmarks widget's context menu actions were made clearer.
1724 (`#281 <https://github.com/git-cola/git-cola/issues/281>`_)
1726 * The term "Staging Area" is used consistently in the UI
1727 to allow for better localization.
1728 (`#283 <https://github.com/git-cola/git-cola/issues/283>`_)
1730 * The "Section" term is now referred to as "Diff Region"
1732 (`#297 <https://github.com/git-cola/git-cola/issues/297>`_)
1734 * The localization documentation related to the LANGUAGE
1735 environment variable was improved.
1736 (`#293 <https://github.com/git-cola/git-cola/pull/293>`_)
1738 * The "Actions" panel now contains tooltips for each button
1739 in case the button labels gets truncated by Qt.
1740 (`#292 <https://github.com/git-cola/git-cola/issues/292>`_)
1742 * Custom `git config`-defined actions can now be run in the
1743 background by setting `guitool.<name>.background` to `true`.
1747 * We now use bold fonts instead of SmallCaps to avoid
1748 artifacts on several configurations.
1750 * We now pickup `user.email`, `cola.tabwidth`, and similar settings
1751 when defined in /etc/gitconfig.
1752 (`#259 <https://github.com/git-cola/git-cola/issues/259>`_)
1754 * Better support for unicode paths when using inotify.
1755 (`bz #1104181 <https://bugzilla.redhat.com/show_bug.cgi?id=1104181>`_)
1757 * Unicode fixes for non-ascii locales.
1758 (`#266 <https://github.com/git-cola/git-cola/issues/266>`_)
1759 (`#273 <https://github.com/git-cola/git-cola/issues/273>`_)
1760 (`#276 <https://github.com/git-cola/git-cola/issues/276>`_)
1761 (`#282 <https://github.com/git-cola/git-cola/issues/282>`_)
1762 (`#298 <https://github.com/git-cola/git-cola/issues/298>`_)
1763 (`#302 <https://github.com/git-cola/git-cola/issues/302>`_)
1764 (`#303 <https://github.com/git-cola/git-cola/issues/303>`_)
1765 (`#305 <https://github.com/git-cola/git-cola/issues/305>`_)
1767 * Viewing history from the file browser was fixed for Python3.
1768 (`#274 <https://github.com/git-cola/git-cola/issues/274>`_)
1770 * setup.py was fixed to install the `*.rst` documentation.
1771 (`#279 <https://github.com/git-cola/git-cola/issues/279>`_)
1773 * Patch export was fixed for Python3.
1774 (`#290 <https://github.com/git-cola/git-cola/issues/290>`_)
1776 * Fixed adding a bookmark with trailing slashes.
1777 (`#295 <https://github.com/git-cola/git-cola/pull/295>`_)
1779 * The default `git dag` layout is now setup so that its widgets
1780 can be freely resized on Linux.
1781 (`#299 <https://github.com/git-cola/git-cola/issues/299>`_)
1783 * Invalid tag names are now reported when creating tags.
1784 (`#296 <https://github.com/git-cola/git-cola/pull/296>`_)
1790 Usability, bells and whistles
1791 -----------------------------
1792 * `git cola` no longer prompts after successfully creating a new branch.
1793 (`#251 <https://github.com/git-cola/git-cola/pull/251>`_)
1795 * Hitting enter on simple dialogs now accepts them.
1796 (`#255 <https://github.com/git-cola/git-cola/pull/255>`_)
1800 * `git dag` no longer relies on `sys.maxint`, which is
1801 not available in Python3.
1802 (`#249 <https://github.com/git-cola/git-cola/issues/249>`_)
1804 * Python3-related fixes.
1805 (`#254 <https://github.com/git-cola/git-cola/pull/254>`_)
1807 * Python3-on-Windows-related fixes.
1808 (`#250 <https://github.com/git-cola/git-cola/pull/250>`_)
1809 (`#252 <https://github.com/git-cola/git-cola/pull/252>`_)
1810 (`#253 <https://github.com/git-cola/git-cola/pull/253>`_)
1812 * Switching repositories using the bookmarks widget was not
1813 refreshing the inotify watcher.
1814 (`#256 <https://github.com/git-cola/git-cola/pull/256>`_)
1816 * Special commit messages trailers (e.g. "Acked-by:") are now special-cased to
1817 fix word wrapping lines that start with "foo:".
1818 (`#257 <https://github.com/git-cola/git-cola/issues/257>`_)
1820 * `git dag` sometimes left behind selection artifacts.
1821 We now refresh the view to avoid them.
1822 (`#204 <https://github.com/git-cola/git-cola/issues/204>`_)
1828 Usability, bells and whistles
1829 -----------------------------
1830 * Better inotify support for file creation and deletion.
1831 (`#240 <https://github.com/git-cola/git-cola/issues/240>`_)
1833 * `git cola` now supports the X11 Session Management Protocol
1834 and remembers its state across logout/reboot.
1835 (`#164 <https://github.com/git-cola/git-cola/issues/164>`_)
1837 * `git cola` has a new icon.
1838 (`#190 <https://github.com/git-cola/git-cola/issues/190>`_)
1842 * Building the documentation no longer requires `asciidoc`.
1843 We now use `Sphinx <http://sphinx-doc.org/>`_ for building
1844 html documentation and man pages.
1848 * Reworked the git-dag gravatar icon code to avoid a unicode
1851 * Commit message line-wrapping was made to better match the GUI editor.
1852 (`#242 <https://github.com/git-cola/git-cola/issues/242>`_)
1854 * Better support for Python3 on Windows
1855 (`#246 <https://github.com/git-cola/git-cola/issues/246>`_)
1859 * git-cola no longer depends on Asciidoc for building its documentation
1860 and man-pages. We now depend on [Sphinx](http://sphinx-doc.org/) only.
1866 Usability, bells and whistles
1867 -----------------------------
1868 * Some context menu actions are now hidden when selected
1870 (`#238 <https://github.com/git-cola/git-cola/issues/238>`_)
1874 * The build-git-cola.sh contrib script was improved.
1875 (`#235 <https://github.com/git-cola/git-cola/pull/235>`_)
1877 * Non-ascii worktrees work properly again.
1878 (`#234 <https://github.com/git-cola/git-cola/issues/234>`_)
1880 * The browser now guards itself against missing files.
1881 (`bz #1041378 <https://bugzilla.redhat.com/show_bug.cgi?id=1071378>`_)
1883 * Saving widget state now works under Python3.
1884 (`#236 <https://github.com/git-cola/git-cola/pull/236>`_)
1892 * git-cola now runs on Python 3 thanks to Virgil Dupras.
1893 (`#233 <https://github.com/git-cola/git-cola/pull/233>`_)
1895 * Python 2.6, 2.7, and 3.2+ are now supported.
1896 Python 2.5 is no longer supported.
1900 * i18n test fixes thanks to Virgil Dupras.
1901 (`#231 <https://github.com/git-cola/git-cola/pull/231>`_)
1903 * git-cola.app build fixes thanks to Maicon D. Filippsen.
1904 (`#230 <https://github.com/git-cola/git-cola/pull/230>`_)
1906 * Lots of pylint improvements thanks to Alex Chernetz.
1907 (`#229 <https://github.com/git-cola/git-cola/pull/229>`_)
1913 Usability, bells and whistles
1914 -----------------------------
1915 * The new `Bookmarks` tool makes it really easy to switch between repositories.
1917 * There is now a dedicated dialog for applying patches.
1918 See the ``File -> Apply Patches`` menu item.
1919 (`#215 <https://github.com/git-cola/git-cola/issues/215>`_)
1921 * A new `git cola am` sub-command was added for applying patches.
1925 * Fixed a typo that caused inotify events to be silently ignored.
1927 * Fixed the sys.path setup for Mac OS X (Homebrew).
1928 (`#221 <https://github.com/git-cola/git-cola/issues/221>`_)
1930 * Lots of pylint fixes thanks to Alex Chernetz.
1936 Usability, bells and whistles
1937 -----------------------------
1938 * `git cola --amend` now starts the editor in `amend` mode.
1939 (`#187 <https://github.com/git-cola/git-cola/issues/187>`_)
1941 * Multiple lines of text can now be pasted into the `summary` field.
1942 All text beyond the first newline will be automatically moved to the
1943 `extended description` field.
1944 (`#212 <https://github.com/git-cola/git-cola/issues/212>`_)
1948 * Stray whitespace in `.git` files is now ignored.
1949 (`#213 <https://github.com/git-cola/git-cola/issues/213>`_)
1951 * Fix "known incorrect sRGB profile" in `staged-item.png`.
1952 (`gentoo-devel message #85066
1953 <http://comments.gmane.org/gmane.linux.gentoo.devel/85066>`_)
1961 * Fix a traceback when `git push` fails.
1962 (`bz #1034778 <https://bugzilla.redhat.com/show_bug.cgi?id=1034778>`_)
1966 * Most of the git-cola sub-packages have been removed.
1967 The only remaining packages are `cola`, `cola.models`,
1970 * The translation file for Simplified Chinese was renamed
1972 (`#209 <https://github.com/git-cola/git-cola/issues/209>`_)
1980 * `git cola version --brief` now prints the brief version number.
1984 * Resurrected the "make dist" target, for those that prefer to create
1987 * Fixed the typo that broke the preferences dialog.
1993 Usability, bells and whistles
1994 -----------------------------
1995 * We now ship a full-featured interactive `git rebase` editor.
1996 The rebase todo file is edited using the `git xbase` script which
1997 is provided at `$prefix/share/git-cola/bin/git-xbase`.
1998 This script can be used standalone by setting the `$GIT_SEQUENCE_EDITOR`
1999 before running `git rebase --interactive`.
2000 (`#1 <https://github.com/git-cola/git-cola/issues/1>`_)
2002 * Fixup commit messages can now be loaded from the commit message editor.
2004 * Tool widgets can be locked in place by using the "Tools/Lock Layout"
2006 (`#202 <https://github.com/git-cola/git-cola/issues/202>`_)
2008 * You can now push to several remotes simultaneously by selecting
2009 multiple remotes in the "Push" dialog.
2010 (`#148 <https://github.com/git-cola/git-cola/issues/148>`_)
2012 * The `grep` tool learned to search using three different modes:
2013 basic regular expressions (default), extended regular expressions,
2018 * `git cola` now depends on the `argparse` Python module.
2019 This module is part of the stdlib in Python 2.7 and must
2020 be installed separately when using Python 2.6 and below.
2024 * Support unicode in the output from `fetch`, `push`, and `pull`.
2030 Usability, bells and whistles
2031 -----------------------------
2032 * We now detect when the editor or history browser are misconfigured.
2033 (`#197 <https://github.com/git-cola/git-cola/issues/197>`_)
2034 (`bz #886826 <https://bugzilla.redhat.com/show_bug.cgi?id=886826>`_)
2036 * Display of untracked files can be disabled from the Preferences dialog
2037 or by setting the `gui.displayuntracked` configuration variable to `false`.
2038 (`Git Mailing List on 2013-08-21
2039 <https://public-inbox.org/git/20130821032913.GA6092@wheezy.local/>`_)
2043 * Unicode stash names are now supported
2044 (`#198 <https://github.com/git-cola/git-cola/issues/198>`_)
2046 * The diffs produced when reverting workspace changes were made more robust.
2051 =======================
2052 Usability, bells and whistles
2053 -----------------------------
2054 * Brand new German translation thanks to Sven Claussner.
2056 * The "File" menu now provides a "New Repository..." menu action.
2058 * `git dag` now uses a dock-widget interface so that its widgets can
2059 be laid-out and arranged. Customizations are saved and restored
2060 the next time `git dag` is launched.
2062 * `git dag` now has a "Zoom Best Fit" button next alongside the
2063 "Zoom In" and "Zoom Out" buttons.
2065 * `Ctrl+L` now focuses the "Search" field in the `git dag` tool.
2067 * Right-clicking in the "diff" viewer now updates the cursor position
2068 before performing actions, which makes it much easier to click around
2069 and selectively stage sections. Previously, the current cursor position
2070 was used which meant that it required two clicks (left-click to update
2071 the position followed by right-click to get the context menu) for the
2072 desired section to be used. This is now a single right-click operation.
2074 * The `Ctrl+D` "Launch Diff Tool" action learned to automatically choose
2075 between `git difftool` and `git mergetool`. If the file is unmerged then
2076 we automatically launch `git mergetool` on the path, otherwise we use
2077 `git difftool`. We do this because `git difftool` is not intended to
2078 be used on unmerged paths. Automatically using `git mergetool` when
2079 appropriate is the most intuitive and muscle-memory-friendly thing to do.
2081 * You can now right-click on folders in your standard file browser
2082 and choose "Open With -> Git Cola" (Linux-only).
2086 * Python 2.6 on Mac OS X Snow Leopard does not provide a namedtuple
2087 at `sys.version_info`. We now avoid using that variable for better
2090 * We now read the user's Git configuration from `~/.config/git/config`
2091 if that file is available, otherwise we use the traditional `~/.gitconfig`
2092 path, just like Git itself.
2094 * Some edge cases were fixed when applying partial/selected diffs.
2096 * The diff viewer is now properly cleared when refreshing.
2097 (`#194 <https://github.com/git-cola/git-cola/issues/194>`_)
2103 Usability, bells and whistles
2104 -----------------------------
2105 * The diff viewer now has an "Options" menu which can be
2106 used to set "git diff" options. This can be used to
2107 ignore whitespace changes or to show a change with its
2108 surrounding function as context.
2109 (`#150 <https://github.com/git-cola/git-cola/issues/150>`_)
2111 * `git cola` now remembers your commit message and will restore it
2112 when `git cola` is restarted.
2113 (`#175 <https://github.com/git-cola/git-cola/pull/175>`_)
2115 * `Ctrl+M` can now be used to toggle the "Amend last commit"
2116 checkbox in the commit message editor.
2117 (`#161 <https://github.com/git-cola/git-cola/pull/161>`_)
2119 * Deleting remote branches can now be done from the "Branch" menu.
2120 (`#152 <https://github.com/git-cola/git-cola/issues/152>`_)
2122 * The commit message editor now has a built-in spell checker.
2126 * We now avoid invoking external diffs when showing diffstats.
2127 (`#163 <https://github.com/git-cola/git-cola/pull/163>`_)
2129 * The `Status` tool learned to reselect files when refreshing.
2130 (`#165 <https://github.com/git-cola/git-cola/issues/165>`_)
2132 * `git cola` now remembers whether it has been maximized and will restore the
2133 maximized state when `git cola` is restarted.
2134 (`#172 <https://github.com/git-cola/git-cola/issues/172>`_)
2136 * Performance is now vastly improved when staging hundreds or
2139 * `git cola` was not correctly saving repo-specific configuration.
2140 (`#174 <https://github.com/git-cola/git-cola/issues/174>`_)
2142 * Fix a UnicodeDecode in sphinxtogithub when building from source.
2148 Usability, bells and whistles
2149 -----------------------------
2150 * We now automatically remove missing repositories from the
2151 "Select Repository" dialog.
2152 (`#145 <https://github.com/git-cola/git-cola/issues/145>`_)
2154 * A new `git cola diff` sub-command was added for diffing changed files.
2158 * The inotify auto-refresh feature makes it difficult to select text in
2159 the "diff" editor when files are being continually modified by another
2160 process. The auto-refresh causes it to lose the currently selected text,
2161 which is not wanted. We now avoid this problem by saving and restoring
2162 the selection when refreshing the editor.
2163 (`#155 <https://github.com/git-cola/git-cola/issues/155>`_)
2165 * More strings have been marked for l10n.
2166 (`#157 <https://github.com/git-cola/git-cola/issues/157>`_)
2168 * Fixed the Alt+D Diffstat shortcut.
2169 (`#159 <https://github.com/git-cola/git-cola/issues/159>`_)
2173 * Better error handling when cloning repositories.
2175 We were not handling the case where a git URL has
2176 no basename, e.g. `https://git.example.com/`.
2177 `git cola` originally rejected these URLs instead of
2178 allowing users to clone them. It now allows these URLs
2179 when they point to valid git repositories.
2181 Additionally, `git cola` learned to echo the errors
2182 reported by `git clone` when it fails.
2183 (`#156 <https://github.com/git-cola/git-cola/issues/156>`_)
2189 Usability, bells and whistles
2190 -----------------------------
2191 * `git dag` got a big visual upgrade.
2193 * `Ctrl+G` now launches the "Grep" tool.
2195 * `Ctrl+D` launches difftool and `Ctrl+E` launches your editor
2196 when in the diff panel.
2198 * git-cola can now be told to use an alternative language.
2199 For example, if the native language is German and we want git-cola to
2200 use English then we can create a `~/.config/git-cola/language` file with
2201 "en" as its contents: ``echo en >~/.config/git-cola/language``
2202 (`#140 <https://github.com/git-cola/git-cola/issues/140>`_)
2204 * A new `git cola merge` sub-command was added for merging branches.
2206 * Less blocking in the main UI
2210 * Autocomplete issues on KDE
2211 (`#144 <https://github.com/git-cola/git-cola/issues/144>`_)
2213 * The "recently opened repositories" startup dialog did not
2214 display itself in the absence of bookmarks.
2215 (`#139 <https://github.com/git-cola/git-cola/issues/139>`_)
2221 Usability, bells and whistles
2222 -----------------------------
2223 * `git cola` learned to honor `.gitattributes` when showing and
2224 interactively applying diffs. This makes it possible to store
2225 files in git using a non-utf-8 encoding and `git cola` will
2226 properly accept them. This must be enabled by settings
2227 `cola.fileattributes` to true, as it incurs a small performance
2229 (`#96 <https://github.com/git-cola/git-cola/issues/96>`_)
2231 * `git cola` now wraps commit messages at 72 columns automatically.
2232 This is configurable using the `cola.linebreak` variable to enable/disable
2233 the feature, and `cola.textwidth` to configure the limit.
2234 (`#133 <https://github.com/git-cola/git-cola/issues/133>`_)
2236 * A new "Open Recent" sub-menu was added to the "File" menu.
2237 This makes it easy to open a recently-edited repository.
2238 (`#135 <https://github.com/git-cola/git-cola/issues/135>`_)
2240 * We now show a preview for untracked files when they are clicked
2241 using the `Status` tool.
2242 * A new "Open Using Default Application" action was added to the
2243 `Status` tool. It is activated using either `Spacebar` or through
2244 the context menu. This action uses `xdg-open` on Linux and
2246 * A new "Open Parent Directory" action was added to the `Status` tool.
2247 It is activated using either `Shift+Spacebar` or through the
2249 * `git dag` learned to honor the `log.date` git configuration variable.
2250 This makes the date display follow whatever format the user has
2252 * A new `git cola config` sub-command was added for quickly
2253 tweaking `git cola`'s git configuration settings.
2254 * Some small usability tweaks -- some user confirmation prompts
2255 were defaulting to "Cancel" when they should have been defaulting
2256 to the affirmative option instead.
2260 * Properly handle arbitrarily-named branches.
2261 * We went back to launching `git mergetool` using an xterm.
2262 The reason is that there are a couple of places where `git mergetool`
2263 requires a terminal for user interaction not covered by `--no-prompt`.
2264 * We now properly handle an edge case when applying short diffs at
2265 the start of a file.
2271 Usability, bells and whistles
2272 -----------------------------
2273 * New and improved `grep` mode lets you instantly find and edit files.
2274 * New `git cola grep` standalone mode.
2275 * Support for passing arguments to the configured editors, e.g. `gvim -p`
2276 This makes it possible to select multiple files in the status
2277 window and use `Ctrl-e` to edit them all at once.
2278 * Remote operations now prompt on errors only.
2279 * The `Tab` key now jumps to the extended description when editing the summary.
2280 * More shortcut key labels and misc. UX improvements.
2284 * Selecting an item no longer copies its filename to the copy/paste buffer.
2285 `Ctrl-c` or the "Copy" context-menu action can be used instead.
2286 * The repository monitoring feature on Windows learned to ignore
2287 changes within the ".git" directory. Thanks to Andreas Sommer.
2288 (`#120 <https://github.com/git-cola/git-cola/issues/120>`_)
2294 Usability, bells and whistles
2295 -----------------------------
2296 * `git dag` learned to color-code branchy edges.
2297 The edge colors change when a new branch is detected,
2298 which makes the history much easier to follow.
2299 A huge thanks to Uri Okrent for making it happen.
2301 * New GUI for editing remote repositories.
2303 * New `git cola archive` and `git cola remote` sub-commands.
2305 * `git cola browser` learned an 'Untrack' command.
2307 * The diff editor learned to staged/unstaged while amending.
2309 * The status tool can now scroll horizontally.
2311 * New git repositories can be created by clicking 'New' on the
2312 `git cola --prompt` startup screen.
2318 Usability, bells and whistles
2319 -----------------------------
2320 * Auto-completion was added to more tools.
2322 * `git dag` is easier to use on smaller displays -- the author
2323 field elides its text which allows for a more compact display.
2325 * Selected commits in `git dag` were made more prominent and
2328 * 'Create Branch' learned to fetch remote branches and uses a
2329 background thread to do so.
2331 * User-configured GUI tools are listed alphabetically in the 'Actions' menu.
2333 * The 'Pull' dialog remembers the value of the 'Rebase' checkbox
2334 between invocations.
2342 * Detect Homebrew so that OS X users do not need to set PYTHONPATH.
2344 * `git dag` can export patches again.
2350 Usability, bells and whistles
2351 -----------------------------
2352 * The 'Classic' tool was renamed to 'Browser' and learned to
2353 limit history to the current branch.
2355 * `git dag` learned about gravatar and uses it to show images
2358 * `git dag` learned to use OpenGL for rendering resulting in
2359 much faster rendering.
2361 * More dialogs learned vim-style keyboard shortcuts.
2363 * The commit message editor learned better arrow key navigation.
2369 Usability, bells and whistles
2370 -----------------------------
2371 * `git cola` learned a few new sub commands:
2379 * `Return` in the summary field jumps to the extended description.
2381 * `Ctrl+Return` is now a shortcut for 'Commit'.
2383 * Better French translation for 'Sign-off'.
2385 * The 'Search' widget now has a much simpler and streamlined
2388 * vim-style `h,j,k,l` navigation shortcuts were added to the DAG widget.
2390 * `git dag` no longer prompts for files when diffing commits if the
2391 text field contains paths.
2393 * General user interface and performance improvements.
2397 * The diff viewer no longer changes font size when holding `Control`
2398 while scrolling with the mouse wheel.
2400 * Files with a typechange (e.g. symlinks that become files, etc.)
2401 are now correctly identified as being modified.
2405 * The `cola.controllers` and `cola.views` packages were removed.
2411 Usability, bells and whistles
2412 -----------------------------
2413 * `git cola` can now launch sub commands, e.g.:
2424 * `git dag` is more responsive when gathering auto-completions.
2426 * Keyboard shortcuts are displayed when the '?' key is pressed.
2428 * Various keyboard shortcuts were added for improved usability.
2430 * The status widget now lists unmerged files before modified files.
2432 * vim-style `h,j,k,l` navigation shortcuts were added to the status widget.
2434 * A 'Recently Modified Files...' tool was added.
2436 * Tools can now be hidden with `Alt + #` (where `#` is a keyboard number)
2437 and focused with `Alt + Shift + #`.
2439 * The syntax highlighting colors for diffs was made less intrusive.
2441 * The commit message editor was redesigned to have a more compact
2442 and keyboard-convenient user interface.
2444 * Keyboard shortcuts for adding a Signed-off-by (`Ctrl + i`)
2445 and creating a commit (`Ctrl + m`) were added.
2447 * The status widget was adjusted to use less screen real-estate.
2451 * Avoid updating the index when responding to inotify events.
2452 This avoids interfering with operations such as `git rebase --interactive`.
2453 (`#99 <https://github.com/git-cola/git-cola/issues/99>`_)
2457 * Create `git-dag.pyw` in the win32 installer.
2459 * win32 shortcuts now contain explicit calls to `pythonw.exe` instead of
2460 calling the `.pyw` file directly.
2464 * The 'Apply Changes from Branch...' feature was removed.
2465 `git dag`'s 'Grab File...' feature used alongside the index/worktree editor
2466 is a simpler alternative.
2474 * Further enhanced the staging/unstaging behavior in the status widget.
2475 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
2477 * Unmerged files are no longer listed as modified.
2481 The `cola-$version` tarballs on github were originally setup to
2482 have the same contents as the old tarballs hosted on tuxfamily.
2483 The `make dist` target was changed to write files to a
2484 `git-cola-$version` subdirectory and tarball.
2486 This makes the filenames consistent for the source tarball,
2487 the darwin .app tarball, and the win32 .exe installer.
2493 Usability, bells and whistles
2494 -----------------------------
2495 * Refined the staging/unstaging behavior for code reviews.
2496 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
2498 * Added more styling and icons to menus and buttons.
2500 * Adjusted some terminology to more closely match the git CLI.
2504 * Boolean `git config` settings with no value are now supported
2505 (these are not created by git these days but exist in legacy repositories).
2507 * Unicode branches and tags are supported in the "branch diff" tool.
2509 * Guard against low-memory conditions and more interrupted system calls.
2513 * Added desktop launchers for git-cola.desktop and git-dag.desktop.
2514 This replaces the old cola.desktop, so some adjustments to RPM .spec
2515 and debian/ files will be needed.
2517 * Fixed the darwin app-tarball Makefile target to create relative paths.
2521 * The `--style` option was removed. `git cola` follows the system theme
2522 so there's no need for this option these days.
2528 Usability, bells and whistles
2529 -----------------------------
2530 * Export a patch series from `git dag` into a `patches/` directory.
2532 * `git dag` learned to diff commits, slice history along paths, etc.
2534 * Added instant-preview to the `git stash` widget.
2536 * A simpler preferences editor is used to edit `git config` values.
2537 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
2538 (`#89 <https://github.com/git-cola/git-cola/issues/89>`_)
2540 * Previous commit messages can be re-loaded from the message editor.
2541 (`#33 <https://github.com/git-cola/git-cola/issues/33>`_)
2545 * Display commits with no file changes.
2546 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
2548 * Improved the diff editor's copy/paste behavior
2549 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
2553 * Bumped version number to ceil(minimum git version).
2554 `git cola` now requires `git` >= 1.6.3.
2556 * Simplified git-cola's versioning when building from tarballs
2557 outside of git. We no longer check for a 'version' file at
2558 the root of the repository. We instead keep a default version
2559 in `cola/version.py` and use it when `git cola`'s `.git` repository
2566 Usability, bells and whistles
2567 -----------------------------
2568 * inotify is much snappier and available on Windows
2569 thanks to Karl Bielefeldt.
2571 * New right-click command to add untracked files to .gitignore
2572 thanks to Audrius Karabanovas.
2574 * Stash, fetch, push, and pull usability improvements
2576 * General usability improvements
2578 * stderr is logged when applying partial diffs.
2582 * Files can be unstaged when amending.
2583 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
2585 * Show the configured remote.$remote.pushurl in the GUI
2586 (`#83 <https://github.com/git-cola/git-cola/issues/83>`_)
2588 * Removed usage of the "user" module.
2589 (`#86 <https://github.com/git-cola/git-cola/issues/86>`_)
2591 * Avoids an extra `git update-index` call during startup.
2598 Usability, bells and whistles
2599 -----------------------------
2600 * We now provide better feedback when `git push` fails.
2601 (`#69 <https://github.com/git-cola/git-cola/issues/69>`_)
2603 * The Fetch, Push, and Pull dialogs now give better feedback
2604 when interacting with remotes. The dialogs are modal and
2605 a progress dialog is used.
2609 * More unicode fixes, again. It is now possible to have
2610 unicode branch names, repository paths, home directories, etc.
2611 This continued the work initiated by Redhat's bugzilla #694806.
2613 https://bugzilla.redhat.com/show_bug.cgi?id=694806
2619 Usability, bells and whistles
2620 -----------------------------
2621 * The `git cola` desktop launchers now prompt for a repo
2622 by default. This is done by using the new `--prompt`
2623 flag which tells `git cola` to ignore any git repositories
2624 in the current directory and prompt for one instead.
2628 * More Unicode fixes for repositories and home directories with
2629 embedded unicode characters. Thanks to Christian Jann for
2630 patience and helpful bug reports.
2632 * Fix the 'Clone' button in the startup dialog.
2638 Usability, bells and whistles
2639 -----------------------------
2640 * Faster startup time! `git cola` now offloads initialization
2641 to a background thread so that the GUI appears almost instantly.
2643 * Specialized diff options for p4merge, vimdiff, araxis, emerge,
2644 and ecmerge in difftool (backported from git.git).
2648 * Fix launching commands in the background on Windows
2649 (e.g. when launching `git difftool`).
2651 * Fix unicode errors when home or repository directories contain
2653 (`#74 <https://github.com/git-cola/git-cola/issues/74>`_)
2654 (`bz #694806 <https://bugzilla.redhat.com/show_bug.cgi?id=694806>`_)
2660 Usability, bells and whistles
2661 -----------------------------
2662 * The `cola classic` tool can be now configured to be dockable.
2663 (`#56 <https://github.com/git-cola/git-cola/issues/56>`_)
2665 * The `cola classic` tool now uses visual sigils to indicate a file's status.
2666 The idea and icons were provided by Uri Okrent.
2668 * Include the 'Rescan' button in the 'Actions' widget regardless
2669 of whether inotify is installed.
2673 * Fix installation of translations per Fedora
2674 This incorporates Fedora's fix for the translations path
2675 which originally appeared in cola-1.4.3-translations.patch.
2677 * Mac OS X git-cola developers can now generate git-cola.app
2678 application bundles using 'make app-bundle'.
2682 * Fixed a stacktrace when trying to use "Get Commit Message Template"
2683 with an unconfigured "commit.template" git config variable.
2684 (`bz #67521 <https://bugzilla.redhat.com/show_bug.cgi?id=675721>`_)
2685 (`#72 <https://github.com/git-cola/git-cola/issues/72>`_)
2687 * Properly raise the main window on Mac OS X.
2689 * Properly handle staging a huge numbers of files at once.
2691 * Speed up 'git config' usage by fixing cola's caching proxy.
2693 * Guard against damaged ~/.cola files.
2699 Usability, bells and whistles
2700 -----------------------------
2701 * `git dag` now has a separate display area
2702 for displaying commit metadata. This area will soon
2703 grow additional functionality such as cherry-picking,
2708 * Fixed tests from a previous refactoring.
2710 * Guard against 'diff.external' configuration by always
2711 calling 'git diff' with the '--no-ext-diff' option.
2712 (`#67 <https://github.com/git-cola/git-cola/issues/67>`_)
2714 * Respect 'gui.diffcontext' so that cola's diff display
2715 shows the correct number of context lines.
2717 * Raise the GUI so that it is in the foreground on OS X.
2721 * We now allow distutils to rewrite cola's shebang line.
2722 This allows us to run on systems where "which python"
2723 is Python3k. This is exposed by setting the `PYTHON`
2724 Makefile variable to the location of python2.x.
2726 * git-cola.app is now a tiny download because it no longer
2727 contains Qt and PyQt. These libraries are provided as a
2729 (`Link <http://code.google.com/p/git-cola/downloads/list>`_)
2735 Usability, bells and whistles
2736 -----------------------------
2737 * Clicking on paths in the status widget copies them into the
2738 copy/paste buffer for easy middle-clicking into terminals.
2740 * `Ctrl+C` in diff viewer copies the selected diff to the clipboard.
2744 * Fixed the disappearing actions buttons on PyQt 4.7.4
2745 as reported by Arch and Ubuntu 10.10.
2746 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
2748 * Fixed mouse interaction with the status widget where some
2749 items could not be de-selected.
2753 * Removed hard-coded reference to lib/ when calculating Python's
2754 site-packages directory.
2760 Usability, bells and whistles
2761 -----------------------------
2762 * Removed "single-click to (un)stage" in the status view.
2763 This is a usability improvement since we no longer perform
2764 different actions depending on where a row is clicked.
2766 * Added ability to create unsigned, annotated tags.
2770 * Updated documentation to use `cola.git` instead of `cola.gitcmd`.
2776 Usability, bells and whistles
2777 -----------------------------
2778 * Allow un/staging by right-clicking top-level items
2779 (`#57 <https://github.com/git-cola/git-cola/issues/57>`_)
2781 * Running 'commit' with no staged changes prompts to allow
2783 (`#55 <https://github.com/git-cola/git-cola/issues/55>`_)
2785 * Fetch, Push, and Pull are now available via the menus
2786 (`#58 <https://github.com/git-cola/git-cola/issues/58>`_)
2790 * Simplified the actions widget to work around a regression
2792 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
2798 Usability, bells and whistles
2799 -----------------------------
2800 * `git dag` interaction was made faster.
2804 * Added '...' indicators to the buttons for
2805 'Fetch...', 'Push...', 'Pull...', and 'Stash...'.
2806 (`#51 <https://github.com/git-cola/git-cola/issues/51>`_)
2808 * Fixed a hang-on-exit bug in the cola-provided
2809 'ssh-askpass' implementation.
2815 Usability, bells and whistles
2816 -----------------------------
2817 * Staging and unstaging is faster.
2818 (`#48 <https://github.com/git-cola/git-cola/issues/48>`_)
2820 * `git dag` reads history in a background thread.
2824 * Added :data:`cola.compat.hashlib` for `Python 2.4` compatibility
2825 * Improved `PyQt 4.1.x` compatibility.
2829 * Configured menu actions use ``sh -c`` for Windows portability.
2836 Usability, bells and whistles
2837 -----------------------------
2838 * Added support for the configurable ``guitool.<tool>.*``
2839 actions as described in the ``git config`` documentation.
2840 (`git-config(1) <https://git-scm.com/docs/git-config>`_)
2841 (`#44 <https://github.com/git-cola/git-cola/issues/44>`_)
2843 This makes it possible to add new actions to `git cola`
2844 by simply editing ``~/.gitconfig``. This implements the
2845 same guitool support as `git gui`.
2847 * Introduced a stat cache to speed up `git config` and
2848 repository status checks.
2850 * Added Alt-key shortcuts to the main `git cola` interface.
2852 * The `Actions` dock widget switches between a horizontal
2853 and vertical layout when resized.
2855 * We now use ``git diff --submodule`` for submodules
2856 (used when git >= 1.6.6).
2858 * The context menu for modified submodules includes an option
2859 to launch `git cola`.
2860 (`#17 <https://github.com/git-cola/git-cola/issues/17>`_)
2862 * Prefer ``$VISUAL`` over ``$EDITOR`` when both are defined.
2863 These are used to set a default editor in lieu of `core.editor`
2866 * Force the editor to be ``gvim`` when we see ``vim``.
2867 This prevents us from launching an editor in the (typically
2868 unattached) parent terminal and creating zombie editors
2869 that cannot be easily killed.
2871 * Selections are remembered and restored across updates.
2872 This makes the `partial-staging` workflow easier since the
2873 diff view will show the updated diff after staging.
2875 * Show the path to the current repository in a tooltip
2876 over the commit message editor.
2877 (`#45 <https://github.com/git-cola/git-cola/issues/45>`_)
2879 * Log internal ``git`` commands when ``GIT_COLA_TRACE`` is defined.
2880 (`#39 <https://github.com/git-cola/git-cola/issues/39>`_)
2884 * Improved backwards compatibility for Python 2.4.
2886 * `Review mode` can now review the current branch; it no longer
2887 requires you to checkout the branch into which the reviewed
2888 branch will be merged.
2890 * Guard against `color.ui = always` configuration when using
2891 `git log` by passing ``--no-color``.
2893 * ``yes`` and ``no`` are now supported as valid booleans
2894 by the `git config` parser.
2896 * Better defaults are used for `fetch`, `push`, and `pull`..
2897 (`#43 <https://github.com/git-cola/git-cola/issues/43>`_)
2901 * Removed colon (`:`) from the applilcation name on Windows
2902 (`#41 <https://github.com/git-cola/git-cola/issues/41>`_)
2904 * Fixed bugs with the Windows installer
2905 (`#40 <https://github.com/git-cola/git-cola/issues/40>`_)
2907 * Added a more standard i18n infrastructure. The install
2908 tree now has the common ``share/locale/$lang/LC_MESSAGES/git-cola.mo``
2909 layout in use by several projects.
2911 * Started trying to accommodate Mac OSX 10.6 (Snow Leopard)
2912 in the ``darwin/`` build scripts but our tester is yet to
2913 report success building a `.app` bundle.
2915 * Replaced use of ``perl`` in Sphinx/documentation Makefile
2916 with more-portable ``sed`` constructs. Thanks to
2917 Stefan Naewe for discovering the portability issues and
2918 providing msysgit-friendly patches.
2924 Usability, bells and whistles
2925 -----------------------------
2926 * It is now possible to checkout from the index as well
2927 as from `HEAD`. This corresponds to the
2928 `Removed Unstaged Changes` action in the `Repository Status` tool.
2930 * The `remote` dialogs (fetch, push, pull) are now slightly
2933 * Bookmarks can be selected when `git cola` is run outside of a git repository.
2935 * Added more user documentation. We now include many links to
2936 external git resources.
2938 * Added `git dag` to the available tools.
2939 `git dag` is a node-based DAG history browser.
2940 It doesn't do much yet, but it's been merged so that we can start
2941 building and improving upon it.
2945 * Fixed a missing ``import`` when showing `right-click` actions
2946 for unmerged files in the `Repository Status` tool.
2948 * ``git update-index --refresh`` is no longer run every time
2949 ``git cola version`` is run.
2951 * Don't try to watch non-existent directories when using `inotify`.
2953 * Use ``git rev-parse --symbolic-full-name`` plumbing to find
2954 the name of the current branch.
2958 * The ``Makefile`` will now conditionally include a ``config.mak``
2959 file located at the root of the project. This allows for user
2960 customizations such as changes to the `prefix` variable
2961 to be stored in a file so that custom settings do not need to
2962 be specified every time on the command-line.
2964 * The build scripts no longer require a ``.git`` directory to
2965 generate the ``builtin_version.py`` module. The release tarballs
2966 now include a ``version`` file at the root of the project which
2967 is used in lieu of having the git repository available.
2968 This allows for ``make clean && make`` to function outside of
2971 * Added maintainer's ``make dist`` target to the ``Makefile``.
2973 * The built-in `simplejson` and `jsonpickle` libraries can be
2974 excluded from ``make install`` by specifying the ``standalone=true``
2975 `make` variable. For example, ``make standalone=true install``.
2976 This corresponds to the ``--standalone`` option to ``setup.py``.
2983 Usability, bells and whistles
2984 -----------------------------
2985 * We now use patience diff by default when it is available via
2986 `git diff --patience`.
2988 * Allow closing the `cola classic` tool with `Ctrl+W`.
2992 * Fixed an unbound variable error in the `push` dialog.
2996 * Don't include `simplejson` in MANIFEST.in.
2998 * Update desktop entry to read `Cola Git GUI`.
3005 This feature release adds two new features directly from
3006 `git cola`'s github issues backlog. On the developer
3007 front, further work was done towards modularizing the code base.
3009 Usability, bells and whistles
3010 -----------------------------
3011 * Dragging and dropping patches invokes `git am`
3012 (`#3 <https://github.com/git-cola/git-cola/issues/3>`_)
3014 * A dialog to allow opening or cloning a repository
3015 is presented when `git cola` is launched outside of a git repository.
3016 (`#22 <https://github.com/git-cola/git-cola/issues/22>`_)
3018 * Warn when `push` is used to create a new branch
3019 (`#35 <https://github.com/git-cola/git-cola/issues/35>`_)
3021 * Optimized startup time by removing several calls to `git`.
3026 * `git cola` is once again compatible with PyQt 4.3.x.
3030 * `cola.gitcmds` was added to factor out git command-line utilities
3032 * `cola.gitcfg` was added for interacting with `git config`
3034 * `cola.models.browser` was added to factor out repobrowser data
3045 * Fix launching external applications on Windows
3047 * Ensure that the `amend` checkbox is unchecked when switching modes
3049 * Update the status tree when amending commits
3058 * Fix Lintian warnings
3067 * Fix X11 warnings on application startup
3076 * Added missing 'Exit Diff Mode' button for 'Diff Expression' mode
3077 (`#31 <https://github.com/git-cola/git-cola/issues/31>`_)
3079 * Fix a bug when initializing fonts on Windows
3080 (`#32 <https://github.com/git-cola/git-cola/issues/32>`_)
3089 * Keep entries in sorted order in the `cola classic` tool
3091 * Fix staging untracked files
3092 (`#27 <https://github.com/git-cola/git-cola/issues/27>`_)
3094 * Fix the `show` command in the Stash dialog
3095 (`#29 <https://github.com/git-cola/git-cola/issues/29>`_)
3097 * Fix a typo when loading merge commit messages
3098 (`#30 <https://github.com/git-cola/git-cola/issues/30>`_)
3105 This release focuses on a redesign of the git-cola user interface,
3106 a tags interface, and better integration of the `cola classic` tool.
3107 A flexible interface based on configurable docks is used to manage the
3108 various cola widgets.
3110 Usability, bells and whistles
3111 -----------------------------
3112 * New GUI is flexible and user-configurable
3114 * Individual widgets can be detached and rearranged arbitrarily
3116 * Add an interface for creating tags
3118 * Provide a fallback `SSH_ASKPASS` implementation to prompt for
3119 SSH passwords on fetch/push/pull
3121 * The commit message editor displays the current row/column and
3122 warns when lines get too long
3124 * The `cola classic` tool displays upstream changes
3126 * `git cola --classic` launches `cola classic` in standalone mode
3128 * Provide more information in log messages
3132 * Inherit the window manager's font settings
3134 * Miscellaneous PyQt4 bug fixes and workarounds
3138 * Removed all usage of Qt Designer `.ui` files
3140 * Simpler model/view architecture
3142 * Selection is now shared across tools
3144 * Centralized notifications are used to keep views in sync
3146 * The `cola.git` command class was made thread-safe
3148 * Less coupling between model and view actions
3150 * The status view was rewritten to use the MVC architecture
3152 * Added more documentation and tests
3159 Usability, bells and whistles
3160 -----------------------------
3161 * Added a `cola classic` tool for browsing the entire repository
3163 * Handle diff expressions with spaces
3165 * Handle renamed files
3169 * Handle carat `^` characters in diff expressions on Windows
3171 * Worked around a PyQt 4.5/4.6 QThreadPool bug
3175 * Added a keyboard shortcuts reference page
3177 * Added developer API documentation
3181 * Fix the diff expression used when reviewing branches
3183 * Fix a bug when pushing branches
3185 * Fix X11 warnings at startup
3187 * Fix more interrupted system calls on Mac OS X
3194 Usability, bells and whistles
3195 -----------------------------
3196 * Fresh and tasty SVG logos
3198 * Added `Branch Review` mode for reviewing topic branches
3200 * Added diff modes for diffing between tags, branches,
3201 or arbitrary `git diff` expressions
3203 * The push dialog selects the current branch by default.
3204 This is in preparation for `git 1.7.0` where unconfigured `git push`
3205 will refuse to push when run without specifying the remote name
3206 and branch. See the `git` release notes for more information
3208 * Support `open` and `clone` commands on Windows
3210 * Allow saving cola UI layouts
3212 * Re-enabled `double-click-to-stage` for unmerged entries.
3213 Disabling it for unmerged items was inconsistent, though safer.
3215 * Show diffs when navigating the status tree with the keyboard
3219 * Worked around `pyuic4` bugs in the `setup.py` build script
3221 * Added Mac OSX application bundles to the download page
3230 * `git difftool` became an official git command in `git 1.6.3`.
3232 * `git difftool` learned `--no-prompt` / `-y` and a corresponding
3233 `difftool.prompt` configuration variable
3235 Usability, bells and whistles
3236 -----------------------------
3237 * Warn when `non-fast-forward` is used with fetch, push or pull
3239 * Allow `Ctrl+C` to exit cola when run from the command line
3243 * Support Unicode font names
3245 * Handle interrupted system calls
3249 * `PEP-8`-ified more of the cola code base
3255 * All resources are now installed into `$prefix/share/git-cola`.
3256 Closed Debian bug #519972
3258 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519972
3267 * Added support for Kompare in `git difftool`
3269 * Added a separate configuration namespace for `git difftool`
3271 * Added the `diff.tool` configuration variable to define the default diff tool
3273 Usability, bells and whistles
3274 -----------------------------
3275 * The stash dialog allows passing the `--keep-index` option to `git stash`
3277 * Amending a published commit warns at commit time
3279 * Simplified the file-across-revisions comparison dialog
3281 * `origin` is selected by default in fetch/push/pull
3283 * Removed the search field from the log widget
3285 * The log window moved into a drawer widget at the bottom of the UI
3287 * Log window display can be configured with
3288 `cola.showoutput` = `{never, always, errors}`. `errors` is the default.
3290 * `NOTE` -- `cola.showoutput` was removed with the GUI rewrite in 1.4.0.
3294 * Improved nose unittest usage
3298 * Added a Windows/msysGit installer
3300 * Included private versions of `simplejson` and `jsonpickle`
3301 for ease of installation and development