- 16 2月, 2008 2 次提交
-
-
由 Paul Mackerras 提交于
-
由 Paul Mackerras 提交于
This fixes a bug in updating the graph after we have cherry-picked a commit in gitk and then added some new stuff externally. First, we weren't updating viewincl with the new head added by the cherry- pick. Secondly, getcommitlines was doing bad things if it saw a commit that was already in the graph (was already in an arc). This fixes both things. If getcommitlines sees a commit that is already in the graph, it ignores it unless it was not listed before and is listed now. In that case it doesn't assign it a new arc now, and doesn't re-add the commit to its arc. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 14 2月, 2008 1 次提交
-
-
由 Johannes Sixt 提交于
There is an edit box where the number of context lines can be chosen. But it was only used when regular diffs were displayed, not for merge commits. This fixes it. Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 13 2月, 2008 2 次提交
-
-
由 Linus Torvalds 提交于
It's really not very easy to visualize the commit walker, because - on purpose - it obvously doesn't show the uninteresting commits! We will soon add a "--show-all" flag to the revision walker, which will make it show uninteresting commits too, and they'll have a '^' in front of them. This is to update 'gitk' to show those negative commits in gray to futureproof it. Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
The insertrow/removerow functions were really only suitable for inserting/removing a fake row such as the ones used for showing the local changes. When used to insert a real new row from a cherry-pick, they left things in an inconsistent state which then caused various strange layout errors. This renames insertrow/removerow to insertfakerow/removefakerow and adds a new insertrow that does actually go to all the trouble of creating a new arc and setting it up. This is more work but keeps things consistent. This also fixes a bug where cherrypick was not setting mainheadid, and one where selectline wasn't always resulting in targetrow/id being set to the selected row/id. Also insert/removefakerow now adjust numcommits and call setcanvscroll. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 12 2月, 2008 3 次提交
-
-
由 Gerrit Pape 提交于
When creating a tag through gitk, and the tag name includes a slash (or slashes), gitk errors out in a popup window. This patch makes gitk use 'git tag' to create the tag instead of modifying files in refs/tags/, which fixes the issue; if 'git tag' throws an error, gitk pops up with the error message. The problem was reported by Frédéric Brière through http://bugs.debian.org/464104Signed-off-by: NGerrit Pape <pape@smarden.org> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Steffen Prohaska 提交于
Ignoring space changes can be helpful. For example, a commit claims to only reformat source code and you quickly want to verify if this claim is true. Or a commit accidentally changes code formatting and you want to focus on the real changes. In such cases a button to toggle of whitespace changes would be quite handy. You could quickly toggle between seeing and ignoring whitespace changes. This commit adds such a checkbutton right above the diff view. However, in general it is a good thing to see whitespace changes and therefore the state of the checkbutton is not saved. For example, space changes might happen unintentionally. But they are real changes yielding different sha1s for the blobs involved. Signed-off-by: NSteffen Prohaska <prohaska@zib.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Michele Ballabio 提交于
The "Key bindings" message under the "Help" menu was too long and could not be parsed by the translation engine. Fix both issues by translating one line at a time. Signed-off-by: NMichele Ballabio <barra_cuda@katamail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 15 1月, 2008 3 次提交
-
-
由 Paul Mackerras 提交于
Some of the stuff that commit 31c0eaa8 added to drawvisible isn't appropriate to do when we have no commits, and this was causing a Tcl error if gitk was invoked in such a fashion that no commits were selected. This fixes it by bailing out of drawvisible early if there are no commits displayed. Bug reported by Johannes Sixt. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
This fixes a bug where changing the commit range or file list for an existing view and then clicking OK would cause gitk to go into an infinite loop. The problem was that newviewok was invoking reloadcommits via "run reloadcommits", but reloadcommits wasn't explicitly returning 0, and whatever it was returning was causing dorunq to run it over and over again. This fixes it by making reloadcommits return 0. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
This makes gitk select the new commit when cherry-picking, and select the new checked-out head when resetting or checking out a branch. This feels more natural because the user is usually more interested in that commit now than whatever was selected before. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 14 1月, 2008 1 次提交
-
-
由 Johannes Schindelin 提交于
Only Ctrl "=" was bound to increase the font size, probably because English keyboards have the plus on the same key as the equal sign. However, not the whole world is English, and at least with some other keyboard layouts, Ctrl "+" did not work as documented. Noticed by Stephan Hennig. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 13 1月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
Instead of selecting the first commit that appears, this makes gitk select the currently checked out head, if the user hasn't explicitly selected some other commit by the time it appears. If the head hasn't appeared by the time the graph is complete, then we select the first real commit. This applies both for graph updates and when the graph is being read in initially. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 12 1月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
The make_disporder function has an optimization where it assumed that if displayorder was already long enough and the first entry in it for a particular arc was non-null, then the whole arc was present. This turns out not to be true in some circumstances, since we can add a commit to an arc (which truncates displayorder to the previous end of that arc), then call make_disporder for later arcs (which will pad displayorder with null elements), then call make_disporder for the first arc - which won't update the null elements. This fixes it by changing the optimization to check the last element for the arc instead of the first. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 11 1月, 2008 3 次提交
-
-
由 Christian Stimming 提交于
Now 100% complete (163 strings). Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christian Stimming 提交于
Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Charles Bailey 提交于
The po2msg.sh script and the .gitignore in the po directory have been shamelessly copied from the current git-gui. This enables the top level "make NO_MSGFMT" to work consistently for git across the git-gui and gitk sub-projects. This is the same effective patch that has previously been posted as a git.git patch which more succinctly described the copying of po/.gitignore and po/po2msg.sh from git-gui. Signed-off-by: NCharles Bailey <charles@hashpling.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 1月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
Despite the name, the --revs-only flag to git rev-parse doesn't make it output only revision IDs. It makes it output only arguments that are suitable for giving to git rev-list. So make start_rev_list and updatecommits cope with arguments output by git rev-parse that aren't revision IDs. This way we won't get an error when an argument such as "-300" has been given to gitk and the view is updated. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 09 1月, 2008 4 次提交
-
-
由 Paul Mackerras 提交于
-
由 Gerrit Pape 提交于
Have the text fields in the view definition dialog (View->New view...) use the background color as configured through the preferences, instead of hard-coded 'white'. This was suggested by Paul Wise through http://bugs.debian.org/457124Signed-off-by: NGerrit Pape <pape@smarden.org> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
This Makefile uses the template provided at git.git/gitk-git/Makefile by Junio and adds the rules for the i18n files. Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 07 1月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
This means that we don't have to keep clearing them out whenever we change the row numbers for some commits. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 06 1月, 2008 3 次提交
-
-
由 Paul Mackerras 提交于
-
由 Paul Mackerras 提交于
The default options for panedwindows in Tk 8.5 make the sash virtually invisible -- the handle is not shown and the relief is flat. This puts the defaults back to showing the handle and a raised relief on the sash, as in Tk 8.4. This uses the option command to do this, and also uses the option command to set the default font for various UI elements to the UI font ("uifont"). Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
When a fake row is added, we add its (fake) ID to the children list for its (fake) parent. If renumbervarc were to then renumber the parent it would incorrectly use the fake child. This avoids the problem by adding a last_real_child procedure which won't return a fake ID, and using it in renumbervarc. For symmetry this also adds a first_real_child procedure and uses it in ordertoken. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 02 1月, 2008 2 次提交
-
-
由 Paul Mackerras 提交于
First, findmore would sometimes get a Tcl error due to relying on varcorder and vrownum having valid values for the rows being searched, but they may not be valid unless update_arcrows is called, so this makes findmore call update_arcrows if necessary. Secondly, in the "touching paths" and "adding/removing string" modes, findmore was treating fhighlights($row) == -1 as meaning the row matches, whereas it only means that we haven't received an answer from the external git diff-tree process about it yet. This fixes it. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
* Make sure targetrow is never >= numcommits * Don't try to do anything about the target row if the targetid is no longer in the view; it'll just cause Tcl errors * In insertrow, increment targetrow if we are inserting the fake commit at or before the target row * In removerow, if we are removing the target row, make it the next one instead. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 31 12月, 2007 2 次提交
-
-
由 Paul Mackerras 提交于
-
由 Paul Mackerras 提交于
Somehow de.po got recoded to latin-1 in the process of committing it. This recodes it back to UTF-8. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 30 12月, 2007 1 次提交
-
-
由 Paul Mackerras 提交于
Since commits come in out of order and get sorted as we see them, we can have commits coming in and being placed before the commits that are visible in the graph display pane. Previously we just displayed a certain range of row numbers, meaning that when incoming commits were placed before the displayed range, the displayed commits were displaced downwards. This makes it so that we keep the same set of commits displayed, unless the user explicitly scrolls the pane, in which case it scrolls as expected. We do this by having a "target" commit which we try to keep in the same visible position. If commits have come in before it we scroll the canvases by the number of rows that it has moved in the display order. This also fixes a bug in rowofcommit where it would test cached_commitrow before possibly calling update_arcrows, which is where cached_commitrow gets invalidated if things have changed. Now we call update_arcrows if necessary first. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 29 12月, 2007 1 次提交
-
-
由 Paul Mackerras 提交于
When updating the display, if the checked-out head has moved on and isn't currently shown, and there are local changes, we could try to insert a fake row with a parent that isn't displayed, leading to a Tcl error. This is because we check whether the checked-out head is displayed before rereading the references (which is when we discover that the head has moved). This fixes it. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 26 12月, 2007 1 次提交
-
-
由 Paul Mackerras 提交于
* Fixed a bug that occasionally resulted in Tcl "can't use empty string as argument to incr" errors - rowofcommit was sometimes not calling update_arcrows when it needed to. * Fixed a "no such element in array" error when removing a fake row, by unsetting currentid and selectedline in removerow if the row we are removing is the currently selected row. * Made the "update commits" function always do "reread references". * Made dodiffindex et al. remove the fake row(s) if necessary. * Fixed a bug where clicking on a row in the graph display pane didn't account for horizontal scrolling of the pane. * Started changing things that cached information based on row numbers to use commit IDs instead -- this converts the "select line" items that are put into the history list to use "select by ID" instead. * Simplified redrawtags a bit, and fixed a bug where it would use the mainfont for working out how far it extends to the right in the graph display pane rather than the actual font (which might be bold). * Fixed a bug where "reread references" wouldn't notice if the currently checked-out head had changed. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 20 12月, 2007 7 次提交
-
-
由 Paul Mackerras 提交于
-
由 Christian Stimming 提交于
[PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8. When using translations, the target language must be encoded in utf-8 because almost all target languages will contain non-ascii characters. For that reason, the non-translated strings should be in utf-8 as well so that there isn't any encoding mixup inside the program. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
This just marks up plain strings, that aren't used in any unusual way. Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
By setting the environment variable GITK_MSGSDIR, one can manually set the directory where the .msg files are located. This is quite handy during development with GITK_MSGSDIR=po. Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
The compiled .msg files will be installed into $(sharedir)/gitk/lib/msgs according to Junio's mailing list proposal on 2007-07-28. Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-