6 Usability, bells and whistles
7 -----------------------------
8 * The git config guitool action can now be grouped under user-defined menus.
9 This is done by using slash (``/``) delimiters in the action name.
10 Entries before the final slash are treated like submenus inside the
11 top-level ``Actions`` menu.
12 (`#1150 <https://github.com/git-cola/git-cola/issues/1150>`_)
14 * Toolbars now have a full set of icons. The icons follow the system theme
15 and can be configured to display text, just icons, or text and icons.
16 (`#1171 <https://github.com/git-cola/git-cola/pull/1171>`_)
18 * The startup dialog will now open the selected repository when the "enter"
20 (`#1162 <https://github.com/git-cola/git-cola/issues/1162>`_)
24 * The vendored qtpy library was patched to retain Python2 compatibility.
26 * The "Unstage" toolbar action was fixed.
27 (`#1178 <https://github.com/git-cola/git-cola/issues/1178>`_)
29 * We now avoid `setWidth(float)` for compatibility with newer Qt versions.
30 (`#1183 <https://github.com/git-cola/git-cola/pull/1183>`_)
32 * Documentation typofixes.
33 (`#1185 <https://github.com/git-cola/git-cola/pull/1185>`_)
37 * Updated Polish translation.
38 (`#1184 <https://github.com/git-cola/git-cola/pull/1184>`_)
42 * Git Cola now uses Github Actions for running its continuous integration tests.
43 (`#1179 <https://github.com/git-cola/git-cola/pull/1179>`_)
50 Usability, bells and whistles
51 -----------------------------
52 * The Status tool was improved to better retain selected files when
53 the state changes and the display is refreshed.
54 (`#1130 <https://github.com/git-cola/git-cola/issues/1130>`_)
55 (`#1131 <https://github.com/git-cola/git-cola/pull/1131>`_)
57 * The Diff editor can now stage selected lines for untracked files.
58 Git Cola will detect when a file is untracked and will allow you to
59 partially stage it, just like existing tracked files.
60 (`#1146 <https://github.com/git-cola/git-cola/pull/1146>`_)
61 (`#1084 <https://github.com/git-cola/git-cola/issues/1084>`_)
63 * Diffing of staged files has been implemented for repositories that contain
65 (`#1149 <https://github.com/git-cola/git-cola/pull/1149>`_)
66 (`#1110 <https://github.com/git-cola/git-cola/issues/1110>`_)
68 * Documentation improvements and typofixes.
69 (`#1163 <https://github.com/git-cola/git-cola/pull/1163>`_)
70 (`#1164 <https://github.com/git-cola/git-cola/pull/1164>`_)
74 * The `FIPS security mode
75 <https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/FIPS_Mode_-_an_explanation>`_
76 is now supported by Git Cola when running on FIPS-enabled Python
77 (Python 3.9+ or centos8/rhel8's patched Python 3.6).
78 (`#1157 <https://github.com/git-cola/git-cola/issues/1157>`_)
82 * The `argparse` usage was adjusted to remain compatible with older Pythons.
83 (`#1155 <https://github.com/git-cola/git-cola/issues/1155>`_)
85 * The window restoration logic was fixed to properly save/restore settings
86 when different languages are used.
87 (`#1071 <https://github.com/git-cola/git-cola/issues/1071>`_)
88 (`#1161 <https://github.com/git-cola/git-cola/issues/1161>`_)
89 (`#382 <https://github.com/git-cola/git-cola/issues/382>`_)
91 * `git dag` no longer passes floats to `QPen::setWidth()` for better compatibility.
92 (`bz #2014950 <https://bugzilla.redhat.com/show_bug.cgi?id=2014950>`_)
96 * The Windows installer was slimmed down by removing unused Qt DLLs.
97 (`#1152 <https://github.com/git-cola/git-cola/pull/1152>`_)
106 * Patch release to fix a typo in the Interactive Rebase feature.
113 Usability, bells and whistles
114 -----------------------------
115 * The git config reader now supports the `include.path` directive
116 for including config files.
117 (`#1136 <https://github.com/git-cola/git-cola/issues/1136>`_)
118 (`#1137 <https://github.com/git-cola/git-cola/pull/1137>`_)
120 * The dialog for selecting commits now support filtering.
121 (`#1121 <https://github.com/git-cola/git-cola/pull/1121>`_)
123 * The diff editor now wraps long lines by default. The diff options
124 menu can be used to enable/disable line wrapping.
125 (`#1123 <https://github.com/git-cola/git-cola/pull/1123>`_)
127 * Git Cola now honors `core.hooksPath` for configuring custom Git hooks,
128 which was introduced in Git v2.9.
129 (`#1118 <https://github.com/git-cola/git-cola/issues/1118>`_)
131 * A new `Ctrl + Shift + S` hotkey was added for staging/unstaging all
132 files, both modified and untracked.
134 * The `Status` tool now supports `Ctrl + A` for selecting all files and
135 it behaves more predictably when performing operations when multiple
136 categories of files are selected (eg. when both modified and untracked
137 header items are selected).
138 (`#1117 <https://github.com/git-cola/git-cola/issues/1117>`_)
142 * Updated Hungarian translation.
143 (`#1135 <https://github.com/git-cola/git-cola/pull/1135>`_)
147 * The "Interactive Rebase" feature was updated to work with Windows.
149 * `make install-man` was updated to support Sphinx 4.0.
150 (`#1141 <https://github.com/git-cola/git-cola/issues/1141>`_)
152 * `git cola --help-commands` was updated for newer versions of argparse.
153 (`#1133 <https://github.com/git-cola/git-cola/issues/1133>`_)
157 * Git Cola can now be started as a Python module.
158 (`#1119 <https://github.com/git-cola/git-cola/pull/1119>`_)
165 Usability, bells and whistles
166 -----------------------------
167 * The startup dialog now detects when Recent and Favorite repositories no
168 longer exist on disk, and offers to remove these entries when selected.
169 (`#1089 <https://github.com/git-cola/git-cola/pull/1089>`_)
171 * The startup dialog now includes a simpler and more condensed folder view
172 that can be used for selecting Favorites and Recent repositories.
173 (`#1086 <https://github.com/git-cola/git-cola/pull/1086>`_)
175 * The "Commit" menu now includes an "Undo Last Commit" action.
176 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
178 * The "Reset" menu was revamped to expose all of Git's reset modes alongside a
179 new "Restore Worktree" action that updates the worktree using "git read-tree".
180 (`#890 <https://github.com/git-cola/git-cola/issues/890>`_)
184 * Updated Polish translation.
185 (`#1107 <https://github.com/git-cola/git-cola/pull/1107>`_)
187 * Updated Japanese translation.
188 (`#1098 <https://github.com/git-cola/git-cola/pull/1098>`_)
190 * Updated Brazilian translation.
191 (`#1091 <https://github.com/git-cola/git-cola/pull/1091>`_)
195 * The ``--use-env-python`` option for ``setup.py`` is now Python3 compatible.
196 (`#1102 <https://github.com/git-cola/git-cola/issues/1102>`_)
203 Usability, bells and whistles
204 -----------------------------
205 * The submodules widget can now be used to add submodules.
206 Submodules are now updated recursively.
207 (`#534 <https://github.com/git-cola/git-cola/issues/534>`_)
209 * The image diff viewer can now be toggled between text and image modes.
210 This is helpful when, for example, diffing .svg files where it can be useful
211 to see diffs in both an image and text representation.
212 (`#859 <https://github.com/git-cola/git-cola/issues/859>`_)
213 (`#1035 <https://github.com/git-cola/git-cola/pull/1035>`_)
215 * The default `ssh-askpass` username + password dialog included with Git Cola
216 can now toggle between showing and masking the password input field.
217 (`#1069 <https://github.com/git-cola/git-cola/pull/1069>`_)
221 * Updated Polish translation.
222 (`#1076 <https://github.com/git-cola/git-cola/pull/1076>`_)
224 * Updated Hungarian translation.
225 (`#1067 <https://github.com/git-cola/git-cola/pull/1067>`_)
229 * The `share/appdata` AppStream data was renamed to `share/metainfo`
230 in accordance with `AppStream standard changes from 2016
231 <https://github.com/ximion/appstream/blob/master/NEWS#L1363>`_.
232 (`#1079 <https://github.com/git-cola/git-cola/pull/1079>`_)
234 * The ``cola`` modules are now installed into the Python ``site-packages``
235 directory by default. This allows distributions to package ``git-cola`` for
236 multiple versions of Python. See the PACKAGING NOTES section in the README
237 for details about suppressing the installation of the private
238 ``share/git-cola/lib/cola`` modules when building cola.
239 (`#181 <https://github.com/git-cola/git-cola/issues/181>`_)
241 * Git Cola's rebase / sequence editor, formerly known as ``git-xbase`` and
242 installed as ``share/git-cola/bin/git-xbase``, has been renamed to
243 ``git-cola-sequence-editor`` and is now installed into the default
244 ``bin/git-cola-sequence-editor`` executable location to enable external
245 reuse of this general-purpose tool.
247 * A workaround used by the pynsist installer preamble script was obsoleted by
248 `takluyver/pynsist#149 <https://github.com/takluyver/pynsist/pull/149>`_
249 and has now been removed.
250 (`#1073 <https://github.com/git-cola/git-cola/pull/1073>`_)
254 * `git dag` now uses integer widths when initializing its brushes.
255 (`#1080 <https://github.com/git-cola/git-cola/pull/1080>`_)
262 Usability, bells and whistles
263 -----------------------------
264 * The ``git-xbase`` rebase editor now includes a file list for filtering
265 the changes displayed in the diff view.
266 (`#1051 <https://github.com/git-cola/git-cola/pull/1051>`_)
268 * The fallback `ssh-askpass` script, which provides the Username/Password
269 login dialog when performing remote operations, previously presented both
270 the username and password input fields with ``***`` asterisks.
271 The dialog now uses asterisks for the password field only.
272 (`#1026 <https://github.com/git-cola/git-cola/pull/1026>`_)
274 * Stashes can now be applied using the `Ctrl + Enter` hotkey, popped with the
275 `Ctrl + Backspace` hotkey, and dropped with the `Ctrl + Shift + Backspace`
276 hotkey when inside the stash dialog. This enables a keyboard-centric
277 mouse-free workflow when using the stash dialog.
279 * When amending a commit, `git cola` will check whether the commit has been
280 published to a remote branch using ``git branch -r --contains HEAD``.
281 This command can be slow when operating on a repository with many
282 remote branches. The new `cola.checkpublishedcommits` configuration
283 variable allows you to opt-out of this check, which improves performance
284 when amending a commit. The settings widget exposes this variable as,
285 "Check Published Commits when Amending".
286 (`#1021 <https://github.com/git-cola/git-cola/issues/1021>`_)
287 (`#1027 <https://github.com/git-cola/git-cola/pull/1027>`_)
291 * Updated Polish translation.
292 (`#1033 <https://github.com/git-cola/git-cola/pull/1033>`_)
296 * ``git-dag.appdata.xml`` was updated to allow network access for author icons.
297 (`#1050 <https://github.com/git-cola/git-cola/pull/1050>`_)
299 * The inotify filesystem monitor now handles
300 `OSError: [Errno 24] Too many open files` errors by disabling inotify.
301 (`#1015 <https://github.com/git-cola/git-cola/issues/1015>`_)
303 * Typos in various documentation files have been fixed.
304 (`#1025 <https://github.com/git-cola/git-cola/pull/1025>`_)
306 * The "Recent Repositories" limit was off by one, and now correctly
307 remembers the configured number of repositories in the menu.
308 (`#1024 <https://github.com/git-cola/git-cola/pull/1024>`_)
310 * The "revert" action in the DAG and other tools now uses
311 ``git revert --no-edit``, which avoids launching an editor
312 when reverting the commit. Use `Ctrl+m` in the commit message
313 editor after reverting a commit to rewrite its commit message.
314 (`#1020 <https://github.com/git-cola/git-cola/issues/1020>`_)
321 Usability, bells and whistles
322 -----------------------------
323 * The remote editor is much faster since it no longer queries
324 remotes, and uses the cached information instead.
325 (`#986 <https://github.com/git-cola/git-cola/issues/986>`_)
327 * Commit message templates can now be loaded automatically by setting
328 ``git config cola.autoloadcommittemplate true``.
329 (`#1013 <https://github.com/git-cola/git-cola/pull/1013>`_)
330 (`#735 <https://github.com/git-cola/git-cola/pull/735>`_)
332 * The UI layout can now be reset back to its initial state by selecting
333 the "Reset Layout" action. This reverts the layout to the same state
334 as when the app first launched.
335 (`#1008 <https://github.com/git-cola/git-cola/pull/1008>`_)
336 (`#994 <https://github.com/git-cola/git-cola/issues/994>`_)
338 * Files can now be ignored in either the project's `.gitignore`, or in the
339 repository's private local `.git/info/exclude` ignore file.
340 (`#1006 <https://github.com/git-cola/git-cola/pull/1006>`_)
341 (`#1000 <https://github.com/git-cola/git-cola/issues/1000>`_)
343 * New remotes are now selected when they are added in the "Edit Remotes" tool.
344 (`#1002 <https://github.com/git-cola/git-cola/pull/1002>`_)
346 * The "Recent" repositories list is now saved to disk when opening a
347 repository. Previously, this list was only updated when exiting the app.
348 (`#1001 <https://github.com/git-cola/git-cola/pull/1001>`_)
350 * The bookmarks tool now has a "Delete" option in its right-click menu.
351 (`#999 <https://github.com/git-cola/git-cola/pull/999>`_)
353 * The current repository is no longer listed in the "File/Open Recent" menu.
354 (`#998 <https://github.com/git-cola/git-cola/pull/998>`_)
358 * Updated Hungarian translation.
359 (`#1005 <https://github.com/git-cola/git-cola/pull/1005>`_)
360 (`#1018 <https://github.com/git-cola/git-cola/pull/1018>`_)
362 * Updated Turkish translation.
363 (`#1003 <https://github.com/git-cola/git-cola/pull/1003>`_)
364 (`#1011 <https://github.com/git-cola/git-cola/pull/1011>`_)
368 * Better support for Python 3.8's line buffering modes.
369 (`#1014 <https://github.com/git-cola/git-cola/pull/1014>`_)
371 * The default `ssh-askpass` script now uses a more generic `#!` shebang line.
372 (`#1012 <https://github.com/git-cola/git-cola/pull/1012>`_)
374 * Fetch, push, and pull operations will now refresh the model and display when
376 (`#996 <https://github.com/git-cola/git-cola/issues/996>`_)
378 * The branches widget now refreshes its display when changing branches.
379 (`#992 <https://github.com/git-cola/git-cola/pull/992>`_)
383 * The `share/git-cola/bin/git-xbase` script will now have its `#!` lines
384 updated during installation.
385 (`#991 <https://github.com/git-cola/git-cola/pull/991>`_)
389 * The unit tests were made more platform-independent.
390 (`#993 <https://github.com/git-cola/git-cola/pull/993>`_)
397 Usability, bells and whistles
398 -----------------------------
399 * Auto-completion for filenames can now be disabled. This speeds up
400 revision completion when working in large repositories with many files.
401 (`#981 <https://github.com/git-cola/git-cola/pull/981>`_)
403 * The Stash dialog now shows the stash date as a tooltip when hovering
404 over a stashed change.
405 (`#982 <https://github.com/git-cola/git-cola/pull/982>`_)
407 * Qt HiDPI settings are overridden by the `git cola` HiDPI appearance settings.
408 These overrides can now be disabled by selecting the "Disable" mode.
409 This allows users to control Qt's HiDPI settings through environment
410 variables. Additionally, the "Auto" mode now detects the presence of
411 the Qt HiDPI variables and no longer overrides them when the user has
412 configured their environment explicitly.
413 (`#963 <https://github.com/git-cola/git-cola/issues/963>`_)
415 * Confirmation dialogs can now focus buttons using the Tab key.
416 Previously, the "Y" and "N" keys could be used to confirm or deny
417 using the keyboard, but "Tab" is more familiar.
418 (`#965 <https://github.com/git-cola/git-cola/issues/965>`_)
420 * Error dialogs (for example, when a commit hook fails) will now always
421 show the details. The details were previously hidden behind a toggle.
422 (`#968 <https://github.com/git-cola/git-cola/issues/968>`_)
426 * Updated Japanese translation.
427 (`#973 <https://github.com/git-cola/git-cola/pull/973>`_)
428 (`#974 <https://github.com/git-cola/git-cola/pull/974>`_)
430 * Updated Simplified Chinese translation.
431 (`#950 <https://github.com/git-cola/git-cola/pull/950>`_)
435 * The filesystem monitor no longer logs that it has been enabled after the
436 inotify watch limit is reached on Linux.
437 (`#984 <https://github.com/git-cola/git-cola/pull/984>`_)
439 * Better unicode robustness.
440 (`#990 <https://github.com/git-cola/git-cola/issues/990>`_)
441 (`#910 <https://github.com/git-cola/git-cola/issues/991>`_)
443 * The "Branches" widget did not always update itself when deleting branches
444 (for example, when inotify is disabled or unavailable).
445 (`#978 <https://github.com/git-cola/git-cola/issues/978>`_)
447 * Non-ascii unicode byte strings are more robustly handled by the log widget.
448 (`#977 <https://github.com/git-cola/git-cola/issues/977>`_)
450 * Non-unicode results from the `gettext` library are more robustly handled.
451 (`#969 <https://github.com/git-cola/git-cola/issues/969>`_)
453 * Launching `git cola` from within a directory that has since been deleted
454 would previously result in a traceback, and is now robustly handled.
455 (`#961 <https://github.com/git-cola/git-cola/issues/961>`_)
459 * The vendored `qtpy` library was updated to `v1.9`.
466 Usability, bells and whistles
467 -----------------------------
468 * The file browser now includes "Blame" in its context menu.
469 (`#953 <https://github.com/git-cola/git-cola/issues/953>`_)
471 * The "Push" action now uses "git push --force-with-lease" when using
472 the "Force" option with Git v1.8.5 and newer.
473 (`#946 <https://github.com/git-cola/git-cola/issues/946>`_)
475 * Updated German translation.
476 (`#936 <https://github.com/git-cola/git-cola/pull/936>`_)
478 * The `Status` widget learned to optionally display file counts in its
479 category headers, and indent the files displayed in each category.
480 (`#931 <https://github.com/git-cola/git-cola/pull/931>`_)
482 * The `Branches` widget can now sort branches by their most recent commit.
483 (`#930 <https://github.com/git-cola/git-cola/pull/930>`_)
485 * `git cola` now includes configurable GUI themes that can be used to style
486 the user interface. Enable the new themes by configuring `cola.theme`
487 in the preferences window. See the
488 `cola.theme documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#cola-theme>`_
489 for more details. (`#924 <https://github.com/git-cola/git-cola/pull/924>`_)
491 * `git cola` now has built-in support for HiDPI displays by enabling
492 Qt's 5.6's `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
493 (`#938 <https://github.com/git-cola/git-cola/issues/938>`_)
495 * `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
496 icons have been updated to look sharp when displayed in HiDPI.
497 (`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
501 * `git cola`'s "Revert Unstaged Edits" previously checked out from "HEAD^",
502 when in "Amend" mode, and removing staged changes. This behavior has been
503 changed to always checkout from the index, which avoids data loss.
504 (`#947 <https://github.com/git-cola/git-cola/issues/947>`_)
506 * `git cola` has been updated to work with newer versions of `gnome-terminal`
507 and no longer shell-quotes its arguments when launching `gnome-terminal`.
508 The `cola.terminalshellquote` configuration variable can be set to `true` to
509 get the old behavior, or to handle other terminals that take the command to run
510 as a single string instead of as arguments to `execv()`.
511 (`#935 <https://github.com/git-cola/git-cola/pull/935>`_)
513 * `git dag` now properly handles arbitrary input on Python3.
514 Previously, an exception would be raised when entering `--grep=xxx` where
515 `xxx` is a quoted string with a missing end-quote.
516 (`#941 <https://github.com/git-cola/git-cola/pull/941>`_)
520 * The contribution guidelines for contributors has been updated to mention
521 how to regenerate the `*.mo` message files.
522 (`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
529 Usability, bells and whistles
530 -----------------------------
531 * `git dag` improved how it renders parent commits.
532 (`#921 <https://github.com/git-cola/git-cola/pull/921>`_)
534 * The `Branches` widget now checks out branches when double-clicked.
535 (`#920 <https://github.com/git-cola/git-cola/pull/920>`_)
537 * The new `Submodules` widget makes it easy to interact with submodules.
538 Additionally, submodules can now be updated using the `Status` widget.
539 (`#916 <https://github.com/git-cola/git-cola/pull/916>`_)
541 * Updated Japanese translation.
542 (`#914 <https://github.com/git-cola/git-cola/pull/914>`_)
544 * The "Open Terminal" action now launches a Git Bash shell on Windows.
545 (`#913 <https://github.com/git-cola/git-cola/pull/913>`_)
547 * New menu actions for updating all submodules.
548 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
550 * The status widget can now update submodules.
551 (`#911 <https://github.com/git-cola/git-cola/pull/911>`_)
553 * The "Apply Patch" `git cola am` dialog now includes a diff viewer
554 to display the contents of the selected patch.
556 * The "Alt+D" diffstat hotkey now selects the staged/modified/etc.
557 header in the Status widget, which shows the totality of everything
558 that will be committed.
559 (`#771 <https://github.com/git-cola/git-cola/issues/771>`_)
561 * Running "Launch Editor" from the diff editor now opens the editor at the
563 (`#898 <https://github.com/git-cola/git-cola/pull/898>`_)
565 * The textwidth and tabwidth configuration values can now be set
566 per-repository, rather than globally only.
568 * Text entry widgets switched to using a block cursor in `v3.2`.
569 This has been reverted to the original line cursor for consistency
570 with other applications and user expectations.
571 (`#889 <https://github.com/git-cola/git-cola/issues/889>`_)
573 * The "edit at line" feature, used by the "Grep" tool, now supports
574 the Sublime text editor.
575 (`#894 <https://github.com/git-cola/git-cola/pull/894>`_)
579 * Launching external programs has been improved on Windows.
580 (`#925 <https://github.com/git-cola/git-cola/pull/925>`_)
582 * Improve compatibility when using PySide2.
583 (`#912 <https://github.com/git-cola/git-cola/pull/912>`_)
585 * The Diff Editor was not honoring the configured tab width on startup.
586 (`#900 <https://github.com/git-cola/git-cola/issues/900>`_)
588 * The "Delete Files" feature was creating an unreadable display when
589 many files were selected. Word-wrap the list of files so that the
590 display stays within a sensible size.
591 (`#895 <https://github.com/git-cola/git-cola/issues/895>`_)
593 * Spelling and grammar fixes.
594 (`#915 <https://github.com/git-cola/git-cola/pull/915>`_)
595 (`#891 <https://github.com/git-cola/git-cola/pull/891>`_)
599 * The logo was run through `tidy` to give it a consistent style.
600 Some technical issues with the logo were improved.
601 (`#877 <https://github.com/git-cola/git-cola/issues/877>`_)
603 * The entire codebase is now checked by `flake8`, rather than just
604 the module and test directories. This catches things like
605 the pynsist installer scripts.
606 (`#884 <https://github.com/git-cola/git-cola/issues/884>`_)
607 (`#882 <https://github.com/git-cola/git-cola/issues/882>`_)
608 (`#879 <https://github.com/git-cola/git-cola/pull/879>`_)
612 * The vendored `qtpy` library was updated to `v1.6`.
614 * The Windows installer's wrapper scripts were missing an import.
615 (`#878 <https://github.com/git-cola/git-cola/issues/878>`_)
622 Usability, bells and whistles
623 -----------------------------
624 * The `git cola dag` DAG window now supports `git revert`.
625 (`#843 <https://github.com/git-cola/git-cola/issues/843>`_)
627 * `git stash pop` is now supported by the stash dialog.
628 (`#844 <https://github.com/git-cola/git-cola/issues/844>`_)
630 * The status widget now ensures that each item is visible when selection
631 changes. Previously, if you scrolled to the right to see the name of
632 a long filename, and then selected a short filename above it, the widget
633 may not have shown the short filename in the viewport. We now ensure
634 that the filenames are visible when the selection changes.
635 (`#828 <https://github.com/git-cola/git-cola/pull/828>`_)
637 * The `git xbase` rebase editor no longer displays an error when
638 cancelling an interactive rebase.
639 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
641 * The dialog shown when renaming remotes has been simplified.
642 (`#840 <https://github.com/git-cola/git-cola/pull/840>`_)
643 (`#838 <https://github.com/git-cola/git-cola/issues/838>`_)
645 * The help dialog in the `git-xbase` Rebase editor is now scrollable.
646 (`#855 <https://github.com/git-cola/git-cola/issues/855>`_)
650 * Updated Brazilian translation.
651 (`#845 <https://github.com/git-cola/git-cola/pull/845>`_)
653 * Updated Czech translation.
654 (`#854 <https://github.com/git-cola/git-cola/pull/854>`_)
655 (`#853 <https://github.com/git-cola/git-cola/pull/853>`_)
656 (`#835 <https://github.com/git-cola/git-cola/pull/835>`_)
657 (`#813 <https://github.com/git-cola/git-cola/pull/813>`_)
659 * Update Spanish translation.
660 (`#862 <https://github.com/git-cola/git-cola/pull/862>`_)
661 (`#867 <https://github.com/git-cola/git-cola/pull/867>`_)
665 * The original `#!/usr/bin/env python` shebang lines can now be
666 retained by passing `USE_ENV_PYTHON=1` to `make` when installing.
667 (`#850 <https://github.com/git-cola/git-cola/issues/850>`_)
669 * The Makefile is now resilient to DESTDIR and prefix containing whitespace.
670 (`#858 <https://github.com/git-cola/git-cola/pull/858>`_)
672 * The vendored `qtpy` library was updated to `v1.4.2`.
674 * `python3-distutils` is needed to build cola on Debian.
675 (`#837 <https://github.com/git-cola/git-cola/issues/837>`_)
679 * The "C" key no longer closes the message dialogs, for example the
680 one that is shown when a commit fails its pre-commit hooks.
681 This allows "Ctrl+C" copy to work, rather than closing the dialog.
682 (`#734 <https://github.com/git-cola/git-cola/issues/734>`_)
684 * Dock widgets sizes are now properly saved and restored when the main
686 (`#848 <https://github.com/git-cola/git-cola/issues/848>`_)
688 * The spellcheck feature was broken under Python3.
689 (`#857 <https://github.com/git-cola/git-cola/issues/857>`_)
691 * A regression when saving stashes was fixed.
692 (`#847 <https://github.com/git-cola/git-cola/issues/847>`_)
694 * Diffing image files was not updating the available context menus,
695 which prevented the "Stage" action from being present in the menu.
696 (`#841 <https://github.com/git-cola/git-cola/issues/841>`_)
698 * `git cola` now detects when `git lfs uninstall` has been run. This allows
699 you to re-initialize "Git LFS" in an existing repository where it had been
700 previously uninstalled.
701 (`#842 <https://github.com/git-cola/git-cola/issues/842>`_)
703 * Custom color values that did not contain any hexadecimal digits in the
704 `a-f` range were being converted into integers by the config reader. This
705 then caused the configured colors to be ignored.
707 These color values are now interpreted correctly. Additionally, color
708 values can now use an optional HTML-like `#` prefix.
710 Example `.gitconfig` snippet::
715 (`#836 <https://github.com/git-cola/git-cola/pull/836>`_)
716 (`#849 <https://github.com/git-cola/git-cola/issues/849>`_)
718 * We now display an error message graphically when `Git` is not installed.
719 Previously, the message went to stderr only.
720 (`#830 <https://github.com/git-cola/git-cola/issues/830>`_)
722 * Changing diff options was causing resulting in an exception.
723 (`#833 <https://github.com/git-cola/git-cola/issues/833>`_)
724 (`#834 <https://github.com/git-cola/git-cola/pull/834>`_)
726 * The DAG window now updates itself when branches and tags are created.
727 (`#814 <https://github.com/git-cola/git-cola/issues/814>`_)
729 * The user's `$PATH` environment variable can now contain utf-8
730 encoded paths. Previously, launching external commands could
732 (`#807 <https://github.com/git-cola/git-cola/issues/807>`_)
734 * Git Cola development sandboxes can now be stored on utf-8 encoded
735 filesystem paths. Previously, the interactive rebase feature
736 could be broken when running in that environment.
737 (`#825 <https://github.com/git-cola/git-cola/issues/825>`_)
739 * The log window now uses an ISO-8601 timestamp, which
740 avoids localized output in the log window.
741 (`#817 <https://github.com/git-cola/git-cola/issues/817>`_)
745 * The code base has been thoroughly sanitized using `pylint`, and
746 travis is now running pylint over the entire project.
748 * Miscellaneous improvements and code improvements.
749 (`#874 <https://github.com/git-cola/git-cola/issues/874>`_)
756 Usability, bells and whistles
757 -----------------------------
758 * The "Browser" widget learned to rename files using "git mv".
759 (`#239 <https://github.com/git-cola/git-cola/issues/239>`_)
761 * The "Diff" widget learned to diff images. Side-by-side and pixel diff
762 modes allow you to inspect changes to common images formats.
763 (`#444 <https://github.com/git-cola/git-cola/issues/444>`_)
764 (`#803 <https://github.com/git-cola/git-cola/pull/803>`_)
766 * Git LFS and Git Annex are natively supported by the image diff viewer.
768 * Git Annex operations are now included. `git annex init` can be performed on
769 repositories, and `git annex add` can be run on untracked files from the
770 status widget. Install `git-annex` to activate this feature.
772 * Git LFS operations are now included. `git lfs install` can be performed on
773 repositories, and `git lfs track` can be run on untracked files from the
774 status widget. Install `git-lfs` to activate this feature.
776 * The "Stash" tool learned to stash staged changes only. Select the
777 "Stage Index" option and only staged changes will be stashed away.
778 (`#413 <https://github.com/git-cola/git-cola/issues/413>`_)
780 * The "Stash" tool learned to use vim-like navigation keyboard shortcuts,
781 shows error messages when things go wrong, and now saves the "Stash Index"
782 and "Keep Index" options across sessions.
784 * The Edit menu's "Copy" and "Select All" actions now forward to either the
785 diff, status, recent, or favorites widgets, based on which widget has focus.
787 * The "File" and "Edit" menu can now be activated using `Alt-{f,e}` hotkeys.
788 (`#759 <https://github.com/git-cola/git-cola/issues/759>`_)
790 * It was easy to accidentally trigger the first action in the `Status` tool's
791 context menu when using a quick right-click to bring up the menu.
792 A short sub-second delay was added to ensure that the top-most action is not
793 triggered unless enough time has passed. This prevents accidental
794 activation of the first item (typically "Stage" or "Unstage") without
795 burdening common use cases.
796 (`#755 <https://github.com/git-cola/git-cola/pull/755>`_)
797 (`#643 <https://github.com/git-cola/git-cola/issues/643>`_)
799 * The "Ctrl+S" hotkey now works for the header items in the Status tool.
800 Selected the "Modified" header item and activating the "Stage" hotkey,
801 for example, will stage all modified files. This works for the "Staged",
802 "Modified", and "Untracked" headers. This is not enabled for the
803 "Unmerged" header by design.
804 (`#772 <https://github.com/git-cola/git-cola/issues/772>`_)
806 * The list of "Recent" repositories previously capped the number of
807 repositories shown to 8 repositories. This can be set to a higher
808 value by setting the `cola.maxrecent` configuration variable.
809 (`#752 <https://github.com/git-cola/git-cola/issues/752>`_)
811 * The "Create Branch" dialog now prevents invalid branch names.
812 (`#765 <https://github.com/git-cola/git-cola/issues/765>`_)
814 * Updated Turkish translation.
815 (`#756 <https://github.com/git-cola/git-cola/pull/756>`_)
817 * Updated Ukrainian translation.
818 (`#753 <https://github.com/git-cola/git-cola/pull/753>`_)
820 * Updated German translation.
821 (`#802 <https://github.com/git-cola/git-cola/pull/802>`_)
823 * Updated Czech translation
824 (`#792 <https://github.com/git-cola/git-cola/pull/792>`_)
825 (`#806 <https://github.com/git-cola/git-cola/pull/806>`_)
827 * The window title can be configured to not display the absolute path of the
829 (`#775 <https://github.com/git-cola/git-cola/issues/775>`_)
831 * The "Edit Remotes" editor learned to edit remote URLS.
833 * Bare repositories can now be created by selecting the
834 "New Bare Repository..." action from the `File` menu.
836 * The "Branches" widget learned to configure upstream branches.
838 * A new `git cola clone` sub-command was added for cloning repositories.
842 * The vendored `qtpy` library was updated to `v1.3.1`.
844 * The macOS installation was made simpler for better compatibility with
846 (`#636 <https://github.com/git-cola/git-cola/issues/636>`_)
848 * The Windows installer is now much simpler. Git Cola now bundles
849 Python and PyQt5, so users need only install the "Git for Windows"
850 and "Git Cola" installers to get things working.
854 * Uninitialized difftool errors will now be displayed graphically.
855 They were previously going to the shell.
856 (`#457 <https://github.com/git-cola/git-cola/issues/457>`_)
858 * Translations marked "fuzzy" will no longer be used when translating strings.
859 (`#782 <https://github.com/git-cola/git-cola/issues/782>`_)
861 * Deleted unmerged files will now correctly use a deleted icon.
862 (`#479 <https://github.com/git-cola/git-cola/issues/479>`_)
864 * The `Ctrl+C` "Copy" hotkey on the diff viewer has been fixed.
865 (`#767 <https://github.com/git-cola/git-cola/issues/767>`_)
867 * The "Create Tag" dialog did not correctly handle the case when a signed
868 tag is requested, but no message is provided, and the user chooses to
869 create an unannotated tag instead. This convenience fallback will now
870 properly create an unsigned, unannotated tag.
871 (`#696 <https://github.com/git-cola/git-cola/issues/696>`_)
873 * `.gitconfig` and `.git/config` values editable by the Preferences dialog
874 (aka `git cola config`) will now get unset when set to an empty value.
875 For example, setting a different `user.email` in the current repository,
876 followed by a subsequent emptying of that field, would previously result in
877 an empty string getting stored in the config. This has been fixed so that
878 the value will now get unset in the config instead.
879 (`#406 <https://github.com/git-cola/git-cola/issues/406>`_)
881 * Spelling and typofixes.
882 (`#748 <https://github.com/git-cola/git-cola/pull/748>`_)
884 * `core.commentChar` is now honored when set in the local repository
886 (`#766 <https://github.com/git-cola/git-cola/issues/766>`_)
888 * The log window was using a format string that did not display
889 correctly in all locales. A locale-aware format is now used.
890 (`#800 <https://github.com/git-cola/git-cola/pull/800>`_)
892 * The dialog displayed when prompting for a reference could sometimes
894 (`#804 <https://github.com/git-cola/git-cola/pull/804>`_)
901 Usability, bells and whistles
902 -----------------------------
903 * Updated Simplified Chinese translation.
904 (`#726 <https://github.com/git-cola/git-cola/pull/726>`_)
906 * Updated Ukrainian translation.
907 (`#723 <https://github.com/git-cola/git-cola/pull/723>`_)
909 * New Czech translation.
910 (`#736 <https://github.com/git-cola/git-cola/pull/736>`_)
911 (`#737 <https://github.com/git-cola/git-cola/pull/737>`_)
912 (`#740 <https://github.com/git-cola/git-cola/pull/740>`_)
913 (`#743 <https://github.com/git-cola/git-cola/pull/743>`_)
915 * The "name" field in the "Create Tag" dialog now includes autocompletion,
916 which makes it easy to see which tags currently exist.
918 * `git cola` now has configurable toolbars. Use the `View -> Add toolbar`
919 menu item to add a toolbar.
921 * Setting `cola.expandtab` to `true` will now expand tabs into spaces
922 in the commit message editor. The number of spaces to insert is determined
923 by consulting `cola.tabwidth`, which defaults to `8`.
925 * The "Copy SHA-1" hotkey is now `Alt + Ctrl + C`, to avoid clobbering the
926 ability to copy text from the DAG window.
927 (`#705 <https://github.com/git-cola/git-cola/pull/705>`_)
929 * The "Prepare Commit Message" action can now be invoked via the
930 `Ctrl+Shift+Return` shortcut.
931 (`#707 <https://github.com/git-cola/git-cola/pull/707>`_)
933 * The `Branches` pane now has a filter field that highlights branches whose
934 names match the string entered into its text field.
935 (`#713 <https://github.com/git-cola/git-cola/pull/713>`_)
937 * Actions that are triggered in response to button presses were being
938 triggered when the button was pressed, rather than when it was released,
939 which was a usability flaw. All buttons now respond when clicked
940 rather than when pressed.
941 (`#715 <https://github.com/git-cola/git-cola/pull/715>`_)
943 * The DAG window will now only refresh when object IDs change.
944 Previously, the DAG would redraw itself in response to inotify events,
945 such as filesystem operations, which was disruptive when inspecting a large
946 diff in its diff viewer. The DAG will now only redraw when the object IDs
947 corresponding to its query input changes. Furthermore, when redrawing, the
948 scrollbar positions are retained to minimize disruption to the viewport
950 (`#620 <https://github.com/git-cola/git-cola/issues/620>`_)
951 (`#724 <https://github.com/git-cola/git-cola/issues/724>`_)
953 * The "About" dialog now includes the SHA-1 where Git Cola was built.
954 (`#530 <https://github.com/git-cola/git-cola/issues/530>`_)
956 * The "Status" widget now has "Copy Leading Path to Clipboard" and
957 "Copy Basename to Clipboard" actions.
958 (`#435 <https://github.com/git-cola/git-cola/issues/435>`_)
959 (`#436 <https://github.com/git-cola/git-cola/issues/436>`_)
961 * The "Status" widget now supports custom "Copy ... to Clipboard" actions.
962 (`#437 <https://github.com/git-cola/git-cola/issues/437>`_)
964 * The main menu now has an "Edit" menu.
965 (`#725 <https://github.com/git-cola/git-cola/issues/725>`_)
967 * `git dag` learned to checkout commits into a detached HEAD state.
968 (`#698 <https://github.com/git-cola/git-cola/issues/698>`_)
970 * The `status` widget's context menus now omit actions selection-dependent
971 actions when no file is selected.
972 (`#731 <https://github.com/git-cola/git-cola/pull/731>`_)
974 * The startup dialog now focuses the repository list so that repositories
975 can be selected with the keyboard without mouse intervention.
976 (`#741 <https://github.com/git-cola/git-cola/issues/741>`_)
980 * `git dag` now prevents nodes from overlapping in more situations.
981 (`#689 <https://github.com/git-cola/git-cola/pull/689>`_)
983 * Adding untracked Git submodule repo directories previously ran
984 `git add submodule/` but we now call `git add submodule` without
985 the trailing slash (`/`) to avoid staging files that belong to the
986 submodule (which is possibly a `git` bug). By working around the
987 buggy behavior we allow users to recover by issuing the appropriate
988 `git submodule add` command to properly register the submodule.
989 (`#681 <https://github.com/git-cola/git-cola/pull/681>`_)
991 * We now avoid `git for-each-ref --sort=version:refname` on versions
992 of `git` older than `v2.7.0`. Previously we only avoided it for
993 versions older than `v2.0.0`, which was a mistake.
994 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
996 * The error message displayed when `git` is not installed has been fixed.
997 (`#686 <https://github.com/git-cola/git-cola/pull/686>`_)
999 * Adding new remotes was silently broken.
1000 (`#684 <https://github.com/git-cola/git-cola/issues/684>`_)
1001 (`#685 <https://github.com/git-cola/git-cola/pull/685>`_)
1003 * The repo selection dialog had errors during startup when the
1004 `cola.refreshonfocus` feature was enabled, as reported on Ubuntu 16.04.
1005 (`#690 <https://github.com/git-cola/git-cola/issues/690>`_)
1007 * Restored support for PyQt 4.6 (Centos 6.8)
1008 (`#692 <https://github.com/git-cola/git-cola/issues/692>`_)
1010 * Switching repositories now resets the "Amend Mode" and other settings
1012 (`#710 <https://github.com/git-cola/git-cola/issues/710>`_)
1014 * `git rebase` error messages now displayed when rebasing fails or stops
1015 via the standalone `git cola rebase` front-end.
1016 (`#721 <https://github.com/git-cola/git-cola/issues/721>`_)
1018 * `git cola` learned to stage broken symlinks.
1019 (`#727 <https://github.com/git-cola/git-cola/issues/727>`_)
1021 * The "View History" feature in the `Browser` tool was fixed, and now
1022 disambiguates between refs and paths.
1023 (`#732 <https://github.com/git-cola/git-cola/issues/732>`_)
1025 * The diff editor now has better support for files with CRLF `\r\n`
1027 (`#730 <https://github.com/git-cola/git-cola/issues/730>`_)
1029 * `cola.inotify` in a repo-local config is now honored
1030 when `git cola` is launched from a desktop entry (`git cola --prompt`).
1031 (`#695 <https://github.com/git-cola/git-cola/issues/695>`_)
1038 Usability, bells and whistles
1039 -----------------------------
1040 * New Ukrainian translation.
1041 (`#670 <https://github.com/git-cola/git-cola/pull/670>`_)
1042 (`#672 <https://github.com/git-cola/git-cola/pull/672>`_)
1044 * New and improved French translations.
1046 * The new `Branches` widget makes it easier to checkout, merge, push,
1047 and pull branches from a single interface.
1049 * `git cola` now includes a dark icon theme. The dark icon theme can be
1050 activated either by setting the `GIT_COLA_ICON_THEME` environment variable
1051 to `dark`, by configuring `cola.icontheme` to `dark`, or by specifying
1052 `--icon-theme=dark` on the command line.
1053 (`#638 <https://github.com/git-cola/git-cola/pull/638>`_)
1055 * Autocompletion was added to the `Fetch`, `Push`, and `Pull` dialogs.
1057 * The commit message editor now remembers the "Spellcheck" setting
1059 (`#645 <https://github.com/git-cola/git-cola/pull/645>`_)
1061 * `git dag` now uses an improved algorithm for laying out the graph,
1062 which avoids collisions under certain graph configurations, and
1063 avoids overlapping tag with commits.
1064 (`#648 <https://github.com/git-cola/git-cola/pull/648>`_)
1065 (`#651 <https://github.com/git-cola/git-cola/pull/651>`_)
1066 (`#654 <https://github.com/git-cola/git-cola/pull/654>`_)
1067 (`#656 <https://github.com/git-cola/git-cola/pull/656>`_)
1068 (`#659 <https://github.com/git-cola/git-cola/pull/659>`_)
1070 * `git dag` now remembers its column sizes across sessions.
1071 (`#674 <https://github.com/git-cola/git-cola/issues/674>`_)
1073 * `Grep` now shows a preview of the selected file's content in a split window
1074 below the grep results.
1076 * `Grep` now includes line numbers in the preview pane's output.
1078 * `Edit Remotes` now remembers its window settings after exiting.
1080 * `Diff` now has an option to display line numbers in the editor.
1081 (`#136 <https://github.com/git-cola/git-cola/issues/136>`_)
1083 * `Amend Last Commit` can now be triggered via the `Commit` menu in addition
1084 to the commit message editor's options.
1085 (`#640 <https://github.com/git-cola/git-cola/issues/640>`_)
1087 * The `File Browser` tool was made much faster and can now operate on
1088 much larger repositories.
1089 (`#499 <https://github.com/git-cola/git-cola/issues/499>`_)
1091 * A new "turbo" mode was added that allows you to opt-out of operations
1092 that can slow `git cola` on large repositories. The turbo mode is
1093 enabled by configuring `git config cola.turbo true`. Turbo mode
1094 disables the background loading of Git commit messages and other
1095 details in the `File Browser` widget.
1097 * A new GitIgnore dialog allows adding custom gitignore patterns.
1098 (`#653 <https://github.com/git-cola/git-cola/pull/653>`_)
1100 * The spellchecker in `git cola` can now use an additional dictionary
1101 by configuring `cola.dictionary` to the path to a file containing
1102 a newline-separated list of words.
1103 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1105 * The stash, export patches, diff, and gitignore dialogs now remember
1108 * A new `git cola recent` sub-command was added for finding recently
1111 * The `Fetch` dialog now allows pruning remote branches.
1112 (`#639 <https://github.com/git-cola/git-cola/issues/639>`_)
1113 (`#680 <https://github.com/git-cola/git-cola/pull/680>`_)
1117 * `git cola`'s spellchecker now supports the new `dict-common` filesystem
1118 layout, and prefers the `/usr/share/dict/cracklib-small` file over the
1119 `/usr/share/dict/words` provided on older distributions.
1120 This makes the spellchecker compatible with Arch, which does not provide
1121 a `words` symlink like Debian.
1122 (`#663 <https://github.com/git-cola/git-cola/issues/663>`_)
1124 * Properly handle the case where an existing file is untracked using
1127 * Fix a quirk where the "Create Branch" dialog sometimes required clicking
1128 twice on the radio buttons.
1129 (`#662 <https://github.com/git-cola/git-cola/pull/662>`_)
1131 * Fixed a focus issue to ensure that "Push", "Fetch", and "Pull" can
1132 be executed with the press of a single enter key after being shown.
1133 (`#661 <https://github.com/git-cola/git-cola/issues/661>`_)
1135 * Committing is now allowed in when resolving a merge results in no
1136 changes. This state was previously prevented by the commit message editor,
1137 which prevented users from resolving merges that result in no changes.
1138 (`#679 <https://github.com/git-cola/git-cola/pull/679>`_)
1140 * The filesystem monitor would sometimes emit backtraces when directories
1141 are modified. This has been fixed.
1142 (`bz #1438522 <https://bugzilla.redhat.com/show_bug.cgi?id=1438522>`_)
1144 * Absolute paths are now returned when querying for `.git`-relative paths
1145 from within a submodule, which uses `.git`-files.
1146 This fixes launching `git cola` from within a subdirectory of a submodule.
1147 (`#675 <https://github.com/git-cola/git-cola/pull/675>`_)
1154 Usability, bells and whistles
1155 -----------------------------
1156 * `git cola` can now invoke the `.git/hooks/cola-prepare-commit-msg`
1157 hook to update the commit message. This hook takes the same parameters
1158 as Git's `prepare-commit-message` hook. The default path to this hook
1159 can be overridden by setting the `cola.prepareCommitMessageHook`
1160 configuration variable.
1161 (`Documentation <https://git-cola.readthedocs.io/en/latest/git-cola.html#prepare-commit-message>`_)
1163 * `git cola diff` (and the corresponding `Diff` menu actions) can now
1164 launch difftool with the standard `Ctrl+D` hotkey. The `Ctrl+E` hotkey was
1165 also added for launching an editor.
1167 * Traditional Chinese (Taiwan) translation updates.
1171 * `git cola` now works when installed in non-ascii, utf8-encoded paths.
1172 (`#629 <https://github.com/git-cola/git-cola/issues/629>`_)
1174 * Styling issues that caused black backgrounds in various widgets when using
1175 PyQ5 on Mac OS X have been fixed.
1176 (`#624 <https://github.com/git-cola/git-cola/issues/624>`_)
1178 * The "Open Recent" menu action was broken and has been fixed.
1179 (`#634 <https://github.com/git-cola/git-cola/issues/634>`_)
1181 * Exiting `git cola` with a maximized main window would hang when reopened
1183 (`#641 <https://github.com/git-cola/git-cola/issues/641>`_)
1187 * `appdata.xml` files are now provided at
1188 `share/appdata/git-cola.xml` and `share/appdata/git-dag.xml`
1189 for use by the Linux software gallery.
1190 (`#627 <https://github.com/git-cola/git-cola/pull/627>`_)
1191 (`Appdata <https://people.freedesktop.org/~hughsient/appdata/>`_)
1200 * The "Open Recent" menu was updated to new bookmarks format.
1201 (`#628 <https://github.com/git-cola/git-cola/issues/628>`_)
1208 Usability, bells and whistles
1209 -----------------------------
1210 * New Polish translation thanks to Łukasz Wojniłowicz
1211 (`#598 <https://github.com/git-cola/git-cola/pull/598>`_)
1213 * The `Bypass Commit Hooks` feature now disables itself automatically
1214 when a new commit is created. The new behavior turns the option into a
1215 single-use flag, which helps prevent users from accidentally leaving it
1216 active longer than intended.
1217 (`#595 <https://github.com/git-cola/git-cola/pull/595>`_)
1219 * `git dag` learned to launch an external diff viewer on selected commits.
1220 The standard `Ctrl+D` shortcut can be used to view diffs.
1221 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1223 * `git dag` learned to launch directory diffs via `git difftool --dir-diff`.
1224 The `Ctrl+Shift+D` shortcut launches difftool in directory-diff mode.
1225 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1227 * Items in the "Favorites" list can now be renamed, which makes it
1228 easier to differentiate between several checkouts of the same repository.
1229 (`#599 <https://github.com/git-cola/git-cola/issues/599>`_)
1230 (`#601 <https://github.com/git-cola/git-cola/pull/601>`_)
1232 * The startup screen now includes a logo and `git cola` version information.
1233 (`#526 <https://github.com/git-cola/git-cola/issues/526>`_)
1235 * The `About` page was revamped to contain multiple tabs. A new tab was added
1236 that provides details about `git cola`''s dependencies. New tabs were also
1237 added for giving credit to `git cola`'s authors and translators.
1239 * The `About` page can now be accessed via `git cola about`.
1241 * The "Fast-forward only" and "No fast-forward" options supported by
1242 `git pull` are now accessible via `git cola pull`.
1244 * Doing a forced push no longer requires selecting the remote branch.
1245 (`#618 <https://github.com/git-cola/git-cola/pull/618>`_)
1247 * `git cola push` now has an option to suppress the prompt that is shown
1248 when pushing would create new remote branches.
1249 (`#605 <https://github.com/git-cola/git-cola/issues/605>`_)
1251 * `git dag` now shows commit messages in a more readable color.
1252 (`#574 <https://github.com/git-cola/git-cola/issues/574>`_)
1254 * `git cola browse` and the `status` widget learned to launch the OS-specified
1255 default action for a file. When used on directories via `git cola browse`,
1256 or when "Open Parent Directory" is used on files, the OS-specified
1257 file browser will typically be used.
1259 * `git cola browse` and the `status` widget learned to launch terminals.
1263 * `git cola browse` was not updating when expanding items.
1264 (`#588 <https://github.com/git-cola/git-cola/issues/588>`_)
1266 * Typofixes in comments, naming, and strings have been applied.
1267 (`#593 <https://github.com/git-cola/git-cola/pull/593>`_)
1269 * The inotify and win32 filesystem monitoring no longer refreshes
1270 when updates are made to ignored files.
1271 (`#517 <https://github.com/git-cola/git-cola/issues/517>`_)
1272 (`#516 <https://github.com/git-cola/git-cola/issues/516>`_)
1274 * The `Refresh` button on the actions panel no longer raises an
1275 exception when using PyQt5.
1276 (`#604 <https://github.com/git-cola/git-cola/issues/604>`_)
1278 * Fixed a typo in the inotify backend that is triggered when files are removed.
1279 (`#607 <https://github.com/git-cola/git-cola/issues/607>`_)
1281 * Fixed a typo when recovering from a failed attempt to open a repository.
1282 (`#606 <https://github.com/git-cola/git-cola/issues/606>`_)
1284 * `git dag` now properly updates itself when launched from the menubar.
1285 (`#613 <https://github.com/git-cola/git-cola/pull/613>`_)
1287 * If git-cola is invoked on Windows using `start pythonw git-cola`,
1288 a console window will briefly flash on the screen each time
1289 `git cola` invokes `git`. The console window is now suppressed.
1291 * We now avoid some problematic Popen flags on Windows which were
1292 breaking the `git rebase` feature on Windows.
1294 * The `Save` button in `git dag`'s "Grab File..." feature now properly
1295 prompts for a filename when saving files.
1296 (`#617 <https://github.com/git-cola/git-cola/pull/617>`_)
1300 * The `qtpy` symlink in the source tree has been removed to allow for easier
1301 development on Windows.
1302 (`#626 <https://github.com/git-cola/git-cola/issues/626>`_)
1309 Usability, bells and whistles
1310 -----------------------------
1311 * `git cola push` learned to configure upstream branches.
1312 (`#563 <https://github.com/git-cola/git-cola/issues/563>`_)
1316 * The diffstat view is now properly updated when notifications are
1317 received via inotify filesystem monitoring.
1318 (`#577 <https://github.com/git-cola/git-cola/issues/577>`_)
1320 * Python3 with PyQt5 had a bug that prevented `git cola` from starting.
1321 (`#589 <https://github.com/git-cola/git-cola/pull/589>`_)
1331 * When repositories stored in non-ASCII, UTF-8-encoded filesystem paths
1332 were operated upon with `LC_ALL=C` set in the environment, unicode errors
1333 would occur when using `python2`. `git cola` was made more robust and will
1334 now operate correctly within this environment.
1335 (`#581 <https://github.com/git-cola/git-cola/issues/581>`_)
1337 * Support for the `GIT_WORK_TREE` environment variable was fixed.
1338 (`#582 <https://github.com/git-cola/git-cola/pull/582>`_)
1343 * The `unittest.mock` module is now used instead of the original `mock` module
1344 when running the `git cola` test suite using Python3.
1345 (`#569 <https://github.com/git-cola/git-cola/issues/569>`_)
1350 * `git cola` is now compatible with *PyQt5*, *PyQt4*, and *Pyside*.
1351 `git cola` previously supported *PyQt4* only, but will now use whichever
1352 library is available. Users are not required to upgrade at this time,
1353 but *PyQt5* support can be enabled anytime by making its python
1355 (`#232 <https://github.com/git-cola/git-cola/issues/232>`_)
1357 *NOTE*: We do not yet recommend using *PyQt5* because there are known
1358 exit-on-segfault bugs in *Qt5* that have not yet been addressed.
1359 `git cola` is sensitive to this bug and is known to crash on exit
1360 when using `git dag` or the interactive rebase feature on *PyQt5*.
1362 https://bugreports.qt.io/browse/QTBUG-52988
1364 *PyQt4* is stable and there are no known issues when using it so
1365 we recommend using it until the Qt5 bugs have been resolved.
1367 * `git cola` now depends on *QtPy* and includes a bundled copy of the
1368 `qtpy` library. If you are packaging `git cola` and would prefer to use
1369 `qtpy` from your distribution instead of the built-in version then use
1370 `make NO_VENDOR_LIBS=1` when building `git cola`. This will prevent
1371 vendored libraries from being installed.
1378 Usability, bells and whistles
1379 -----------------------------
1381 * A new "Reset" sub-menu provides access to running "git reset --mixed"
1382 when resetting branch heads and "git reset --merge" when resetting
1384 (`#542 <https://github.com/git-cola/git-cola/issues/542>`_)
1386 * `git cola` now supports linked worktrees, i.e. worktrees created by
1388 (`#554 <https://github.com/git-cola/git-cola/issues/554>`_)
1393 * Diff highlighting is now robust to the user having
1394 diff.supressBlankEmpty=true in their git config.
1395 (`#541 <https://github.com/git-cola/git-cola/issues/541>`_)
1397 * The filesystem monitor now properly handles repositories that use
1398 `.git`-files, e.g. when using submodules.
1399 (`#545 <https://github.com/git-cola/git-cola/issues/545>`_)
1400 (`#546 <https://github.com/git-cola/git-cola/pulls/546>`_)
1402 * Per-repository git configuration is now properly detected when launching
1403 `git cola` from an application launcher.
1404 (`#548 <https://github.com/git-cola/git-cola/issues/548>`_)
1406 * `git cola` now cleans up after itself immediately to avoid leaving behind
1407 empty `/tmp/git-cola-XXXXXX` directories when the user uses `Ctrl+C`
1409 (`#566 <https://github.com/git-cola/git-cola/issues/566>`_)
1414 * It is now possible to install `git cola` to and from utf8-encoded filesystem
1415 paths. Previously, Python's stdlib would throw an encoding error during
1416 installation. We workaround the stdlib by forcing python2 to use utf-8,
1417 thus fixing assumptions in the stdlib library code.
1418 (`#551 <https://github.com/git-cola/git-cola/issues/551>`_)
1425 Usability, bells and whistles
1426 -----------------------------
1428 * The icon for untracked files was adjusted to better differentiate
1429 between files and the "Untracked" header.
1430 (`#509 <https://github.com/git-cola/git-cola/issues/509>`_)
1432 * Ctrl+O was added as a hotkey for opening repositories.
1433 (`#507 <https://github.com/git-cola/git-cola/pull/507>`_)
1435 * `git dag` now uses consistent edge colors across updates.
1436 (`#512 <https://github.com/git-cola/git-cola/issues/512>`_)
1438 * `git cola`'s Bookmarks widget can now be used to set a "Default Repository".
1439 Under the hood, we set the `cola.defaultrepo` configuration variable.
1440 The default repository is used whenever `git cola` is launched outside of
1441 a Git repository. When unset, or when set to a bogus value, `git cola`
1442 will prompt for a repository, as it previously did.
1443 (`#513 <https://github.com/git-cola/git-cola/issues/513>`_)
1445 * `git cola`'s Russian and Spanish translations were improved
1446 thanks to Vaiz and Zeioth.
1447 (`#514 <https://github.com/git-cola/git-cola/pull/514>`_)
1448 (`#515 <https://github.com/git-cola/git-cola/pull/515>`_)
1449 (`#523 <https://github.com/git-cola/git-cola/pull/523>`_)
1451 * `git cola` was translated to Turkish thanks to Barış ÇELİK.
1452 (`#520 <https://github.com/git-cola/git-cola/pull/520>`_)
1454 * The status view now supports launching `git gui blame`. It can be
1455 configured to use a different command by setting `cola.blameviewer`.
1456 (`#521 <https://github.com/git-cola/git-cola/pull/521>`_)
1458 * `git dag` now allows selecting non-contiguous ranges in the log widget.
1459 (`#468 <https://github.com/git-cola/git-cola/issues/468>`_)
1461 * Any font can now be chosen for the diff editor, not just monospace fonts.
1462 (`#525 <https://github.com/git-cola/git-cola/issues/525>`_)
1467 * `xfce4-terminal` and `gnome-terminal` are now supported when launching
1468 `git mergetool` to resolve merges. These terminals require that the command
1469 to execute is shell-quoted and passed as a single string argument to `-e`
1470 rather than as additional command line arguments.
1471 (`#524 <https://github.com/git-cola/git-cola/issues/524>`_)
1473 * Fixed a unicode problem when formatting the error message that is shown
1474 when `gitk` is not installed. We now handle unicode data in tracebacks
1475 generated by python itself.
1476 (`#528 <https://github.com/git-cola/git-cola/issues/528>`_)
1478 * The `New repository` feature was fixed.
1479 (`#533 <https://github.com/git-cola/git-cola/pull/533>`_)
1481 * We now use omit the extended description when creating "fixup!" commits,
1482 for consistency with the Git CLI. We now include only the one-line summary
1483 in the final commit message.
1484 (`#522 <https://github.com/git-cola/git-cola/issues/522>`_)
1491 Usability, bells and whistles
1492 -----------------------------
1494 * The user interface is now HiDPI-capable. git-cola now uses SVG
1495 icons, and its interface can be scaled by setting the `GIT_COLA_SCALE`
1496 environment variable.
1498 * `git dag` now supports the standard editor, difftool, and history hotkeys.
1499 It is now possible to invoke these actions from file widget's context
1500 menu and through the standard hotkeys.
1501 (`#473 <https://github.com/git-cola/git-cola/pull/473>`_)
1503 * The `Status` tool also learned about the history hotkey.
1504 Additionally, the `Alt-{j,k}` aliases are also supported in the `Status`
1505 tool for consistency with the other tools where the non-Alt hotkeys are not
1507 (`#488 <https://github.com/git-cola/git-cola/pull/488>`_)
1509 * The `File Browser` tool now has better default column sizes,
1510 and remembers its window size and placement.
1512 * The `File Browser` now supports the refresh hotkey, and has better
1513 behavior when refreshing. The selection is now retained, and new and
1514 removed files are found when refreshing.
1516 * A new `git-cola-completion.bash` completion script is provided in the
1517 `contrib/` directory. It must be used alongside Git's completion script.
1518 Source it from your `~/.bashrc` (or `~/.zshrc`, etc) after sourcing
1519 the `git-completion.bash` script and you will have command-line completion
1520 support for the `git cola` and `git dag` sub-commands.
1522 * The "checkout" dialog now offers completion for remote branches and other
1523 git refs. This makes it easier to checkout remote branches in a detached
1524 head state. Additionally, the checkout dialog also offers completion for
1525 remote branches that have not yet been checked out, which makes it easier to
1526 create a local tracking branch by just completing for that potential name.
1527 (`#390 <https://github.com/git-cola/git-cola/issues/390>`_)
1529 * The "create branch" and "create tag" dialogs now save and restore their
1532 * The "status" widget can now be configured to use a bold font with a darker
1533 background for the header items.
1534 (`#506 <https://github.com/git-cola/git-cola/pull/506>`_)
1536 * The "status" widget now remembers its horizontol scrollbar position across
1537 updates. This is helpful when working on projects with long paths.
1538 (`#494 <https://github.com/git-cola/git-cola/issues/494>`_)
1543 * When using *Git for Windows*, a `git` window would appear
1544 when running *Windows 8*. We now pass additional flags to
1545 `subprocess.Popen` to prevent a `git` window from appearing.
1546 (`#477 <https://github.com/git-cola/git-cola/issues/477>`_)
1547 (`#486 <https://github.com/git-cola/git-cola/pull/486>`_)
1549 * Launching difftool with `.PY` in `$PATHEXT` on Windows was fixed.
1550 (`#492 <https://github.com/git-cola/git-cola/issues/492>`_)
1552 * Creating a local branch tracking a remote branch that contains
1553 slashes in its name is now properly handled.
1554 (`#496 <https://github.com/git-cola/git-cola/issues/496>`_)
1556 * The "Browse Other Branch" feature was broken by Python3, and is now fixed.
1557 (`#501 <https://github.com/git-cola/git-cola/issues/501>`_)
1559 * We now avoid `long` for better Python3 compatibility.
1560 (`#502 <https://github.com/git-cola/git-cola/issues/502>`_)
1562 * We now use Git's default merge message when merging branches.
1563 (`#508 <https://github.com/git-cola/git-cola/issues/508>`_)
1565 * Miscellaneous fixes
1566 (`#485 <https://github.com/git-cola/git-cola/pull/485>`_)
1571 * git-cola's documentation no longer uses an intersphinx link mapping
1572 to docs.python.org. This fixes warnings when building rpms using koji,
1573 where network access is prevented.
1575 https://bugzilla.redhat.com/show_bug.cgi?id=1231812
1582 Usability, bells and whistles
1583 -----------------------------
1585 * The Interactive Rebase feature now works on Windows!
1586 (`#463 <https://github.com/git-cola/git-cola/issues/463>`_)
1588 * The `diff` editor now understands vim-style `hjkl` navigation hotkeys.
1589 (`#476 <https://github.com/git-cola/git-cola/issues/476>`_)
1591 * `Alt-{j,k}` navigation hotkeys were added to allow changing to the
1592 next/previous file from the diff and commit editors.
1594 * The `Rename branch` menu action is now disabled in empty repositories.
1595 (`#475 <https://github.com/git-cola/git-cola/pull/475>`_)
1596 (`#459 <https://github.com/git-cola/git-cola/issues/459>`_)
1598 * `git cola` now checks unmerged files for conflict markers before
1599 staging them. This feature can be disabled in the preferences.
1600 (`#464 <https://github.com/git-cola/git-cola/issues/464>`_)
1602 * `git dag` now remembers which commits were selected when refreshing
1603 so that it can restore the selection afterwards.
1604 (`#480 <https://github.com/git-cola/git-cola/issues/480>`_)
1606 * "Launch Editor", "Launch Difftool", "Stage/Unstage",
1607 and "Move Up/Down" hotkeys now work when the commit message
1609 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1611 * The diff editor now supports the `Ctrl+u` hotkey for reverting
1612 diff hunks and selected lines.
1614 * The `core.commentChar` Git configuration value is now honored.
1615 Commit messages and rebase instruction sheets will now use
1616 the configured character for comments. This allows having
1617 commit messages that start with `#` when `core.commentChar`
1618 is configured to its non-default value.
1619 (`#446 <https://github.com/git-cola/git-cola/issues/446>`_)
1624 * Diff syntax highlighting was improved to handle more edge cases
1625 and false positives.
1626 (`#467 <https://github.com/git-cola/git-cola/pull/467>`_)
1628 * Setting commands in the interactive rebase editor was fixed.
1629 (`#472 <https://github.com/git-cola/git-cola/issues/472>`_)
1631 * git-cola no longer clobbers the Ctrl+Backspace text editing shortcut
1632 in the commit message editor.
1633 (`#453 <https://github.com/git-cola/git-cola/issues/453>`_)
1635 * The copy/paste clipboard now persists after `git cola` exits.
1636 (`#484 <https://github.com/git-cola/git-cola/issues/484>`_)
1645 * Fixed the "Sign off" feature in the commit message editor.
1652 Usability, bells and whistles
1653 -----------------------------
1654 * Double-click will now choose a commit in the "Select commit" dialog.
1656 * `git cola` has a feature that reads `.git/MERGE_MSG` and friends for the
1657 commit message when a merge is in-progress. Upon refresh, `git cola` will
1658 now detect when a merge has completed and reset the commit message back to
1659 its previous state. It is only reset if the editor contains a message
1660 that was read from the file and has not been manually edited by the user.
1662 * The commit message editor's context menu now has a "Clear..." action for
1663 clearing the message across both the summary and description fields.
1665 * Traditional Chinese (Taiwan) translation updates.
1667 * The system theme's icons are now used wherever possible.
1668 (`#458 <https://github.com/git-cola/git-cola/pull/458>`_)
1672 * The stash viewer now uses ``git show --no-ext-diff`` to avoid running
1673 user-configured diff tools.
1675 * `git cola` now uses the `setsid()` system call to ensure that the
1676 `GIT_ASKPASS` and `SSH_ASKPASS` helper programs are used when pushing
1677 changes using `git`. The askpass helpers will now be used even when
1678 `git cola` is launched from a terminal.
1680 The behavior without `setsid()` is that `git cola` can appear to hang while
1681 pushing changes. The hang happens when `git` prompts the user for a
1682 password using the terminal, but the user never sees the prompt. `setsid()`
1683 detaches the terminal, which ensures that the askpass helpers are used.
1684 (`#218 <https://github.com/git-cola/git-cola/issues/218>`_)
1685 (`#262 <https://github.com/git-cola/git-cola/issues/262>`_)
1686 (`#377 <https://github.com/git-cola/git-cola/issues/377>`_)
1688 * `git dag`'s file list tool was updated to properly handle unicode paths.
1690 * `gnome-terminal` is no longer used by default when `cola.terminal` is unset.
1691 It is broken, as was detailed in #456.
1692 (`#456 <https://github.com/git-cola/git-cola/issues/456>`_)
1694 * The interactive rebase feature was not always setting `$GIT_EDITOR`
1695 to the value of `gui.editor`, thus there could be instances where rebase
1696 will seem to not stop, or hang, when performing "reword" actions.
1698 We now set the `$GIT_EDITOR` environment variable when performing the
1699 "Continue", "Skip", and "Edit Todo" rebase actions so that the correct
1700 editor is used during the rebase.
1701 (`#445 <https://github.com/git-cola/git-cola/issues/445>`_)
1705 * `git cola` moved from a 3-part version number to a simpler 2-part "vX.Y"
1706 version number. Most of our releases tend to contain new features.
1712 Usability, bells and whistles
1713 -----------------------------
1714 * Updated zh_TW translations.
1716 * `git cola rebase` now defaults to `@{upstream}`, and generally uses the same
1717 CLI syntax as `git rebase`.
1719 * The commit message editor now allows you to bypass commit hooks by selecting
1720 the "Bypass Commit Hooks" option. This is equivalent to passing the
1721 `--no-verify` option to `git commit`.
1722 (`#357 <https://github.com/git-cola/git-cola/issues/357>`_)
1724 * We now prevent the "Delete Files" action from creating a dialog that does
1726 (`#378 <https://github.com/git-cola/git-cola/issues/378>`_)
1728 * `git xbase` learned to edit rebase instruction sheets that contain
1731 * The diff colors are now configurable. `cola.color.{text,add,remove,header}`
1732 can now be set with 6-digit hexadecimal colors.
1733 See the `git cola manual <https://git-cola.readthedocs.io/en/latest/git-cola.html#configuration-variables>_`
1736 * Improved hotkey documentation.
1740 * `git cola` will now allow starting an interactive rebase with a dirty
1741 worktree when `rebase.autostash` is set.
1742 (`#360 <https://github.com/git-cola/git-cola/issues/360>`_)
1748 Usability, bells and whistles
1749 -----------------------------
1750 * A new "Find files" widget was added, and can be activated by
1751 using the `Ctrl+t` or `t` hotkeys.
1753 * A new `git cola find` sub-command was added for finding files.
1755 * `git cola` now remembers the text cursor's position when staging
1756 interactively with the keyboard. This makes it easier to use the keyboard
1757 arrows to select and stage lines.
1759 * The completion widgets will now select the top completion item
1760 when `Enter` or `Return` are pressed.
1762 * You can now refresh using `F5` in addition to the existing `Ctrl+R` hotkey.
1766 * `git cola` now passes `--no-abbrev-commit` to `git log` to override
1767 having `log.abbrevCommit = true` set in `.gitconfig`.
1773 Usability, bells and whistles
1774 -----------------------------
1775 * `git dag` now forwards all unknown arguments along to `git log`.
1776 (`#389 <https://github.com/git-cola/git-cola/issues/389>`_)
1778 * Line-by-line interactive staging was made more robust.
1779 (`#399 <https://github.com/git-cola/git-cola/pull/399>`_)
1781 * "Bookmarks" was renamed to "Favorites".
1782 (`#392 <https://github.com/git-cola/git-cola/issues/392>`_)
1784 * Untracked files are now displayed using a unique icon.
1785 (`#388 <https://github.com/git-cola/git-cola/pull/388>`_)
1789 * `git dag` was triggering a traceback on Fedora when parsing Git logs.
1790 (`bz #181676 <https://bugzilla.redhat.com/show_bug.cgi?id=1181686>`_)
1792 * inotify expects unicode paths on Python3.
1793 (`#393 <https://github.com/git-cola/git-cola/pull/393>`_)
1795 * Untracked files are now assumed to be utf-8 encoded.
1796 (`#401 <https://github.com/git-cola/git-cola/issues/401>`_)
1802 Usability, bells and whistles
1803 -----------------------------
1804 * `git cola` can now create GPG-signed commits and merges.
1805 See the documentation for details about setting up a GPG agent.
1806 (`#149 <https://github.com/git-cola/git-cola/issues/149>`_)
1808 * The status widget learned to copy relative paths when `Ctrl+x` is pressed.
1809 (`#358 <https://github.com/git-cola/git-cola/issues/358>`_)
1811 * Custom GUI actions can now define their own keyboard shortcuts by
1812 setting `guitool.$name.shortcut` to a string understood by Qt's
1813 `QAction::setShortcut()` API, e.g. `Alt+X`.
1815 `Qt docs <http://qt-project.org/doc/qt-4.8/qkeysequence.html#QKeySequence-2>`_
1816 for more details about the supported values.
1818 * `git cola` learned to rename branches.
1819 (`#364 <https://github.com/git-cola/git-cola/pull/364>`_)
1820 (`#278 <https://github.com/git-cola/git-cola/issues/278>`_)
1822 * `git dag` now has a "Show history" context menu which can be used to filter
1823 history using the selected paths.
1827 * `sphinxtogithub.py` was fixed for Python3.
1828 (`#353 <https://github.com/git-cola/git-cola/pull/353>`_)
1830 * The commit that changed how we read remotes from `git remote`
1831 to parsing `git config` was reverted since it created problems
1834 * Fixed a crash when using the `rebase edit` feature.
1835 (`#351 <https://github.com/git-cola/git-cola/issues/351>`_)
1837 * Better drag-and-drop behavior when dropping into gnome-terminal.
1838 (`#373 <https://github.com/git-cola/git-cola/issues/373>`_)
1842 * The `git-cola-folder-handler.desktop` file handler was fixed
1843 to pass validation by `desktop-file-validate`.
1844 (`#356 <https://github.com/git-cola/git-cola/issues/356>`_)
1846 * The `git.svg` icon was renamed to `git-cola.svg`, and `git cola` was taught
1847 to prefer icons from the desktop theme when available.
1853 Usability, bells and whistles
1854 -----------------------------
1855 * New hotkey: `Ctrl+Shift+M` merges branches.
1857 * New hotkey: `Ctrl+R` refreshes the DAG viewer.
1858 (`#347 <https://github.com/git-cola/git-cola/issues/347>`_)
1862 * We now use `git config` to parse the list of remotes
1863 instead of parsing the output of `git remote`, which
1864 is a Git porcelain and should not be used by scripts.
1866 * Avoid "C++ object has been deleted" errors from PyQt4.
1867 (`#346 <https://github.com/git-cola/git-cola/issues/346>`_)
1871 * The `make install` target now uses `install` instead of `cp`.
1877 Usability, bells and whistles
1878 -----------------------------
1879 * Updated Brazilian Portuguese translation.
1881 * The status and browse widgets now allow drag-and-drop into
1882 external applications.
1883 (`#335 <https://github.com/git-cola/git-cola/issues/335>`_)
1885 * We now show a progress bar when cloning repositories.
1886 (`#312 <https://github.com/git-cola/git-cola/issues/312>`_)
1888 * The bookmarks widget was simplified to not need a
1890 (`#289 <https://github.com/git-cola/git-cola/issues/289>`_)
1892 * Updated Traditional Chinese translation.
1894 * We now display a warning when trying to rebase with uncommitted changes.
1895 (`#338 <https://github.com/git-cola/git-cola/issues/338>`_)
1897 * The status widget learned to filter paths.
1898 `Ctrl+Shift+S` toggles the filter widget.
1899 (`#337 <https://github.com/git-cola/git-cola/issues/337>`_)
1900 (`#339 <https://github.com/git-cola/git-cola/pull/339>`_)
1902 * The status widget learned to move files to the trash
1903 when the `send2trash <https://github.com/hsoft/send2trash>`_
1904 module is installed.
1905 (`#341 <https://github.com/git-cola/git-cola/issues/341>`_)
1907 * "Recent repositories" is now a dedicated widget.
1908 (`#342 <https://github.com/git-cola/git-cola/issues/342>`_)
1910 * New Spanish translation thanks to Pilar Molina Lopez.
1911 (`#344 <https://github.com/git-cola/git-cola/pull/344>`_)
1915 * Newly added remotes are now properly seen by the fetch/push/pull dialogs.
1916 (`#343 <https://github.com/git-cola/git-cola/issues/343>`_)
1922 Usability, bells and whistles
1923 -----------------------------
1924 * New Brazilian Portuguese translation thanks to Vitor Lobo.
1926 * New Indonesian translation thanks to Samsul Ma'arif.
1928 * Updated Simplified Chinese translation thanks to Zhang Han.
1930 * `Ctrl+Backspace` is now a hotkey for "delete untracked files" in
1933 * Fetch/Push/Pull dialogs now use the configured remote of the current
1935 (`#324 <https://github.com/git-cola/git-cola/pull/324>`_)
1939 * We now use `os.getcwd()` on Python3.
1940 (`#316 <https://github.com/git-cola/git-cola/pull/316>`_)
1941 (`#326 <https://github.com/git-cola/git-cola/pull/326>`_)
1943 * The `Ctrl+P` hotkey was overloaded to both "push" and "cherry-pick",
1944 so "cherry-pick" was moved to `Ctrl+Shift+C`.
1946 * Custom GUI tools with mixed-case names are now properly supported.
1948 * "Diff Region" is now referred to as "Diff Hunk" for consistency
1949 with common terminology from diff/patch tools.
1950 (`#328 <https://github.com/git-cola/git-cola/issues/328>`_)
1952 * git-cola's test suite is now portable to MS Windows.
1953 (`#332 <https://github.com/git-cola/git-cola/pull/332>`_)
1959 Usability, bells and whistles
1960 -----------------------------
1961 * We now handle the case when inotify `add_watch()` fails
1962 and display instructions on how to increase the number of watches.
1963 (`#263 <https://github.com/git-cola/git-cola/issues/263>`_)
1965 * New and improved zh_TW localization thanks to V字龍(Vdragon).
1966 (`#265 <https://github.com/git-cola/git-cola/pull/265>`_)
1967 (`#267 <https://github.com/git-cola/git-cola/pull/267>`_)
1968 (`#268 <https://github.com/git-cola/git-cola/pull/268>`_)
1969 (`#269 <https://github.com/git-cola/git-cola/issues/269>`_)
1970 (`#270 <https://github.com/git-cola/git-cola/pull/270>`_)
1971 (`#271 <https://github.com/git-cola/git-cola/pull/271>`_)
1972 (`#272 <https://github.com/git-cola/git-cola/pull/272>`_)
1974 * New hotkeys: `Ctrl+F` for fetch, `Ctrl+P` for push,
1975 and `Ctrl+Shift+P` for pull.
1977 * The bookmarks widget's context menu actions were made clearer.
1978 (`#281 <https://github.com/git-cola/git-cola/issues/281>`_)
1980 * The term "Staging Area" is used consistently in the UI
1981 to allow for better localization.
1982 (`#283 <https://github.com/git-cola/git-cola/issues/283>`_)
1984 * The "Section" term is now referred to as "Diff Region"
1986 (`#297 <https://github.com/git-cola/git-cola/issues/297>`_)
1988 * The localization documentation related to the LANGUAGE
1989 environment variable was improved.
1990 (`#293 <https://github.com/git-cola/git-cola/pull/293>`_)
1992 * The "Actions" panel now contains tooltips for each button
1993 in case the button labels gets truncated by Qt.
1994 (`#292 <https://github.com/git-cola/git-cola/issues/292>`_)
1996 * Custom `git config`-defined actions can now be run in the
1997 background by setting `guitool.<name>.background` to `true`.
2001 * We now use bold fonts instead of SmallCaps to avoid
2002 artifacts on several configurations.
2004 * We now pickup `user.email`, `cola.tabwidth`, and similar settings
2005 when defined in /etc/gitconfig.
2006 (`#259 <https://github.com/git-cola/git-cola/issues/259>`_)
2008 * Better support for unicode paths when using inotify.
2009 (`bz #1104181 <https://bugzilla.redhat.com/show_bug.cgi?id=1104181>`_)
2011 * Unicode fixes for non-ascii locales.
2012 (`#266 <https://github.com/git-cola/git-cola/issues/266>`_)
2013 (`#273 <https://github.com/git-cola/git-cola/issues/273>`_)
2014 (`#276 <https://github.com/git-cola/git-cola/issues/276>`_)
2015 (`#282 <https://github.com/git-cola/git-cola/issues/282>`_)
2016 (`#298 <https://github.com/git-cola/git-cola/issues/298>`_)
2017 (`#302 <https://github.com/git-cola/git-cola/issues/302>`_)
2018 (`#303 <https://github.com/git-cola/git-cola/issues/303>`_)
2019 (`#305 <https://github.com/git-cola/git-cola/issues/305>`_)
2021 * Viewing history from the file browser was fixed for Python3.
2022 (`#274 <https://github.com/git-cola/git-cola/issues/274>`_)
2024 * setup.py was fixed to install the `*.rst` documentation.
2025 (`#279 <https://github.com/git-cola/git-cola/issues/279>`_)
2027 * Patch export was fixed for Python3.
2028 (`#290 <https://github.com/git-cola/git-cola/issues/290>`_)
2030 * Fixed adding a bookmark with trailing slashes.
2031 (`#295 <https://github.com/git-cola/git-cola/pull/295>`_)
2033 * The default `git dag` layout is now setup so that its widgets
2034 can be freely resized on Linux.
2035 (`#299 <https://github.com/git-cola/git-cola/issues/299>`_)
2037 * Invalid tag names are now reported when creating tags.
2038 (`#296 <https://github.com/git-cola/git-cola/pull/296>`_)
2044 Usability, bells and whistles
2045 -----------------------------
2046 * `git cola` no longer prompts after successfully creating a new branch.
2047 (`#251 <https://github.com/git-cola/git-cola/pull/251>`_)
2049 * Hitting enter on simple dialogs now accepts them.
2050 (`#255 <https://github.com/git-cola/git-cola/pull/255>`_)
2054 * `git dag` no longer relies on `sys.maxint`, which is
2055 not available in Python3.
2056 (`#249 <https://github.com/git-cola/git-cola/issues/249>`_)
2058 * Python3-related fixes.
2059 (`#254 <https://github.com/git-cola/git-cola/pull/254>`_)
2061 * Python3-on-Windows-related fixes.
2062 (`#250 <https://github.com/git-cola/git-cola/pull/250>`_)
2063 (`#252 <https://github.com/git-cola/git-cola/pull/252>`_)
2064 (`#253 <https://github.com/git-cola/git-cola/pull/253>`_)
2066 * Switching repositories using the bookmarks widget was not
2067 refreshing the inotify watcher.
2068 (`#256 <https://github.com/git-cola/git-cola/pull/256>`_)
2070 * Special commit messages trailers (e.g. "Acked-by:") are now special-cased to
2071 fix word wrapping lines that start with "foo:".
2072 (`#257 <https://github.com/git-cola/git-cola/issues/257>`_)
2074 * `git dag` sometimes left behind selection artifacts.
2075 We now refresh the view to avoid them.
2076 (`#204 <https://github.com/git-cola/git-cola/issues/204>`_)
2082 Usability, bells and whistles
2083 -----------------------------
2084 * Better inotify support for file creation and deletion.
2085 (`#240 <https://github.com/git-cola/git-cola/issues/240>`_)
2087 * `git cola` now supports the X11 Session Management Protocol
2088 and remembers its state across logout/reboot.
2089 (`#164 <https://github.com/git-cola/git-cola/issues/164>`_)
2091 * `git cola` has a new icon.
2092 (`#190 <https://github.com/git-cola/git-cola/issues/190>`_)
2096 * Building the documentation no longer requires `asciidoc`.
2097 We now use `Sphinx <http://sphinx-doc.org/>`_ for building
2098 html documentation and man pages.
2102 * Reworked the git-dag gravatar icon code to avoid a unicode
2105 * Commit message line-wrapping was made to better match the GUI editor.
2106 (`#242 <https://github.com/git-cola/git-cola/issues/242>`_)
2108 * Better support for Python3 on Windows
2109 (`#246 <https://github.com/git-cola/git-cola/issues/246>`_)
2113 * git-cola no longer depends on Asciidoc for building its documentation
2114 and man-pages. We now depend on [Sphinx](http://sphinx-doc.org/) only.
2120 Usability, bells and whistles
2121 -----------------------------
2122 * Some context menu actions are now hidden when selected
2124 (`#238 <https://github.com/git-cola/git-cola/issues/238>`_)
2128 * The build-git-cola.sh contrib script was improved.
2129 (`#235 <https://github.com/git-cola/git-cola/pull/235>`_)
2131 * Non-ascii worktrees work properly again.
2132 (`#234 <https://github.com/git-cola/git-cola/issues/234>`_)
2134 * The browser now guards itself against missing files.
2135 (`bz #1041378 <https://bugzilla.redhat.com/show_bug.cgi?id=1071378>`_)
2137 * Saving widget state now works under Python3.
2138 (`#236 <https://github.com/git-cola/git-cola/pull/236>`_)
2146 * git-cola now runs on Python 3 thanks to Virgil Dupras.
2147 (`#233 <https://github.com/git-cola/git-cola/pull/233>`_)
2149 * Python 2.6, 2.7, and 3.2+ are now supported.
2150 Python 2.5 is no longer supported.
2154 * i18n test fixes thanks to Virgil Dupras.
2155 (`#231 <https://github.com/git-cola/git-cola/pull/231>`_)
2157 * git-cola.app build fixes thanks to Maicon D. Filippsen.
2158 (`#230 <https://github.com/git-cola/git-cola/pull/230>`_)
2160 * Lots of pylint improvements thanks to Alex Chernetz.
2161 (`#229 <https://github.com/git-cola/git-cola/pull/229>`_)
2167 Usability, bells and whistles
2168 -----------------------------
2169 * The new `Bookmarks` tool makes it really easy to switch between repositories.
2171 * There is now a dedicated dialog for applying patches.
2172 See the ``File -> Apply Patches`` menu item.
2173 (`#215 <https://github.com/git-cola/git-cola/issues/215>`_)
2175 * A new `git cola am` sub-command was added for applying patches.
2179 * Fixed a typo that caused inotify events to be silently ignored.
2181 * Fixed the sys.path setup for Mac OS X (Homebrew).
2182 (`#221 <https://github.com/git-cola/git-cola/issues/221>`_)
2184 * Lots of pylint fixes thanks to Alex Chernetz.
2190 Usability, bells and whistles
2191 -----------------------------
2192 * `git cola --amend` now starts the editor in `amend` mode.
2193 (`#187 <https://github.com/git-cola/git-cola/issues/187>`_)
2195 * Multiple lines of text can now be pasted into the `summary` field.
2196 All text beyond the first newline will be automatically moved to the
2197 `extended description` field.
2198 (`#212 <https://github.com/git-cola/git-cola/issues/212>`_)
2202 * Stray whitespace in `.git` files is now ignored.
2203 (`#213 <https://github.com/git-cola/git-cola/issues/213>`_)
2205 * Fix "known incorrect sRGB profile" in `staged-item.png`.
2206 (`gentoo-devel message #85066
2207 <http://comments.gmane.org/gmane.linux.gentoo.devel/85066>`_)
2215 * Fix a traceback when `git push` fails.
2216 (`bz #1034778 <https://bugzilla.redhat.com/show_bug.cgi?id=1034778>`_)
2220 * Most of the git-cola sub-packages have been removed.
2221 The only remaining packages are `cola`, `cola.models`,
2224 * The translation file for Simplified Chinese was renamed
2226 (`#209 <https://github.com/git-cola/git-cola/issues/209>`_)
2234 * `git cola version --brief` now prints the brief version number.
2238 * Resurrected the "make dist" target, for those that prefer to create
2241 * Fixed the typo that broke the preferences dialog.
2247 Usability, bells and whistles
2248 -----------------------------
2249 * We now ship a full-featured interactive `git rebase` editor.
2250 The rebase todo file is edited using the `git xbase` script which
2251 is provided at `$prefix/share/git-cola/bin/git-xbase`.
2252 This script can be used standalone by setting the `$GIT_SEQUENCE_EDITOR`
2253 before running `git rebase --interactive`.
2254 (`#1 <https://github.com/git-cola/git-cola/issues/1>`_)
2256 * Fixup commit messages can now be loaded from the commit message editor.
2258 * Tool widgets can be locked in place by using the "Tools/Lock Layout"
2260 (`#202 <https://github.com/git-cola/git-cola/issues/202>`_)
2262 * You can now push to several remotes simultaneously by selecting
2263 multiple remotes in the "Push" dialog.
2264 (`#148 <https://github.com/git-cola/git-cola/issues/148>`_)
2266 * The `grep` tool learned to search using three different modes:
2267 basic regular expressions (default), extended regular expressions,
2272 * `git cola` now depends on the `argparse` Python module.
2273 This module is part of the stdlib in Python 2.7 and must
2274 be installed separately when using Python 2.6 and below.
2278 * Support unicode in the output from `fetch`, `push`, and `pull`.
2284 Usability, bells and whistles
2285 -----------------------------
2286 * We now detect when the editor or history browser are misconfigured.
2287 (`#197 <https://github.com/git-cola/git-cola/issues/197>`_)
2288 (`bz #886826 <https://bugzilla.redhat.com/show_bug.cgi?id=886826>`_)
2290 * Display of untracked files can be disabled from the Preferences dialog
2291 or by setting the `gui.displayuntracked` configuration variable to `false`.
2292 (`Git Mailing List on 2013-08-21
2293 <https://public-inbox.org/git/20130821032913.GA6092@wheezy.local/>`_)
2297 * Unicode stash names are now supported
2298 (`#198 <https://github.com/git-cola/git-cola/issues/198>`_)
2300 * The diffs produced when reverting workspace changes were made more robust.
2306 Usability, bells and whistles
2307 -----------------------------
2308 * Brand new German translation thanks to Sven Claussner.
2310 * The "File" menu now provides a "New Repository..." menu action.
2312 * `git dag` now uses a dock-widget interface so that its widgets can
2313 be laid-out and arranged. Customizations are saved and restored
2314 the next time `git dag` is launched.
2316 * `git dag` now has a "Zoom Best Fit" button next alongside the
2317 "Zoom In" and "Zoom Out" buttons.
2319 * `Ctrl+L` now focuses the "Search" field in the `git dag` tool.
2321 * Right-clicking in the "diff" viewer now updates the cursor position
2322 before performing actions, which makes it much easier to click around
2323 and selectively stage sections. Previously, the current cursor position
2324 was used which meant that it required two clicks (left-click to update
2325 the position followed by right-click to get the context menu) for the
2326 desired section to be used. This is now a single right-click operation.
2328 * The `Ctrl+D` "Launch Diff Tool" action learned to automatically choose
2329 between `git difftool` and `git mergetool`. If the file is unmerged then
2330 we automatically launch `git mergetool` on the path, otherwise we use
2331 `git difftool`. We do this because `git difftool` is not intended to
2332 be used on unmerged paths. Automatically using `git mergetool` when
2333 appropriate is the most intuitive and muscle-memory-friendly thing to do.
2335 * You can now right-click on folders in your standard file browser
2336 and choose "Open With -> Git Cola" (Linux-only).
2340 * Python 2.6 on Mac OS X Snow Leopard does not provide a namedtuple
2341 at `sys.version_info`. We now avoid using that variable for better
2344 * We now read the user's Git configuration from `~/.config/git/config`
2345 if that file is available, otherwise we use the traditional `~/.gitconfig`
2346 path, just like Git itself.
2348 * Some edge cases were fixed when applying partial/selected diffs.
2350 * The diff viewer is now properly cleared when refreshing.
2351 (`#194 <https://github.com/git-cola/git-cola/issues/194>`_)
2357 Usability, bells and whistles
2358 -----------------------------
2359 * The diff viewer now has an "Options" menu which can be
2360 used to set "git diff" options. This can be used to
2361 ignore whitespace changes or to show a change with its
2362 surrounding function as context.
2363 (`#150 <https://github.com/git-cola/git-cola/issues/150>`_)
2365 * `git cola` now remembers your commit message and will restore it
2366 when `git cola` is restarted.
2367 (`#175 <https://github.com/git-cola/git-cola/pull/175>`_)
2369 * `Ctrl+M` can now be used to toggle the "Amend last commit"
2370 checkbox in the commit message editor.
2371 (`#161 <https://github.com/git-cola/git-cola/pull/161>`_)
2373 * Deleting remote branches can now be done from the "Branch" menu.
2374 (`#152 <https://github.com/git-cola/git-cola/issues/152>`_)
2376 * The commit message editor now has a built-in spell checker.
2380 * We now avoid invoking external diffs when showing diffstats.
2381 (`#163 <https://github.com/git-cola/git-cola/pull/163>`_)
2383 * The `Status` tool learned to reselect files when refreshing.
2384 (`#165 <https://github.com/git-cola/git-cola/issues/165>`_)
2386 * `git cola` now remembers whether it has been maximized and will restore the
2387 maximized state when `git cola` is restarted.
2388 (`#172 <https://github.com/git-cola/git-cola/issues/172>`_)
2390 * Performance is now vastly improved when staging hundreds or
2393 * `git cola` was not correctly saving repo-specific configuration.
2394 (`#174 <https://github.com/git-cola/git-cola/issues/174>`_)
2396 * Fix a UnicodeDecode in sphinxtogithub when building from source.
2403 Usability, bells and whistles
2404 -----------------------------
2405 * We now automatically remove missing repositories from the
2406 "Select Repository" dialog.
2407 (`#145 <https://github.com/git-cola/git-cola/issues/145>`_)
2409 * A new `git cola diff` sub-command was added for diffing changed files.
2413 * The inotify auto-refresh feature makes it difficult to select text in
2414 the "diff" editor when files are being continually modified by another
2415 process. The auto-refresh causes it to lose the currently selected text,
2416 which is not wanted. We now avoid this problem by saving and restoring
2417 the selection when refreshing the editor.
2418 (`#155 <https://github.com/git-cola/git-cola/issues/155>`_)
2420 * More strings have been marked for l10n.
2421 (`#157 <https://github.com/git-cola/git-cola/issues/157>`_)
2423 * Fixed the Alt+D Diffstat shortcut.
2424 (`#159 <https://github.com/git-cola/git-cola/issues/159>`_)
2428 * Better error handling when cloning repositories.
2430 We were not handling the case where a git URL has
2431 no basename, e.g. `https://git.example.com/`.
2432 `git cola` originally rejected these URLs instead of
2433 allowing users to clone them. It now allows these URLs
2434 when they point to valid git repositories.
2436 Additionally, `git cola` learned to echo the errors
2437 reported by `git clone` when it fails.
2438 (`#156 <https://github.com/git-cola/git-cola/issues/156>`_)
2445 Usability, bells and whistles
2446 -----------------------------
2447 * `git dag` got a big visual upgrade.
2449 * `Ctrl+G` now launches the "Grep" tool.
2451 * `Ctrl+D` launches difftool and `Ctrl+E` launches your editor
2452 when in the diff panel.
2454 * git-cola can now be told to use an alternative language.
2455 For example, if the native language is German and we want git-cola to
2456 use English then we can create a `~/.config/git-cola/language` file with
2457 "en" as its contents: ``echo en >~/.config/git-cola/language``
2458 (`#140 <https://github.com/git-cola/git-cola/issues/140>`_)
2460 * A new `git cola merge` sub-command was added for merging branches.
2462 * Less blocking in the main UI
2466 * Autocomplete issues on KDE
2467 (`#144 <https://github.com/git-cola/git-cola/issues/144>`_)
2469 * The "recently opened repositories" startup dialog did not
2470 display itself in the absence of bookmarks.
2471 (`#139 <https://github.com/git-cola/git-cola/issues/139>`_)
2478 Usability, bells and whistles
2479 -----------------------------
2480 * `git cola` learned to honor `.gitattributes` when showing and
2481 interactively applying diffs. This makes it possible to store
2482 files in git using a non-utf-8 encoding and `git cola` will
2483 properly accept them. This must be enabled by settings
2484 `cola.fileattributes` to true, as it incurs a small performance
2486 (`#96 <https://github.com/git-cola/git-cola/issues/96>`_)
2488 * `git cola` now wraps commit messages at 72 columns automatically.
2489 This is configurable using the `cola.linebreak` variable to enable/disable
2490 the feature, and `cola.textwidth` to configure the limit.
2491 (`#133 <https://github.com/git-cola/git-cola/issues/133>`_)
2493 * A new "Open Recent" sub-menu was added to the "File" menu.
2494 This makes it easy to open a recently-edited repository.
2495 (`#135 <https://github.com/git-cola/git-cola/issues/135>`_)
2497 * We now show a preview for untracked files when they are clicked
2498 using the `Status` tool.
2499 * A new "Open Using Default Application" action was added to the
2500 `Status` tool. It is activated using either `Spacebar` or through
2501 the context menu. This action uses `xdg-open` on Linux and
2503 * A new "Open Parent Directory" action was added to the `Status` tool.
2504 It is activated using either `Shift+Spacebar` or through the
2506 * `git dag` learned to honor the `log.date` git configuration variable.
2507 This makes the date display follow whatever format the user has
2509 * A new `git cola config` sub-command was added for quickly
2510 tweaking `git cola`'s git configuration settings.
2511 * Some small usability tweaks -- some user confirmation prompts
2512 were defaulting to "Cancel" when they should have been defaulting
2513 to the affirmative option instead.
2517 * Properly handle arbitrarily-named branches.
2518 * We went back to launching `git mergetool` using an xterm.
2519 The reason is that there are a couple of places where `git mergetool`
2520 requires a terminal for user interaction not covered by `--no-prompt`.
2521 * We now properly handle an edge case when applying short diffs at
2522 the start of a file.
2529 Usability, bells and whistles
2530 -----------------------------
2531 * New and improved `grep` mode lets you instantly find and edit files.
2532 * New `git cola grep` standalone mode.
2533 * Support for passing arguments to the configured editors, e.g. `gvim -p`
2534 This makes it possible to select multiple files in the status
2535 window and use `Ctrl-e` to edit them all at once.
2536 * Remote operations now prompt on errors only.
2537 * The `Tab` key now jumps to the extended description when editing the summary.
2538 * More shortcut key labels and misc. UX improvements.
2542 * Selecting an item no longer copies its filename to the copy/paste buffer.
2543 `Ctrl-c` or the "Copy" context-menu action can be used instead.
2544 * The repository monitoring feature on Windows learned to ignore
2545 changes within the ".git" directory. Thanks to Andreas Sommer.
2546 (`#120 <https://github.com/git-cola/git-cola/issues/120>`_)
2553 Usability, bells and whistles
2554 -----------------------------
2555 * `git dag` learned to color-code branchy edges.
2556 The edge colors change when a new branch is detected,
2557 which makes the history much easier to follow.
2558 A huge thanks to Uri Okrent for making it happen.
2560 * New GUI for editing remote repositories.
2562 * New `git cola archive` and `git cola remote` sub-commands.
2564 * `git cola browser` learned an 'Untrack' command.
2566 * The diff editor learned to staged/unstaged while amending.
2568 * The status tool can now scroll horizontally.
2570 * New git repositories can be created by clicking 'New' on the
2571 `git cola --prompt` startup screen.
2578 Usability, bells and whistles
2579 -----------------------------
2580 * Auto-completion was added to more tools.
2582 * `git dag` is easier to use on smaller displays -- the author
2583 field elides its text which allows for a more compact display.
2585 * Selected commits in `git dag` were made more prominent and
2588 * 'Create Branch' learned to fetch remote branches and uses a
2589 background thread to do so.
2591 * User-configured GUI tools are listed alphabetically in the 'Actions' menu.
2593 * The 'Pull' dialog remembers the value of the 'Rebase' checkbox
2594 between invocations.
2603 * Detect Homebrew so that OS X users do not need to set PYTHONPATH.
2605 * `git dag` can export patches again.
2612 Usability, bells and whistles
2613 -----------------------------
2614 * The 'Classic' tool was renamed to 'Browser' and learned to
2615 limit history to the current branch.
2617 * `git dag` learned about gravatar and uses it to show images
2620 * `git dag` learned to use OpenGL for rendering resulting in
2621 much faster rendering.
2623 * More dialogs learned vim-style keyboard shortcuts.
2625 * The commit message editor learned better arrow key navigation.
2632 Usability, bells and whistles
2633 -----------------------------
2634 * `git cola` learned a few new sub commands:
2642 * `Return` in the summary field jumps to the extended description.
2644 * `Ctrl+Return` is now a shortcut for 'Commit'.
2646 * Better French translation for 'Sign-off'.
2648 * The 'Search' widget now has a much simpler and streamlined
2651 * vim-style `h,j,k,l` navigation shortcuts were added to the DAG widget.
2653 * `git dag` no longer prompts for files when diffing commits if the
2654 text field contains paths.
2656 * General user interface and performance improvements.
2660 * The diff viewer no longer changes font size when holding `Control`
2661 while scrolling with the mouse wheel.
2663 * Files with a typechange (e.g. symlinks that become files, etc.)
2664 are now correctly identified as being modified.
2668 * The `cola.controllers` and `cola.views` packages were removed.
2675 Usability, bells and whistles
2676 -----------------------------
2677 * `git cola` can now launch sub commands, e.g.:
2688 * `git dag` is more responsive when gathering auto-completions.
2690 * Keyboard shortcuts are displayed when the '?' key is pressed.
2692 * Various keyboard shortcuts were added for improved usability.
2694 * The status widget now lists unmerged files before modified files.
2696 * vim-style `h,j,k,l` navigation shortcuts were added to the status widget.
2698 * A 'Recently Modified Files...' tool was added.
2700 * Tools can now be hidden with `Alt + #` (where `#` is a keyboard number)
2701 and focused with `Alt + Shift + #`.
2703 * The syntax highlighting colors for diffs was made less intrusive.
2705 * The commit message editor was redesigned to have a more compact
2706 and keyboard-convenient user interface.
2708 * Keyboard shortcuts for adding a Signed-off-by (`Ctrl + i`)
2709 and creating a commit (`Ctrl + m`) were added.
2711 * The status widget was adjusted to use less screen real-estate.
2715 * Avoid updating the index when responding to inotify events.
2716 This avoids interfering with operations such as `git rebase --interactive`.
2717 (`#99 <https://github.com/git-cola/git-cola/issues/99>`_)
2721 * Create `git-dag.pyw` in the win32 installer.
2723 * win32 shortcuts now contain explicit calls to `pythonw.exe` instead of
2724 calling the `.pyw` file directly.
2728 * The 'Apply Changes from Branch...' feature was removed.
2729 `git dag`'s 'Grab File...' feature used alongside the index/worktree editor
2730 is a simpler alternative.
2739 * Further enhanced the staging/unstaging behavior in the status widget.
2740 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
2742 * Unmerged files are no longer listed as modified.
2746 The `cola-$version` tarballs on github were originally setup to
2747 have the same contents as the old tarballs hosted on tuxfamily.
2748 The `make dist` target was changed to write files to a
2749 `git-cola-$version` subdirectory and tarball.
2751 This makes the filenames consistent for the source tarball,
2752 the darwin .app tarball, and the win32 .exe installer.
2759 Usability, bells and whistles
2760 -----------------------------
2761 * Refined the staging/unstaging behavior for code reviews.
2762 (`#97 <https://github.com/git-cola/git-cola/issues/97>`_)
2764 * Added more styling and icons to menus and buttons.
2766 * Adjusted some terminology to more closely match the git CLI.
2770 * Boolean `git config` settings with no value are now supported
2771 (these are not created by git these days but exist in legacy repositories).
2773 * Unicode branches and tags are supported in the "branch diff" tool.
2775 * Guard against low-memory conditions and more interrupted system calls.
2779 * Added desktop launchers for git-cola.desktop and git-dag.desktop.
2780 This replaces the old cola.desktop, so some adjustments to RPM .spec
2781 and debian/ files will be needed.
2783 * Fixed the darwin app-tarball Makefile target to create relative paths.
2787 * The `--style` option was removed. `git cola` follows the system theme
2788 so there's no need for this option these days.
2795 Usability, bells and whistles
2796 -----------------------------
2797 * Export a patch series from `git dag` into a `patches/` directory.
2799 * `git dag` learned to diff commits, slice history along paths, etc.
2801 * Added instant-preview to the `git stash` widget.
2803 * A simpler preferences editor is used to edit `git config` values.
2804 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
2805 (`#89 <https://github.com/git-cola/git-cola/issues/89>`_)
2807 * Previous commit messages can be re-loaded from the message editor.
2808 (`#33 <https://github.com/git-cola/git-cola/issues/33>`_)
2812 * Display commits with no file changes.
2813 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
2815 * Improved the diff editor's copy/paste behavior
2816 (`#90 <https://github.com/git-cola/git-cola/issues/90>`_)
2820 * Bumped version number to ceil(minimum git version).
2821 `git cola` now requires `git` >= 1.6.3.
2823 * Simplified git-cola's versioning when building from tarballs
2824 outside of git. We no longer check for a 'version' file at
2825 the root of the repository. We instead keep a default version
2826 in `cola/version.py` and use it when `git cola`'s `.git` repository
2834 Usability, bells and whistles
2835 -----------------------------
2836 * inotify is much snappier and available on Windows
2837 thanks to Karl Bielefeldt.
2839 * New right-click command to add untracked files to .gitignore
2840 thanks to Audrius Karabanovas.
2842 * Stash, fetch, push, and pull usability improvements
2844 * General usability improvements
2846 * stderr is logged when applying partial diffs.
2850 * Files can be unstaged when amending.
2851 (`#82 <https://github.com/git-cola/git-cola/issues/82>`_)
2853 * Show the configured remote.$remote.pushurl in the GUI
2854 (`#83 <https://github.com/git-cola/git-cola/issues/83>`_)
2856 * Removed usage of the "user" module.
2857 (`#86 <https://github.com/git-cola/git-cola/issues/86>`_)
2859 * Avoids an extra `git update-index` call during startup.
2867 Usability, bells and whistles
2868 -----------------------------
2869 * We now provide better feedback when `git push` fails.
2870 (`#69 <https://github.com/git-cola/git-cola/issues/69>`_)
2872 * The Fetch, Push, and Pull dialogs now give better feedback
2873 when interacting with remotes. The dialogs are modal and
2874 a progress dialog is used.
2878 * More unicode fixes, again. It is now possible to have
2879 unicode branch names, repository paths, home directories, etc.
2880 This continued the work initiated by Redhat's bugzilla #694806.
2882 https://bugzilla.redhat.com/show_bug.cgi?id=694806
2889 Usability, bells and whistles
2890 -----------------------------
2891 * The `git cola` desktop launchers now prompt for a repo
2892 by default. This is done by using the new `--prompt`
2893 flag which tells `git cola` to ignore any git repositories
2894 in the current directory and prompt for one instead.
2898 * More Unicode fixes for repositories and home directories with
2899 embedded unicode characters. Thanks to Christian Jann for
2900 patience and helpful bug reports.
2902 * Fix the 'Clone' button in the startup dialog.
2909 Usability, bells and whistles
2910 -----------------------------
2911 * Faster startup time! `git cola` now offloads initialization
2912 to a background thread so that the GUI appears almost instantly.
2914 * Specialized diff options for p4merge, vimdiff, araxis, emerge,
2915 and ecmerge in difftool (backported from git.git).
2919 * Fix launching commands in the background on Windows
2920 (e.g. when launching `git difftool`).
2922 * Fix unicode errors when home or repository directories contain
2924 (`#74 <https://github.com/git-cola/git-cola/issues/74>`_)
2925 (`bz #694806 <https://bugzilla.redhat.com/show_bug.cgi?id=694806>`_)
2932 Usability, bells and whistles
2933 -----------------------------
2934 * The `cola classic` tool can be now configured to be dockable.
2935 (`#56 <https://github.com/git-cola/git-cola/issues/56>`_)
2937 * The `cola classic` tool now uses visual sigils to indicate a file's status.
2938 The idea and icons were provided by Uri Okrent.
2940 * Include the 'Rescan' button in the 'Actions' widget regardless
2941 of whether inotify is installed.
2945 * Fix installation of translations per Fedora
2946 This incorporates Fedora's fix for the translations path
2947 which originally appeared in cola-1.4.3-translations.patch.
2949 * Mac OS X git-cola developers can now generate git-cola.app
2950 application bundles using 'make app-bundle'.
2954 * Fixed a stacktrace when trying to use "Get Commit Message Template"
2955 with an unconfigured "commit.template" git config variable.
2956 (`bz #67521 <https://bugzilla.redhat.com/show_bug.cgi?id=675721>`_)
2957 (`#72 <https://github.com/git-cola/git-cola/issues/72>`_)
2959 * Properly raise the main window on Mac OS X.
2961 * Properly handle staging a huge numbers of files at once.
2963 * Speed up 'git config' usage by fixing cola's caching proxy.
2965 * Guard against damaged ~/.cola files.
2972 Usability, bells and whistles
2973 -----------------------------
2974 * `git dag` now has a separate display area
2975 for displaying commit metadata. This area will soon
2976 grow additional functionality such as cherry-picking,
2981 * Fixed tests from a previous refactoring.
2983 * Guard against 'diff.external' configuration by always
2984 calling 'git diff' with the '--no-ext-diff' option.
2985 (`#67 <https://github.com/git-cola/git-cola/issues/67>`_)
2987 * Respect 'gui.diffcontext' so that cola's diff display
2988 shows the correct number of context lines.
2990 * Raise the GUI so that it is in the foreground on OS X.
2994 * We now allow distutils to rewrite cola's shebang line.
2995 This allows us to run on systems where "which python"
2996 is Python3k. This is exposed by setting the `PYTHON`
2997 Makefile variable to the location of python2.x.
2999 * git-cola.app is now a tiny download because it no longer
3000 contains Qt and PyQt. These libraries are provided as a
3002 (`Link <http://code.google.com/p/git-cola/downloads/list>`_)
3009 Usability, bells and whistles
3010 -----------------------------
3011 * Clicking on paths in the status widget copies them into the
3012 copy/paste buffer for easy middle-clicking into terminals.
3014 * `Ctrl+C` in diff viewer copies the selected diff to the clipboard.
3018 * Fixed the disappearing actions buttons on PyQt 4.7.4
3019 as reported by Arch and Ubuntu 10.10.
3020 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3022 * Fixed mouse interaction with the status widget where some
3023 items could not be de-selected.
3027 * Removed hard-coded reference to lib/ when calculating Python's
3028 site-packages directory.
3035 Usability, bells and whistles
3036 -----------------------------
3037 * Removed "single-click to (un)stage" in the status view.
3038 This is a usability improvement since we no longer perform
3039 different actions depending on where a row is clicked.
3041 * Added ability to create unsigned, annotated tags.
3045 * Updated documentation to use `cola.git` instead of `cola.gitcmd`.
3052 Usability, bells and whistles
3053 -----------------------------
3054 * Allow un/staging by right-clicking top-level items
3055 (`#57 <https://github.com/git-cola/git-cola/issues/57>`_)
3057 * Running 'commit' with no staged changes prompts to allow
3059 (`#55 <https://github.com/git-cola/git-cola/issues/55>`_)
3061 * Fetch, Push, and Pull are now available via the menus
3062 (`#58 <https://github.com/git-cola/git-cola/issues/58>`_)
3066 * Simplified the actions widget to work around a regression
3068 (`#62 <https://github.com/git-cola/git-cola/issues/62>`_)
3075 Usability, bells and whistles
3076 -----------------------------
3077 * `git dag` interaction was made faster.
3081 * Added '...' indicators to the buttons for
3082 'Fetch...', 'Push...', 'Pull...', and 'Stash...'.
3083 (`#51 <https://github.com/git-cola/git-cola/issues/51>`_)
3085 * Fixed a hang-on-exit bug in the cola-provided
3086 'ssh-askpass' implementation.
3093 Usability, bells and whistles
3094 -----------------------------
3095 * Staging and unstaging is faster.
3096 (`#48 <https://github.com/git-cola/git-cola/issues/48>`_)
3098 * `git dag` reads history in a background thread.
3102 * Added :data:`cola.compat.hashlib` for `Python 2.4` compatibility
3103 * Improved `PyQt 4.1.x` compatibility.
3107 * Configured menu actions use ``sh -c`` for Windows portability.
3115 Usability, bells and whistles
3116 -----------------------------
3117 * Added support for the configurable ``guitool.<tool>.*``
3118 actions as described in the ``git config`` documentation.
3119 (`git-config(1) <https://git-scm.com/docs/git-config>`_)
3120 (`#44 <https://github.com/git-cola/git-cola/issues/44>`_)
3122 This makes it possible to add new actions to `git cola`
3123 by simply editing ``~/.gitconfig``. This implements the
3124 same guitool support as `git gui`.
3126 * Introduced a stat cache to speed up `git config` and
3127 repository status checks.
3129 * Added Alt-key shortcuts to the main `git cola` interface.
3131 * The `Actions` dock widget switches between a horizontal
3132 and vertical layout when resized.
3134 * We now use ``git diff --submodule`` for submodules
3135 (used when git >= 1.6.6).
3137 * The context menu for modified submodules includes an option
3138 to launch `git cola`.
3139 (`#17 <https://github.com/git-cola/git-cola/issues/17>`_)
3141 * Prefer ``$VISUAL`` over ``$EDITOR`` when both are defined.
3142 These are used to set a default editor in lieu of `core.editor`
3145 * Force the editor to be ``gvim`` when we see ``vim``.
3146 This prevents us from launching an editor in the (typically
3147 unattached) parent terminal and creating zombie editors
3148 that cannot be easily killed.
3150 * Selections are remembered and restored across updates.
3151 This makes the `partial-staging` workflow easier since the
3152 diff view will show the updated diff after staging.
3154 * Show the path to the current repository in a tooltip
3155 over the commit message editor.
3156 (`#45 <https://github.com/git-cola/git-cola/issues/45>`_)
3158 * Log internal ``git`` commands when ``GIT_COLA_TRACE`` is defined.
3159 (`#39 <https://github.com/git-cola/git-cola/issues/39>`_)
3163 * Improved backwards compatibility for Python 2.4.
3165 * `Review mode` can now review the current branch; it no longer
3166 requires you to checkout the branch into which the reviewed
3167 branch will be merged.
3169 * Guard against `color.ui = always` configuration when using
3170 `git log` by passing ``--no-color``.
3172 * ``yes`` and ``no`` are now supported as valid booleans
3173 by the `git config` parser.
3175 * Better defaults are used for `fetch`, `push`, and `pull`..
3176 (`#43 <https://github.com/git-cola/git-cola/issues/43>`_)
3180 * Removed colon (`:`) from the applilcation name on Windows
3181 (`#41 <https://github.com/git-cola/git-cola/issues/41>`_)
3183 * Fixed bugs with the Windows installer
3184 (`#40 <https://github.com/git-cola/git-cola/issues/40>`_)
3186 * Added a more standard i18n infrastructure. The install
3187 tree now has the common ``share/locale/$lang/LC_MESSAGES/git-cola.mo``
3188 layout in use by several projects.
3190 * Started trying to accommodate Mac OSX 10.6 (Snow Leopard)
3191 in the ``darwin/`` build scripts but our tester is yet to
3192 report success building a `.app` bundle.
3194 * Replaced use of ``perl`` in Sphinx/documentation Makefile
3195 with more-portable ``sed`` constructs. Thanks to
3196 Stefan Naewe for discovering the portability issues and
3197 providing msysgit-friendly patches.
3204 Usability, bells and whistles
3205 -----------------------------
3206 * It is now possible to checkout from the index as well
3207 as from `HEAD`. This corresponds to the
3208 `Removed Unstaged Changes` action in the `Repository Status` tool.
3210 * The `remote` dialogs (fetch, push, pull) are now slightly
3213 * Bookmarks can be selected when `git cola` is run outside of a git repository.
3215 * Added more user documentation. We now include many links to
3216 external git resources.
3218 * Added `git dag` to the available tools.
3219 `git dag` is a node-based DAG history browser.
3220 It doesn't do much yet, but it's been merged so that we can start
3221 building and improving upon it.
3225 * Fixed a missing ``import`` when showing `right-click` actions
3226 for unmerged files in the `Repository Status` tool.
3228 * ``git update-index --refresh`` is no longer run every time
3229 ``git cola version`` is run.
3231 * Don't try to watch non-existent directories when using `inotify`.
3233 * Use ``git rev-parse --symbolic-full-name`` plumbing to find
3234 the name of the current branch.
3238 * The ``Makefile`` will now conditionally include a ``config.mak``
3239 file located at the root of the project. This allows for user
3240 customizations such as changes to the `prefix` variable
3241 to be stored in a file so that custom settings do not need to
3242 be specified every time on the command-line.
3244 * The build scripts no longer require a ``.git`` directory to
3245 generate the ``builtin_version.py`` module. The release tarballs
3246 now include a ``version`` file at the root of the project which
3247 is used in lieu of having the git repository available.
3248 This allows for ``make clean && make`` to function outside of
3251 * Added maintainer's ``make dist`` target to the ``Makefile``.
3253 * The built-in `simplejson` and `jsonpickle` libraries can be
3254 excluded from ``make install`` by specifying the ``standalone=true``
3255 `make` variable. For example, ``make standalone=true install``.
3256 This corresponds to the ``--standalone`` option to ``setup.py``.
3264 Usability, bells and whistles
3265 -----------------------------
3266 * We now use patience diff by default when it is available via
3267 `git diff --patience`.
3269 * Allow closing the `cola classic` tool with `Ctrl+W`.
3273 * Fixed an unbound variable error in the `push` dialog.
3277 * Don't include `simplejson` in MANIFEST.in.
3279 * Update desktop entry to read `Cola Git GUI`.
3287 This feature release adds two new features directly from
3288 `git cola`'s github issues backlog. On the developer
3289 front, further work was done towards modularizing the code base.
3291 Usability, bells and whistles
3292 -----------------------------
3293 * Dragging and dropping patches invokes `git am`
3294 (`#3 <https://github.com/git-cola/git-cola/issues/3>`_)
3296 * A dialog to allow opening or cloning a repository
3297 is presented when `git cola` is launched outside of a git repository.
3298 (`#22 <https://github.com/git-cola/git-cola/issues/22>`_)
3300 * Warn when `push` is used to create a new branch
3301 (`#35 <https://github.com/git-cola/git-cola/issues/35>`_)
3303 * Optimized startup time by removing several calls to `git`.
3308 * `git cola` is once again compatible with PyQt 4.3.x.
3312 * `cola.gitcmds` was added to factor out git command-line utilities
3314 * `cola.gitcfg` was added for interacting with `git config`
3316 * `cola.models.browser` was added to factor out repobrowser data
3328 * Fix launching external applications on Windows
3330 * Ensure that the `amend` checkbox is unchecked when switching modes
3332 * Update the status tree when amending commits
3342 * Fix Lintian warnings
3352 * Fix X11 warnings on application startup
3362 * Added missing 'Exit Diff Mode' button for 'Diff Expression' mode
3363 (`#31 <https://github.com/git-cola/git-cola/issues/31>`_)
3365 * Fix a bug when initializing fonts on Windows
3366 (`#32 <https://github.com/git-cola/git-cola/issues/32>`_)
3376 * Keep entries in sorted order in the `cola classic` tool
3378 * Fix staging untracked files
3379 (`#27 <https://github.com/git-cola/git-cola/issues/27>`_)
3381 * Fix the `show` command in the Stash dialog
3382 (`#29 <https://github.com/git-cola/git-cola/issues/29>`_)
3384 * Fix a typo when loading merge commit messages
3385 (`#30 <https://github.com/git-cola/git-cola/issues/30>`_)
3393 This release focuses on a redesign of the git-cola user interface,
3394 a tags interface, and better integration of the `cola classic` tool.
3395 A flexible interface based on configurable docks is used to manage the
3396 various cola widgets.
3398 Usability, bells and whistles
3399 -----------------------------
3400 * New GUI is flexible and user-configurable
3402 * Individual widgets can be detached and rearranged arbitrarily
3404 * Add an interface for creating tags
3406 * Provide a fallback `SSH_ASKPASS` implementation to prompt for
3407 SSH passwords on fetch/push/pull
3409 * The commit message editor displays the current row/column and
3410 warns when lines get too long
3412 * The `cola classic` tool displays upstream changes
3414 * `git cola --classic` launches `cola classic` in standalone mode
3416 * Provide more information in log messages
3420 * Inherit the window manager's font settings
3422 * Miscellaneous PyQt4 bug fixes and workarounds
3426 * Removed all usage of Qt Designer `.ui` files
3428 * Simpler model/view architecture
3430 * Selection is now shared across tools
3432 * Centralized notifications are used to keep views in sync
3434 * The `cola.git` command class was made thread-safe
3436 * Less coupling between model and view actions
3438 * The status view was rewritten to use the MVC architecture
3440 * Added more documentation and tests
3448 Usability, bells and whistles
3449 -----------------------------
3450 * Added a `cola classic` tool for browsing the entire repository
3452 * Handle diff expressions with spaces
3454 * Handle renamed files
3458 * Handle carat `^` characters in diff expressions on Windows
3460 * Worked around a PyQt 4.5/4.6 QThreadPool bug
3464 * Added a keyboard shortcuts reference page
3466 * Added developer API documentation
3470 * Fix the diff expression used when reviewing branches
3472 * Fix a bug when pushing branches
3474 * Fix X11 warnings at startup
3476 * Fix more interrupted system calls on Mac OS X
3484 Usability, bells and whistles
3485 -----------------------------
3486 * Fresh and tasty SVG logos
3488 * Added `Branch Review` mode for reviewing topic branches
3490 * Added diff modes for diffing between tags, branches,
3491 or arbitrary `git diff` expressions
3493 * The push dialog selects the current branch by default.
3494 This is in preparation for `git 1.7.0` where unconfigured `git push`
3495 will refuse to push when run without specifying the remote name
3496 and branch. See the `git` release notes for more information
3498 * Support `open` and `clone` commands on Windows
3500 * Allow saving cola UI layouts
3502 * Re-enabled `double-click-to-stage` for unmerged entries.
3503 Disabling it for unmerged items was inconsistent, though safer.
3505 * Show diffs when navigating the status tree with the keyboard
3509 * Worked around `pyuic4` bugs in the `setup.py` build script
3511 * Added Mac OSX application bundles to the download page
3521 * `git difftool` became an official git command in `git 1.6.3`.
3523 * `git difftool` learned `--no-prompt` / `-y` and a corresponding
3524 `difftool.prompt` configuration variable
3526 Usability, bells and whistles
3527 -----------------------------
3528 * Warn when `non-fast-forward` is used with fetch, push or pull
3530 * Allow `Ctrl+C` to exit cola when run from the command line
3534 * Support Unicode font names
3536 * Handle interrupted system calls
3540 * `PEP-8`-ified more of the cola code base
3546 * All resources are now installed into `$prefix/share/git-cola`.
3547 Closed Debian bug #519972
3549 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519972
3559 * Added support for Kompare in `git difftool`
3561 * Added a separate configuration namespace for `git difftool`
3563 * Added the `diff.tool` configuration variable to define the default diff tool
3565 Usability, bells and whistles
3566 -----------------------------
3567 * The stash dialog allows passing the `--keep-index` option to `git stash`
3569 * Amending a published commit warns at commit time
3571 * Simplified the file-across-revisions comparison dialog
3573 * `origin` is selected by default in fetch/push/pull
3575 * Removed the search field from the log widget
3577 * The log window moved into a drawer widget at the bottom of the UI
3579 * Log window display can be configured with
3580 `cola.showoutput` = `{never, always, errors}`. `errors` is the default.
3582 * `NOTE` -- `cola.showoutput` was removed with the GUI rewrite in 1.4.0.
3586 * Improved nose unittest usage
3590 * Added a Windows/msysGit installer
3592 * Included private versions of `simplejson` and `jsonpickle`
3593 for ease of installation and development