aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-gui: add french glossary: glossary/fr.poChristian Couder2008-01-17
| | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Refresh file status description after hunk applicationShawn O. Pearce2008-01-16
| | | | | | | | | | | | | | | If we apply a hunk in either direction this may change the file's status. For example if a file is completely unstaged, and has at least two hunks in it and the user stages one hunk the file will change from "Modified, not staged" to "Portions staged for commit". Resetting the file path causes our trace on this variable to fire; that trace is used to update the file header in the diff viewer to the file's current status. Noticed by Johannes Sixt. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Allow 'Create New Repository' on existing directoriesShawn O. Pearce2008-01-16
| | | | | | | | | | | | | | | | Often users setup a few source files and get a project rolling before they create a Git repository for it. In such cases the core Git tools allow users to initialize a new repository by simply running `git init` at the desired root level directory. We need to allow the same situation in git-gui; if the user is trying to make a new repository we should let them do that to any location they chose. If the directory already exists and already has files contained within it we still should allow the user to create a repository there. However we still need to disallow creating a repository on top of an existing repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Initial french translationChristian Couder2008-01-16
| | | | | | | | | | | | | | | | | | Here are some of the choices made to translate Git Gui to french: - commit -> "commit" (noun) or "commiter" (verb) - stage (index) -> "pré-commit" (noun) or "pré-commiter" (verb) - (re)scan -> "(re)synchroniser" - reset -> "réinitialiser" - checkout -> "emprunt" (noun) or "emprunter" (verb) - revision expression -> "expression de révison" I am not completely happy with these, but it's a start... [sp: Inserted a missing LF in message on line 466] Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Improve German translation.Christian Stimming2008-01-16
| | | | | | | Change translation of "clone" back to "klonen" because "kopieren" is a much broader term than this particular git action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Updated Swedish translation after mailing list review.Peter Karlsson2008-01-16
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Fix broken revert confirmation.Christian Stimming2008-01-16
| | | | | | | | I broke this extremely cool feature in 1ac17950, but it is rather easy to fix this. Sorry for that. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Update German translationChristian Stimming2008-01-16
| | | | | | | | | "revert" translated as "verwerfen". "hunk" translated as "Kontext". Several menu items reworded to be shorter. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Update glossary: add term "hunk"Christian Stimming2008-01-16
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Make commit log messages end with a newlinegitgui-0.9.1Bernt Hansen2007-12-29
| | | | | | | | | | | | 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>
* Added Swedish translation.Peter Karlsson2007-12-29
|
* git-gui: Unconditionally use absolute paths with CygwinMark Levedahl2007-12-14
| | | | | | | | | | | 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>
* git-gui: Handle file mode changes (644->755) in diff viewerShawn O. Pearce2007-12-14
| | | | | | | 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>
* git-gui: Move frequently used commands to the top of the context menu.Johannes Sixt2007-12-14
| | | | | | | | | | | | "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>
* Update Hungarian translation. 100% completed.Miklos Vajna2007-12-05
| | | | | Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Update ja.po for git-guiしらいしななこ2007-12-05
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Improve the application icon on Windows.Johannes Sixt2007-12-02
| | | | | | | | 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>
* git-gui: install-sh from automake does not like -m755Robert Schiele2007-12-02
| | | | | | | | | | 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>
* git-gui: Reorder msgfmt command-line argumentsbrian m. carlson2007-12-02
| | | | | | | | | | 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>
* Update German translation. 100% completed.Christian Stimming2007-11-26
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Update git-gui.pot with latest (few) string additions and changes.Christian Stimming2007-11-26
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: update it.po and glossary/it.poMichele Ballabio2007-11-22
| | | | | | | | | | 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>
* git-gui: fix a typo in lib/commit.tclMichele Ballabio2007-11-22
| | | | | Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui 0.9.0gitgui-0.9.0Shawn O. Pearce2007-11-21
| | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Bind Meta-T for "Stage To Commit" menu actionShawn O. Pearce2007-11-08
| | | | | | 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>
* git-gui: Allow users to set font weights to boldShawn O. Pearce2007-11-01
| | | | | | | | | 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>
* git-gui: Update Japanese strings (part 2)Junio C Hamano2007-11-01
| | | | | | Resolve an earlier suggestion from Christian. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* git-gui: Update Japanese stringsしらいしななこ2007-11-01
| | | | | | | This updates the Japanese translation file. Signed-off-by: しらいしななこ <nanako3@bluebottle.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Updated russian translation of git-guiAlex Riesen2007-11-01
| | | | | | Fixed some spelling mistakes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* po2msg: actually output statisticsJohannes Schindelin2007-11-01
| | | | | | | | 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>
* po2msg: ignore untranslated messagesJohannes Schindelin2007-11-01
| | | | | | | 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>
* po2msg: ignore entries marked with "fuzzy"Johannes Schindelin2007-11-01
| | | | | | | | 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>
* git-gui: Protect against bad translation stringsShawn O. Pearce2007-10-26
| | | | | | | | | 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>
* Merge branch 'maint'Shawn O. Pearce2007-10-23
|\ | | | | | | | | | | | | | | | | * maint: git-gui: Make sure we get errors from git-update-index Conflicts: lib/index.tcl
| * git-gui: Make sure we get errors from git-update-indexShawn O. Pearce2007-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | More updates and corrections to the russian translation of git-guiAlex Riesen2007-10-23
| | | | | | | | | | | | | | 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>
* | Updated Russian translation.Kirill2007-10-22
| | | | | | | | | | | | | | | | | | | | 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>
* | git-gui: Update German translationChristian Stimming2007-10-20
| | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | git-gui: Add more terms to glossary.Christian Stimming2007-10-20
| | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge branch 'maint'Shawn O. Pearce2007-10-20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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
| * git-gui: Don't display CR within console windowsgitgui-0.8.4Shawn O. Pearce2007-10-20
| | | | | | | | | | | | | | | | | | 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>
| * git-gui: Handle progress bars from newer gitsShawn O. Pearce2007-10-20
| | | | | | | | | | | | | | | | | | | | 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>
| * git-gui: Correctly report failures from git-write-treeShawn O. Pearce2007-10-20
| | | | | | | | | | | | | | | | | | 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>
* | git-gui: Paper bag fix the global config parsingShawn O. Pearce2007-10-17
| | | | | | | | | | | | | | | | 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>
* | git-gui: Honor a config.mak in git-gui's top levelShawn O. Pearce2007-10-13
| | | | | | | | | | | | | | | | 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>
* | git-gui: Collapse $env(HOME) to ~/ in recent repositories on WindowsShawn O. Pearce2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | git-gui: Support cloning Cygwin based work-dirsShawn O. Pearce2007-10-12
| | | | | | | | | | | | | | | | | | | | 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>
* | git-gui: Use proper Windows shortcuts instead of bat filesShawn O. Pearce2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | git-gui: Ensure copyright message is correctly read as UTF-8Shawn O. Pearce2007-10-12
| | | | | | | | | | | | | | | | | | | | | | 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>
* | git-gui: Bind n/c/o accelerators in repository chooserShawn O. Pearce2007-10-12
| | | | | | | | | | | | | | | | | | | | 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>