| a6d5888 | Bernt Hansen | 28 December 2007, 02:15:56 UTC | git-gui: Make commit log messages end with a newline Concatenating commit log messages from multiple commits works better when all of the commits end with a clean line break. Its good to be strict in what you create, and lenient in what you accept, and since we're creating here, we should always try to Do The Right Thing(tm). Signed-off-by: Bernt Hansen <bernt@alumni.uwaterloo.ca> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 December 2007, 02:03:55 UTC |
| f0e8692 | Peter Karlsson | 27 December 2007, 12:34:31 UTC | Added Swedish translation. | 30 December 2007, 02:00:14 UTC |
| 9fe9811 | Mark Levedahl | 13 December 2007, 14:02:26 UTC | git-gui: Unconditionally use absolute paths with Cygwin The mapping of Windows vs Cygwin/Posix paths is arbitrary and not knowable from the Posix side, so logic to determine whether to use relative paths to locate the git-gui library just does not work on Cygwin. Fix this to unconditionally use absolute path on Cygwin. (This fixes a regression from 1.5.4). Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 December 2007, 06:51:37 UTC |
| a4750dd | Shawn O. Pearce | 14 December 2007, 06:51:22 UTC | git-gui: Handle file mode changes (644->755) in diff viewer Johannes Sixt pointed out the diff headers "old mode ..." and "new mode ..." were not being parsed properly by git-gui. We now include them in the diff viewer for a file. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 December 2007, 06:51:22 UTC |
| fba6072 | Johannes Sixt | 13 December 2007, 14:39:21 UTC | git-gui: Move frequently used commands to the top of the context menu. "Stage/Unstage Hunk" is probably the most frequently used command of the patch context menu *and* it is not available in some other form than the context menu. Therefore, it should go to the top. "Less Context" and "More Context" entries are also not easily available otherwise, and are therefore, moved second. The other entries are available via key strokes (Copy, Paste, Refresh) or rarly used (Font Size, Options) and can go last. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 December 2007, 06:30:20 UTC |
| cfb5e10 | Miklos Vajna | 04 December 2007, 00:28:42 UTC | Update Hungarian translation. 100% completed. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2007, 23:55:25 UTC |
| e360beb | しらいしななこ | 05 December 2007, 09:24:26 UTC | Update ja.po for git-gui Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 December 2007, 23:54:10 UTC |
| cbd9ac9 | Johannes Sixt | 27 November 2007, 15:25:24 UTC | git-gui: Improve the application icon on Windows. Previusly, there was only a 16x16 image, which looked very distorted. Here we add a 32x32 version, and also make the image sharper. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 December 2007, 04:05:10 UTC |
| 74521ee | Robert Schiele | 01 December 2007, 17:05:40 UTC | git-gui: install-sh from automake does not like -m755 The install-sh script as shipped with automake requires a space between the -m switch and its argument. Since this is also the regular way of doing it with other install implementations this change inserts the missing space. Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 December 2007, 04:04:02 UTC |
| 5405110 | brian m. carlson | 03 December 2007, 01:26:33 UTC | git-gui: Reorder msgfmt command-line arguments Any program using getopt or getopt_long will stop processing options once a non-option argument has been encountered, if POSIXLY_CORRECT is set. Therefore, reorder the command-line arguments to put options first, so that the msgfmt call works in this scenario. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.ath.cx> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 December 2007, 03:49:36 UTC |
| 6f4ec3a | Christian Stimming | 24 November 2007, 09:56:42 UTC | Update German translation. 100% completed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 November 2007, 02:09:52 UTC |
| aa7db34 | Christian Stimming | 24 November 2007, 09:56:32 UTC | Update git-gui.pot with latest (few) string additions and changes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 November 2007, 02:09:47 UTC |
| b53a191 | Michele Ballabio | 22 November 2007, 10:46:21 UTC | git-gui: update it.po and glossary/it.po Updates and fixes: * current -> attuale * failed -> impossibile/non riuscito * corrupt -> danneggiato Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 November 2007, 21:04:10 UTC |
| 208320d | Michele Ballabio | 22 November 2007, 15:20:08 UTC | git-gui: fix a typo in lib/commit.tcl Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 November 2007, 21:02:09 UTC |
| 41188dd | Shawn O. Pearce | 21 November 2007, 07:10:03 UTC | git-gui 0.9.0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 November 2007, 07:10:03 UTC |
| cd16a6c | Shawn O. Pearce | 08 November 2007, 07:22:21 UTC | git-gui: Bind Meta-T for "Stage To Commit" menu action Aaron Digulla suggested we bind Ctrl-T or Cmd-T to "Stage To Commit" menu action so it can be easily accessed from the keyboard. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 November 2007, 07:22:21 UTC |
| 48b8d2b | Shawn O. Pearce | 01 November 2007, 04:31:36 UTC | git-gui: Allow users to set font weights to bold Previously we allowed users to tweak their font weight to be bold by setting it manually in their ~/.gitconfig prior to starting git-gui. This was broken in ae0754ac9a24afa2693246222fc078fe9c133b3a when Simon set the font weight to normal by default, overridding whatever we found from the ~/.gitconfig file. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:31:36 UTC |
| 6ea1079 | Junio C Hamano | 01 November 2007, 04:14:01 UTC | git-gui: Update Japanese strings (part 2) Resolve an earlier suggestion from Christian. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:17:25 UTC |
| 76d536b | しらいしななこ | 31 October 2007, 14:12:12 UTC | git-gui: Update Japanese strings This updates the Japanese translation file. Signed-off-by: しらいしななこ <nanako3@bluebottle.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:06:43 UTC |
| efb8486 | Alex Riesen | 31 October 2007, 21:16:17 UTC | Updated russian translation of git-gui Fixed some spelling mistakes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:05:06 UTC |
| 95a8b67 | Johannes Schindelin | 30 October 2007, 11:25:31 UTC | po2msg: actually output statistics The "--statistics" option was ignored so far; no longer. Now we have a message similar to that of msgfmt. (Untranslated, though ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:03:24 UTC |
| 9a25ae8 | Johannes Schindelin | 30 October 2007, 11:24:53 UTC | po2msg: ignore untranslated messages Do not generate translations when the translated message is empty. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:00:31 UTC |
| f94872d | Johannes Schindelin | 30 October 2007, 11:24:37 UTC | po2msg: ignore entries marked with "fuzzy" As Christian Stimming pointed out, entries which are "fuzzy" need to be checked by human translators, and cannot be used. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 01 November 2007, 04:00:30 UTC |
| ab0d33c | Shawn O. Pearce | 23 October 2007, 22:44:55 UTC | git-gui: Protect against bad translation strings If a translation string uses a format character we don't have an argument for then it may throw an error when we attempt to format the translation. In this case switch back to the default format that comes with the program (aka the English translation). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 October 2007, 07:08:37 UTC |
| f4e9996 | Shawn O. Pearce | 23 October 2007, 22:50:19 UTC | Merge branch 'maint' * maint: git-gui: Make sure we get errors from git-update-index Conflicts: lib/index.tcl | 23 October 2007, 22:50:19 UTC |
| d4e890e | Shawn O. Pearce | 23 October 2007, 20:55:32 UTC | git-gui: Make sure we get errors from git-update-index I'm seeing a lot of silent failures from git-update-index on Windows and this is leaving the index.lock file intact, which means users are later unable to perform additional operations. When the index is locked behind our back and we are unable to use it we may need to allow the user to delete the index lock and try again. However our UI state is probably not currect as we have assumed that some changes were applied but none of them actually did. A rescan is the easiest (in code anyway) solution to correct our UI to show what the index really has (or doesn't have). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 October 2007, 22:49:27 UTC |
| dec2b4a | Alex Riesen | 22 October 2007, 20:28:48 UTC | More updates and corrections to the russian translation of git-gui In particular many screw-ups after po regeneration were fixed. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 October 2007, 04:28:35 UTC |
| c43ff43 | Kirill | 20 October 2007, 19:35:53 UTC | Updated Russian translation. The most important changes are: - Git version cannot be determined... (lost in 57364320bf) - git-gui: fatal error Some changes need the second opinion (search for TOVERIFY), some changes are just copies (search for "carbon copy"). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 October 2007, 04:03:42 UTC |
| 9d434d5 | Christian Stimming | 20 October 2007, 13:31:43 UTC | git-gui: Update German translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 October 2007, 00:45:11 UTC |
| fb6cf21 | Christian Stimming | 20 October 2007, 13:30:53 UTC | git-gui: Add more terms to glossary. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 October 2007, 00:45:10 UTC |
| c9dcc7f | Shawn O. Pearce | 21 October 2007, 00:43:36 UTC | Merge branch 'maint' * maint: git-gui: Don't display CR within console windows git-gui: Handle progress bars from newer gits git-gui: Correctly report failures from git-write-tree Conflicts: lib/commit.tcl lib/console.tcl | 21 October 2007, 00:43:36 UTC |
| bbbadf6 | Shawn O. Pearce | 21 October 2007, 00:42:01 UTC | git-gui: Don't display CR within console windows Git progress bars from tools like git-push and git-fetch use CR to skip back to the start of the current line and redraw it with an updated progress. We were doing this in our Tk widget but had failed to skip the CR, which Tk doesn't draw well. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 October 2007, 00:42:01 UTC |
| bea6878 | Shawn O. Pearce | 20 October 2007, 18:16:15 UTC | git-gui: Handle progress bars from newer gits Post Git 1.5.3 a new style progress bar has been introduced that uses only one line rather than two. The formatting of the completed and total section is also slightly different so we must adjust our regexp to match. Unfortunately both styles are in active use by different versions of Git so we need to look for both. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 October 2007, 00:36:27 UTC |
| 8af52d7 | Shawn O. Pearce | 20 October 2007, 05:42:01 UTC | git-gui: Correctly report failures from git-write-tree If git-write-tree fails (such as if the index file is currently locked and it wants to write to it) we were not getting the error message as $tree_id was always the empty string so we shortcut through the catch and never got the output from stderr. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 October 2007, 05:42:01 UTC |
| a5bb31f | Shawn O. Pearce | 16 October 2007, 16:55:34 UTC | git-gui: Paper bag fix the global config parsing git-config won't honor any options after --list. We must supply the --global option in front of --list if we really want to load the global configuration options. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 October 2007, 07:38:00 UTC |
| 8621581 | Shawn O. Pearce | 13 October 2007, 19:41:31 UTC | git-gui: Honor a config.mak in git-gui's top level I keep forgetting to include TCLTK_PATH when I build git-gui on some systems. Placing that rule (among others) into a config.mak makes it easier to compile the application the same way every time. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 October 2007, 02:14:14 UTC |
| 82dd4e0 | Shawn O. Pearce | 12 October 2007, 20:33:45 UTC | git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows Apparently native Tcl/Tk on Windows is using \ as the return value from [file separator] but [file normalize] on that same system is using / rather than \ to represent a directory separator. I really think that is nuts, but its what is happening. So we can actually just hardcode our separator to / as all systems we support (Windows, Mac OS X, UNIX) use /. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:07:59 UTC |
| ba6c761 | Shawn O. Pearce | 12 October 2007, 20:24:20 UTC | git-gui: Support cloning Cygwin based work-dirs If the user tries to clone a Git repository that is actually a workdir of another repository (by way of contrib git-new-workdir) then the contents of .git is a series of Windows .lnk files which Tcl can't read if this is a native Tcl process. To read the real objects directory we need to resolve the link to that location. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:07:58 UTC |
| 51a41ac | Shawn O. Pearce | 12 October 2007, 20:11:35 UTC | git-gui: Use proper Windows shortcuts instead of bat files On Windows its better to use a shortcut (.lnk file) over a batch script (.bat) as we can specify the icon file for the .lnk and thus have these git specific objects appear on the desktop with that git specific icon file. Unfortunately the authors of Tcl did not bless us with the APIs needed to create shortcuts from within Tcl. But Microsoft did give us Windows Scripting Host which allows us to execute some JavaScript that calls some sort of COM object that can operate on a .lnk file. We now build both Cygwin and non-Cygwin "desktop icons" as proper Windows .lnk files, using the "Start in" property of these files to indicate the working directory of the repository the user wants to launch. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:07:58 UTC |
| d6db1ad | Shawn O. Pearce | 12 October 2007, 16:18:02 UTC | git-gui: Ensure copyright message is correctly read as UTF-8 On Windows using the native Tcl/Tk the copyright header is being read from the script using the system encoding, which may not be utf-8. This causes the multi-byte copyright symbol (which is actually encoded as utf-8) to read as two characters and not as a proper copyright symbol. Explicitly asking Tcl to read this sequence of bytes as utf-8 corrects the issue. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:06:36 UTC |
| 914c4d4 | Shawn O. Pearce | 12 October 2007, 15:13:58 UTC | git-gui: Bind n/c/o accelerators in repository chooser On Windows we need to actually setup binds for the accelerator keys, otherwise the OS doesn't respond to them when the user presses the key combinations. Apparently we automatically get these on Mac OS X when we configure the menu commands, but not on Windows. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:05:59 UTC |
| 28d1b11 | Shawn O. Pearce | 12 October 2007, 15:04:20 UTC | git-gui: Disable the text widget in the repository chooser Although we are using a text widget here we really do not want the end-user to be able to modify the text it displays. So we need to disable it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:05:59 UTC |
| 580b73d | Shawn O. Pearce | 12 October 2007, 15:15:02 UTC | git-gui: Fix bind errors when switching repository chooser panels We need to remove any variable traces we may have installed when the panel is destroyed as the trace may attempt to use a widget that no longer exists on this panel. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 October 2007, 03:05:59 UTC |
| 9c1b1b1 | Shawn O. Pearce | 12 October 2007, 05:56:06 UTC | git-gui: Offer repository management features in menu bar When we show the repository chooser as the primary toplevel (".") we now offer the major choices not just on the window as hyperlinks but they also now are shown in the Repository menu, including the recent repository list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 05:56:06 UTC |
| 28e8695 | Shawn O. Pearce | 12 October 2007, 05:34:36 UTC | git-gui: Change repository browser radio buttons to hyperlinks Making a user click twice to select which action they want to perform when starting git-gui is just wasting their time. Clicking once on a radio button and then clicking again on the "Next >" button is quite unnecessary. Since the recent repository list is shown as a list of hyperlinks we now offer the 3 basic startup actions as hyperlinks. Clicking on a link will immediately jump to the next UI panel, saving the user time as they don't need to click an additional button. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 05:34:36 UTC |
| 24f7c64 | Steffen Prohaska | 08 October 2007, 06:25:47 UTC | git-gui: offer a list of recent repositories on startup If git-gui is started outside a work tree the repository chooser will offer a list of recently opened repositories. Clicking on any list entry directly opens the repository. The list of recently opened repositories is stored in the config as the multi-valued option gui.recentrepo. If the list grows beyond 10 entries it will be truncated by removing one of the older entries. Only repositories that are opened through the repository chooser will get added to the recent list. Repositories opened from the shell will not yet be added to the recent list, as users are likely to have a way to easily return to the same directory via their shell. [sp: This is actually a combined work from both Steffen and myself. Most of the ideas are Steffen's, as is the basic outline of the code, but any outstanding bugs are entirely my fault.] Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 05:13:55 UTC |
| 85f7a94 | Shawn O. Pearce | 12 October 2007, 04:54:15 UTC | git-gui: Support LFs embedded in config file values Using the new --null option added to git-config in git 1.5.3 we can safely accept LFs that are embedded in configuration options. This does require a completely different configuration file parser then the pre 1.5.3 version as we are splitting on very different values. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 04:54:15 UTC |
| f00d504 | Shawn O. Pearce | 12 October 2007, 04:42:17 UTC | git-gui: Refactor git-config --list parsing The parsing for the output of `git config --list` is the same for both the global options and the current repository's options so we can really just use the same parser between them. I'm currently just refactoring the parser so we can use a different one depending on the version of git available to us at runtime. My next change will add support for 1.5.3's --null option. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 04:42:17 UTC |
| 69f85ff | Shawn O. Pearce | 12 October 2007, 04:34:04 UTC | git-gui: Move load_config procedure below git-version selection To better handle configuration options that contain LFs in their values we want to use the new -z option available in git-config version 1.5.3 and later. To configure load_config based upon the git version we need to move thos below the git-version computation. No logic changes yet, just a minor reordering of the code. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 04:34:04 UTC |
| a0592d3 | Johannes Sixt | 11 October 2007, 00:50:40 UTC | git-gui: Change main window layout to support wider screens The layout is changed to have the file lists at the left (Unstaged Changes at the top, Staged Changes below it) and the diff window at the right (with the commit area below it). +----------+---------------------+ | Unstaged | Diff area | | | | | | | | | | +----------+ | | Staged | | | +---------------------+ | | Commit area | | | | +----------+---------------------+ The advantages are: - The height of the file lists can be adjusted independently to fit the files that they contain. - The diff viewer is higher. On wide screens it is ok that the main window is now generally wider, too. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 04:14:33 UTC |
| 4dcf4e0 | Michele Ballabio | 10 October 2007, 13:04:16 UTC | git-gui: update Italian translation An Italian glossary was also added. Some changes: * commit (verb): (creare una) nuova revisione * commit (noun): revisione * checkout: attivazione * tracking branch: duplicato locale di ramo remoto * repository: archivio * some terms are used with more consistency Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 October 2007, 04:12:07 UTC |
| 5736432 | Shawn O. Pearce | 10 October 2007, 08:11:43 UTC | git-gui: Updated po strings based on current sources | 10 October 2007, 08:11:43 UTC |
| 99fe594 | Steffen Prohaska | 10 October 2007, 06:58:59 UTC | git-gui: add mingw specific startup wrapper The wrapper adds the directory it is installed in to PATH. This is required for the git commands implemented in shell. git-gui fails to launch them if PATH is not modified. The wrapper script also accepts an optional command line switch '--working-dir <dir>' and changes to <dir> before launching the actual git-gui. This is required to implement the "Git Gui Here" Explorer shell extension. As a last step the original git-gui script is launched, which is expected to be located in the same directory under the name git-gui.tcl. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 07:50:01 UTC |
| a16b74e | Steffen Prohaska | 10 October 2007, 06:58:58 UTC | git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit Shawn's git-gui Makefile supports the pure tcl replacement for msgfmt if setting NO_MSGFMT. This patch sets the NO_MSGFMT for msysgit. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 07:47:38 UTC |
| be700fe | Steffen Prohaska | 06 October 2007, 09:29:02 UTC | git-gui: add directory git-gui is located in to PATH (on Windows) This commit modifies PATH to include a good guess where git could be found. The first location to search for executable is the directory git-gui is installed in. This is a good guess for a sane installation. Even if git is not available in PATH, git-gui is now able to find it. Hence git-gui can be passed to wish as an absolute path without caring about the environment. We must modify PATH to be able to spawn shell based git commands. For builtins it would be sufficient to located them and execute them with their absolute path. But for shell based git commmands PATH needs to be modified. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 06:26:00 UTC |
| 3ea16e5 | Shawn O. Pearce | 10 October 2007, 05:23:23 UTC | Merge branch 'cs/de' * cs/de: git-gui: Update German translation, including latest glossary changes git-gui: Incorporate glossary changes into existing German translation git-gui: Update German glossary according to mailing list discussion git-gui: Add more words to translation glossary | 10 October 2007, 05:23:23 UTC |
| 1d6e05f | Christian Stimming | 08 October 2007, 19:34:56 UTC | git-gui: Update German translation, including latest glossary changes | 10 October 2007, 05:20:31 UTC |
| aad2dc2 | Christian Stimming | 05 October 2007, 20:01:39 UTC | git-gui: Incorporate glossary changes into existing German translation | 10 October 2007, 05:20:20 UTC |
| becfb01 | Christian Stimming | 05 October 2007, 20:32:55 UTC | git-gui: Update German glossary according to mailing list discussion | 10 October 2007, 05:20:04 UTC |
| 2ce3755 | Christian Stimming | 05 October 2007, 20:30:32 UTC | git-gui: Add more words to translation glossary | 10 October 2007, 05:19:48 UTC |
| c73ce76 | Shawn O. Pearce | 05 October 2007, 12:47:23 UTC | git-gui: Shorten the staged/unstaged changes title bar text The titles for the staged and unstaged areas were usually opening up too narrow by default, causing the text to be clipped by Tcl as it tried to center the text in the middle of the available area. This meant that users who were new to git-gui did not get to see the entire header and may be unclear about what the different lists are. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:18 UTC |
| 13824e2 | Shawn O. Pearce | 08 October 2007, 05:39:08 UTC | git-gui: Bind Cmd-, to Preferences on Mac OS X A Mac OS X UI convention is to have Cmd-, be the accelerator key for the preferences window, which by convention is located in the apple menu under a separator below the about command. We also now call this "Preferences..." as that is the conventional term used in English. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:18 UTC |
| 6bdf5e5 | Shawn O. Pearce | 08 October 2007, 05:23:54 UTC | git-gui: Consolidate the Fetch and Push menus into a Remote menu Sometimes the Fetch menu looks really odd, such as if you are in a repository that has no remotes configured when you start git-gui. Here we didn't have any items to add to the Fetch menu so it was a tad confusing for the end-user to see an empty menu on the menu bar. We now place all of the commands related to fetching and pushing of changes into a single "Remote" menu. This way we have a better class of bucket that we can drop additional remote related items into such as doing a remote merge or editing the remote configuration specs. The shortcuts to execute fetch/remote prune/push on existing remote specifications are now actually submenus listing the remotes by name. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:17 UTC |
| 1cad232 | Shawn O. Pearce | 08 October 2007, 01:12:31 UTC | git-gui: Use progress meter in the status bar during index updates If we are updating the index to stage or unstage changes or reverting files in the working directory we can use the progress handling parts of our status bar to perform this display work, reducing the amount of code duplication we have in the index handling module. Unfortunately the status bar is still a strict approximation as it is unable to know when git-update-index has processed the data we fed to it. The progress bar is actually a progress of the pipe buffer filling up in the OS, not of the actual work done. Still, it tells the user we are working and that has some value. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:17 UTC |
| 51e1ead | Shawn O. Pearce | 06 October 2007, 00:15:10 UTC | git-gui: Include our Git logo in the about dialog Most applications tend to have some sort of pretty image in the about dialog, because it spruces the screen up a little bit and makes the user happy about reading the information shown there. We already have a logo in the repository selection wizard so we can easily reuse this in the about dialog. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:16 UTC |
| 68099ee | Shawn O. Pearce | 05 October 2007, 12:38:35 UTC | git-gui: Refactor about dialog code into its own module The about dialog is getting somewhat long in size and will probably only get more complex as I try to improve upon its display. As the options dialog is even more complex than the about dialog we move the about dialog into its own module to reduce the complexity of the option dialog module. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:16 UTC |
| 281fdf6 | Shawn O. Pearce | 05 October 2007, 12:35:41 UTC | git-gui: Refactor Henrik Nyh's logo into its own procedure By moving the logo into its own procedure we can use it in multiple locations within the UI, but still load it only if the logo is going to be used by the application. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 October 2007, 05:12:15 UTC |
| b7d6825 | Shawn O. Pearce | 10 October 2007, 05:09:41 UTC | Merge branch 'maint' * maint: git-gui: accept versions containing text annotations, like 1.5.3.mingw.1 | 10 October 2007, 05:09:41 UTC |
| 96f1195 | Steffen Prohaska | 06 October 2007, 13:27:22 UTC | git-gui: accept versions containing text annotations, like 1.5.3.mingw.1 This commit teaches git-gui to accept versions with annotations that start with text and optionally end with a dot followed by a number. This is needed by the current versioning scheme of msysgit, which uses versions like 1.5.3.mingw.1. However, the changes is not limited to this use case. Any version of the form <numeric version>.<anytext>.<number> would be parsed and only the starting <numeric version> used for validation. [sp: Minor edit to remove unnecessary group matching] Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 October 2007, 00:15:27 UTC |
| 1952aa1 | Shawn O. Pearce | 02 October 2007, 16:52:22 UTC | git-gui: Allow forced push into remote repository Some workflows allow the user to forcefully update a remote branch, such as in a "proposed updates" (aka "pu") branch where the branch is rewound and rebuilt on a daily basis against the current master branch. In such a case the "--force" or leading + must be used to make git-push execute anyway, even though it may be discarding one or more commits on the remote side. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2007, 04:21:50 UTC |
| e73bfa7 | Shawn O. Pearce | 03 October 2007, 04:17:19 UTC | Merge branch 'maint' * maint: git-gui: Don't crash when starting gitk from a browser session git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk Conflicts: git-gui.sh | 03 October 2007, 04:17:19 UTC |
| 906ab7f | Shawn O. Pearce | 02 October 2007, 16:27:32 UTC | git-gui: Don't crash when starting gitk from a browser session If the user has started git-gui from the command line as a browser we offer the gitk menu options but we didn't create the main status bar widget in the "." toplevel. Trying to access it while starting gitk just results in Tcl errors. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2007, 04:16:04 UTC |
| 501e4c6 | Shawn O. Pearce | 02 October 2007, 16:24:44 UTC | git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk gitk expects $env(GIT_DIR) to be valid as both a path that core Git and Tcl/Tk can resolve to a valid directory, but it has no special handling for Cygwin style UNIX paths and Windows style paths. So we need to do that for gitk and ensure that only relative paths are fed to it, thus allowing both Cygwin style and UNIX style paths to be resolved. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 October 2007, 04:14:18 UTC |
| 0b2bc46 | Shawn O. Pearce | 27 September 2007, 06:15:29 UTC | git-gui: Refer to ourselves as "Git Gui" and not "git-gui" When displaying the name of the application in window titles and menu options (e.g. "About [appname]") we would prefer to call ourselves "Git Gui" over "git-gui" as the former name is now being actively used in the Mac OS X UI strings and just plain looks better to the reader. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 September 2007, 02:17:01 UTC |
| 72a8e81 | Shawn O. Pearce | 27 September 2007, 06:30:51 UTC | git-gui: Support a native Mac OS X application bundle If we are building on Darwin (sometimes known as Mac OS X) and we find the Mac OS X Tk.framework in the expected location we build a proper Mac OS X application bundle with icons and info list. The git-gui and git-citool commands are modified to be very short shell scripts that just execute the application bundle, starting Tk with our own info list and icon set. Although the Makefile change here is rather large it makes for a much more pleasant user experience on Mac OS X as git-gui now has its own icon on the dock, in the standard tk_messageBox dialogs, and the application name now says "Git Gui" instead of "Wish" in locations such as the menu bar and the alt-tab window. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 September 2007, 02:17:00 UTC |
| 1bdd8a1 | Shawn O. Pearce | 27 September 2007, 04:18:29 UTC | git-gui: Use Henrik Nyh's git logo icon on Windows systems Rather than displaying the stock red "Tk" icon in our window title bars and on the task bar we now show a Git specific logo. This is Henrik Nyh's logo that we also use in the startup wizard, scaled to a 16x16 image for Windows task bar usage with a proper transparent background. Signed-off-by: Shawn O. Pearce <shawn.o.pearce@bankofamerica.com> | 28 September 2007, 02:15:54 UTC |
| cbf13d9 | Michele Ballabio | 27 September 2007, 12:53:25 UTC | git-gui: fix typo in lib/blame.tcl Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 28 September 2007, 02:12:49 UTC |
| 96225db | Shawn O. Pearce | 26 September 2007, 19:31:42 UTC | git-gui: Make the status bar easier to read in the setup wizard The setup wizard looks better if we layout the progress bar as two lines: the first line holds the message text and our text formatting of the progress while the second line holds the bar itself. Both extend the full width of the window and we try to pad out the message text so the window doesn't expand when the completed progress number jumps to the next order of magnitude. This change required updating the progress meter format string to allow the application to supply the precision. So we also are updating all of the translations at once to use the newer formatting string. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2007, 19:31:42 UTC |
| a7cb8f5 | Shawn O. Pearce | 26 September 2007, 18:59:09 UTC | git-gui: Switch the git-gui logo to Henrik Nyh's logo Henrik came up with this alternative logo for gitweb and posted it on his blog: http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon The msysGit port uses his logo within some of their components, and frankly it looks better here in git-gui for our repository setup wizard screen. The logo fits quite nicely along the left edge of our window, leaving significantly more vertical space for things like the git-fetch console output. Because the logo changes the layout charateristics of the setup window I also needed to adjust some of the padding for our widgets and stop using a fixed width window size. We now let Tk compute the correct size of the main window whenever the layout changes, and drop the window into roughly the upper left 1/3 of the desktop so its not quite centered but is likely to be far enough away from any sort of task bars/menu bars/docks that the user may have along any edge of the screen. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2007, 18:59:09 UTC |
| 59213f6 | Shawn O. Pearce | 26 September 2007, 18:16:45 UTC | git-gui: Don't delete scrollbars in console windows If we have added a scrollbar to the console window because one direction has too much text to fit in the available screen space we should just keep the scrollbars. Its annoying to watch our horizontal scrollbar bounce in and out of the window as additional text is inserted into the widget and the need for the scrollbar comes and goes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2007, 18:16:45 UTC |
| 6f2d73e | Shawn O. Pearce | 26 September 2007, 18:05:54 UTC | git-gui: Don't delete console window namespaces too early If the console finishes displaying its output and is "done" but needs to draw a scrollbar to show the final output messages it is possible for Tk to delete the window namespace before it does the text widget updates, which means we are unable to add the horizontal or vertical scrollbar to the window when the text widget decides it cannot draw all glyphs on screen. We need to delay deleting the window namespace until we know the window is not going to ever be used again. This occurs if we are done receiving output, the command is successful and the window is closed, or if the window is open and the user chooses to close the window after the command has completed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2007, 18:06:08 UTC |
| cd38c86 | Johannes Schindelin | 25 September 2007, 03:24:12 UTC | git-gui: add a simple msgfmt replacement The program "msgfmt" was our only dependency on gettext. Since it is more than just a hassle to compile gettext on MinGW, here is a (very simple) drop-in replacement, which Works For Us. [sp: Changed Makefile to enable/disable po2msg.sh by the new NO_MSGFMT variable.] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2007, 03:25:08 UTC |
| 85f77ea | Shawn O. Pearce | 24 September 2007, 12:50:58 UTC | git-gui: Copy objects/info/alternates during standard clone If the source repository is using an objects/info/alternates file we need to copy the file to our new repository so that it can access any objects that won't be copied/hardlinked as they are stored in the alternate location. We explicitly resolve all paths in the objects/info/alternates as relative to the source repository but then convert them into an absolute path for the new clone. This allows the new clone to access the exact same locaton as the source repository, even if relative paths had been used before. Under Cygwin we assume that Git is Cygwin based and that the paths in objects/info/alternates must be valid Cygwin UNIX paths, so we need to run `cygpath --unix` on each line in the alternate list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2007, 01:48:39 UTC |
| 81d4d3d | Shawn O. Pearce | 24 September 2007, 12:40:44 UTC | git-gui: Keep the UI responsive while counting objects in clone If we are doing a "standard" clone by way of hardlinking the objects (or copying them if hardlinks are not available) the UI can freeze up for a good few seconds while Tcl scans all of the object directories. This is espeically noticed on a Windows system when you are working off network shares and need to wait for both the NT overheads and the network. We now show a progress bar as we count the objects and build our list of things to copy. This keeps the user amused and also makes sure we run the Tk event loop often enough that the window can still be dragged around the desktop. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2007, 01:48:38 UTC |
| 40f86af | Shawn O. Pearce | 24 September 2007, 12:26:07 UTC | git-gui: Don't bother showing OS error message about hardlinks If we failed to create our test hardlink for the first object we need to link/copy then the only recourse we have is to make a copy of the objects. Users don't really need to know the OS details about why the hardlink failed as its usually because they are crossing filesystem boundaries. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2007, 01:48:38 UTC |
| 354e114 | Johannes Schindelin | 24 September 2007, 02:29:18 UTC | git-gui: Deiconify startup wizard so it raises to the top Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 24 September 2007, 02:29:24 UTC |
| fbc8a93 | Shawn O. Pearce | 23 September 2007, 09:25:13 UTC | git-gui: Avoid console scrollbars unless they are necessary We shouldn't create scrollbars for the horziontal or vertical sides unless there is enough content to make it worth drawing these widgets on screen. This way users don't loose screen space to objects that won't help them navigate the display. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 September 2007, 09:25:13 UTC |
| ab08b36 | Shawn O. Pearce | 22 September 2007, 07:47:43 UTC | git-gui: Allow users to choose/create/clone a repository If we are started outside of a git repository than it is likely the user started us from some sort of desktop shortcut icon in the operating system. In such a case the user is expecting us to prompt them to locate the git repository they want to work on, or to help them make a new repository, or to clone one from an existing location. This is a very simple wizard that offers the user one of these three choices. When we clone a repository we always use the name `master` in the local repository, even if the remote side does not appear to point to that name. I chose this as a policy decision. Much of the Git documentation talks about `master` being the default branch in a repository and that's what git-init does too. If the remote side doesn't call its default branch `master` most users just don't care, they just want to use Git the way the documentation describes. Rather than relying on the git-clone Porcelain that ships with git we build the new repository ourselves and then obtain content by git-fetch. This technique simplifies the entire clone process to roughly: `git init && git fetch && git pull`. Today we use three passes with git-fetch; the first pass gets us the bulk of the objects and the branches, the second pass gets us the tags, and the final pass gets us the current value of HEAD to initialize the default branch. If the source repository is on the local disk we try to use a hardlink to connect the objects into the new clone as this can be many times faster than copying the objects or packing them and passing the data through a pipe to index-pack. Unlike git-clone we stick to pure Tcl [file link -hard] operation thus avoiding the need to fork a cpio process to setup the hardlinks. If hardlinks do not appear to be supported (e.g. filesystem doesn't allow them or we are crossing filesystem boundaries) we use file copying instead. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 September 2007, 08:57:31 UTC |
| a4bee59 | Shawn O. Pearce | 21 September 2007, 07:41:51 UTC | git-gui: Refactor some UI init to occur earlier I'm starting to setup a main window that the user can use to locate an existing repository, clone an existing repository, or create a new repository from scratch. To help do that I want most of our common UI support already defined before we start to look for the Git repository, this way if it was not found we can open a window to help the user locate it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 September 2007, 05:32:00 UTC |
| f31c14b | Shawn O. Pearce | 22 September 2007, 02:03:27 UTC | Merge branch 'maint' * maint: git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs git-gui: Handle starting on mapped shares under Cygwin git-gui: Display message box when we cannot find git in $PATH Conflicts: git-gui.sh | 22 September 2007, 02:03:27 UTC |
| 2fe167b | Shawn O. Pearce | 21 September 2007, 15:44:23 UTC | git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs If we are using Cygwin and the git repository is actually a workdir (by way of git-new-workdir) but this Tcl process is a native Tcl/Tk and not the Cygwin Tcl/Tk then we are unable to traverse the .git/info path as it is a Cygwin symlink and not a standard Windows directory. So we actually need to start a Cygwin process that can do the path translation for us and let it test for .git/info/exclude so we know if we can include that file in our git-ls-files or not. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 September 2007, 01:58:38 UTC |
| 299077f | Shawn O. Pearce | 21 September 2007, 15:08:50 UTC | git-gui: Handle starting on mapped shares under Cygwin I really cannot explain Cygwin's behavior here but if we start git-gui through Cygwin on a local drive it appears that Cygwin is leaving $env(PATH) in Unix style, even if it started a native (non-Cygwin) Tcl/Tk process to run git-gui. Yet starting that same git-gui and Tcl/Tk combination through Cygwin on a network share causes it to automatically convert $env(PATH) into Windows style, which broke our internal "which" implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 September 2007, 01:58:37 UTC |
| 183a1d1 | Shawn O. Pearce | 21 September 2007, 14:58:02 UTC | git-gui: Display message box when we cannot find git in $PATH If we cannot find the git executable in the user's $PATH then we cannot function correctly. Because we need that to get the version so we can load our library correctly we cannot rely on the library function "error_popup" here, as this is all running before the library path has been configured, so error_popup is not available to us. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 September 2007, 01:58:37 UTC |
| 2f7c9a7 | Shawn O. Pearce | 21 September 2007, 01:25:34 UTC | git-gui: Support native Win32 Tcl/Tk under Cygwin Cygwin has been stuck on the 8.4.1 version of Tcl/Tk for quite some time, even though the main Tcl/Tk distribution is already shipping an 8.4.15. The problem is Tcl/Tk no longer supports Cygwin so apparently building the package for Cygwin is now a non-trivial task. Its actually quite easy to build the native Win32 version of Tcl/Tk by compiling with the -mno-cygwin flag passed to GCC but this means we lose all of the "fancy" Cygwin path translations that the Tcl library was doing for us. This is particularly an issue when we are trying to start git-gui through the git wrapper as the git wrapper is passing off a Cygwin path for $0 and Tcl cannot find the startup script or the library directory. We now use `cygpath -m -a` to convert the UNIX style paths to Windows style paths in our startup script if we are building on Cygwin. Doing so allows either the Cygwin-ized Tcl/Tk 8.4.1 that comes with Cygwin or a manually built 8.4.15 that is running the pure Win32 implementation to read our script. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 September 2007, 03:16:53 UTC |
| d4278b5 | Shawn O. Pearce | 20 September 2007, 17:03:43 UTC | git-gui: Fix missing i18n markup in push/fetch windows The console window titles should also be marked up with i18n strings so these can be properly localized. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 September 2007, 17:03:43 UTC |
| e7deec6 | Shawn O. Pearce | 20 September 2007, 17:01:32 UTC | Merge branch 'maint' * maint: git-gui: Avoid using bold text in entire gui for some fonts | 20 September 2007, 17:01:32 UTC |
| ae0754a | Simon Sasburg | 18 September 2007, 22:33:34 UTC | git-gui: Avoid using bold text in entire gui for some fonts Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 September 2007, 16:59:45 UTC |
| 704396b | Shawn O. Pearce | 17 September 2007, 03:15:21 UTC | Merge branch 'maint' * maint: git-gui: Disable native platform text selection in "lists" Conflicts: lib/browser.tcl | 17 September 2007, 03:15:21 UTC |
| 3849bfb | Shawn O. Pearce | 17 September 2007, 03:12:19 UTC | git-gui: Disable native platform text selection in "lists" Sometimes we use a Tk text widget as though it were a listbox. This happens typically when we want to show an icon to the left of the text label or just when a text widget is generally a better choice then the native listbox widget. In these cases if we want the user to have control over the selection we implement our own "in_sel" tag that shows the selected region and we perform our own selection management in the background via keybindings and mouse bindings. In such uses we don't want the user to be able to activate the native platform selection by dragging their mouse through the text widget. Doing so creates a very confusing display and the user is left wondering what it may mean to have two different types of selection in the same widget. Tk doesn't allow us to delete the "sel" tag that it uses internally to manage the native selection but it will allow us to make it invisible by setting the tag to have the same display properties as unselected text. So long as we don't actually use the "sel" tag for anything in code its effectively invisible. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 September 2007, 03:12:19 UTC |
| 31bb1d1 | Shawn O. Pearce | 14 September 2007, 05:50:09 UTC | git-gui: Paper bag fix missing translated strings The Tcl expression "[append [mc Foo] Bar]" does not return the string "FooBar" after translation; instead it is setting the variable Foo to the value Bar, or if Foo is already defined it is appending Bar onto the end of it. This is *not* what we wanted to have happen here. Tcl's join function is actually the correct function but its default joinStr argument is a single space. Unfortunately all of our call sites do not want an extra space added to their string. So we need a small wrapper function to make the call to join with an empty join string. In C this is (roughly) the job of the strcat function. Since strcat is not yet used at the global level it is a reasonable name to use here. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 September 2007, 05:51:18 UTC |
