- 14 10月, 2008 1 次提交
-
-
由 Alexander Gavrilov 提交于
This allows the encoding to be specified for file contents and used when displaying files and diffs in the bottom-left pane. When displaying diffs, the encoding for each diff hunk is that for the file that the diff hunk is from, so it can change through the course of the diff. The encoding for file contents is determined as follows: - File encoding defaults to the system encoding. - It can be overridden by setting the gui.encoding option. - Finally, the 'encoding' attribute is checked on per-file basis; it has the last word. Note: Since git-check-attr does not provide support for reading attributes from trees, attribute lookup is done using files from the working directory. This also extends the range of supported encoding names, adding ShiftJIS and Shift-JIS as aliases for Shift_JIS, and allowing cp-*, cp_*, ibm-*, ibm_*, jis-* and jis_* as aliases for cp*, ibm* and jis* respectively. This also fixes some bugs in handling of non-ASCII filenames. Core git apparently supports only locale-encoded filenames, so processing is done using the system encoding. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Tested-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 22 9月, 2008 3 次提交
-
-
由 Christian Stimming 提交于
Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
To reproduce: expand a tree like this, then collapse A: +A +B C D The result is: -A C D I.e. sub-nodes expanded from the last sub-node of the item being collapsed are not removed. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
An OSX user has reported that gitk's context menus are not usable under OSX because it doesn't provide a way to generate <Button-3> events. Users can generate <Button-2> events with command+click, so use that for the context menus instead on OSX. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 26 8月, 2008 2 次提交
-
-
由 Alexander Gavrilov 提交于
This adds a new item to the file list popup menu, that calls git gui blame for the selected file, starting with the first parent of the current commit. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
Other GUI tools may need to start gitk and make it automatically select a certain commit. This adds a new command-line option --select-commit=id to make that possible. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 11 8月, 2008 1 次提交
-
-
由 Alexander Gavrilov 提交于
Originally dorunq assumed that the queue entry remained first in the queue after the script eval, and blindly removed it. However, if the handler calls nukefile, it may not be the case anymore, and a random queue entry gets dropped instead. This makes dorunq remove the entry before calling the script, and adds a global variable to allow other functions to determine if they are called from within a dorunq handler. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 04 8月, 2008 1 次提交
-
-
由 Mikael Magnusson 提交于
Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 03 8月, 2008 1 次提交
-
-
由 Christian Stimming 提交于
This includes suggestions by Stephan Beyer. Signed-off-by: NChristian Stimming <stimming@tuhh.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 31 7月, 2008 6 次提交
-
-
由 Alexander Gavrilov 提交于
Try selecting the head, if the previously selected commit is not available in the new view. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
- Switching views now actually preserves the selected commit. - Reloading (also Edit View) preserves the currently selected commit. - Initial selection does not produce weird scrolling. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
If the tree diff command failed to start for some random reason, treepending remained set, and thus no more diffs were shown after that. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
MSysGit compiles git binaries as native Windows executables, so they cannot be killed unless a special flag is specified. This flag is implemented by the Cygwin version of kill, which is also included in MSysGit. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
Local change analysis can take a noticeable amount of time on large file sets, and produce no output if there are no changes. Register the back-ends in commfd, so that they get properly killed on window close. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Alexander Gavrilov 提交于
When collecting commits for a rarely changed, or recently created file or directory, rev-list may work for a noticeable period of time without producing any output. Such processes don't receive SIGPIPE for a while after gitk is closed, thus becoming runaway CPU hogs. Signed-off-by: NAlexander Gavrilov <angavrilov@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 26 5月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
This draws the currently checked-out head with a yellow circle, as suggested by Linus Torvalds, and fixes various places in the code where we assumed that the current head always had a branch. Now we can display the fake commits for local changes on a detached head. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 22 5月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
Commit 94503a66 ("gitk: Fix "wrong # coordinates" error on reload") was correct as far as it went, but introduced a problem because it didn't also clear out boldrows and boldnamerows in clear_display. This resulted in Tcl errors after scrolling through the graph for a while if some rows were highlighted. This fixes it. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 20 5月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
The display of the current row number would stop working if the user clicked on a line, or if selectedline got unset for any other reason, because the trace on it got lost when it was unselected. This fixes it by changing the places that unset selectedline to set it to the empty string instead, and the places that tested for it being set or unset to compare it with the empty string. Thus it never gets unset now. This actually simplified the code in a few places since it can be compared for equality with a row number now without first testing if it is set. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 19 5月, 2008 2 次提交
-
-
由 Michele Ballabio 提交于
Signed-off-by: NMichele Ballabio <barra_cuda@katamail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
This fixes the Tk error "wrong # coordinates: expected 0 or 4, got 2" that sometimes occurred when reloading. The problem was that we didn't unset the variables containing the canvas item id numbers for the displayed rows when we cleared the canvases. Thus make_secsel would think it had something to do when it didn't. Thanks to Michele Ballabio for finding a way to trigger the bug reliably. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 12 5月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
Now that git checkout reports progress when checking out files, we can use that to provide a progress bar in gitk. We re-use the green progress bar (formerly used when reading stuff in) for that. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 11 5月, 2008 3 次提交
-
-
由 Paul Mackerras 提交于
This adds a couple of fields in the bar just below the upper panes that show the row number of the currently selected commit, and how many rows are displayed in total. The latter increments as commits are read in, and thus functions to show that progress is being made. This therefore also removes the code that showed progress using a green oscillating bar in the progress bar window (which some people disliked). Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
-
由 Thomas Arcila 提交于
This allows gitk to run an external diff viewer such as meld. Right-click on a file in the file list view gives "External diff" popup menu entry, which launches the selected external diff tool. The menu entry is only active in "Patch" mode, not in "Tree" mode. The program to run to display the diff is configurable through Edit/Preference/External diff tool. The program is run with two arguments, being the names of files containing the two versions to diff. Gitk will create temporary directories called .gitk-tmp.<pid>/<n> to place these files in, and remove them when it's finished. If the file doesn't exist in one or other revision, gitk will supply /dev/null as the name of the file on that side of the diff. This may need to be adjusted for Windows or MacOS. [paulus@samba.org - cleaned up and rewrote some parts of the patch.] Signed-off-by: NThomas Arcila <thomas.arcila@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 10 5月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
This is based on a patch by Eric Raible <raible@gmail.com>, but does things a bit more simply. Previously, 'b', backspace, and delete all did the same thing. This changes 'b' to perform the inverse of 'f'. And both of them now highlight the filename of the currently diff. This makes it easier to review and navigate the diffs associated with a particular commit using only f, b, and space because the filename of the currently display diff will be dynamically highlighted. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 09 5月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
This goes back to the method of doing updates where we translate the revisions we're given to SHA1 ids and then remove the ones we've asked for before or that we've already come across. This speeds up updates enormously in most cases since it means git log doesn't have to traverse large parts of the tree. We used to do this, but it had bugs, and commit 468bcaed (gitk: Don't filter view arguments through git rev-parse) went to the slower method to avoid the bugs. In order to do this properly, we have to parse the command line and understand all the flag arguments. So this adds a parser that checks all the flag arguments. If there are any we don't know about, we disable the optimization and just pass the whole lot to git log (except for -d/--date-order, which we remove from the list). With this we can then use git rev-parse on the non-flag arguments to work out exactly what SHA1 ids are included and excluded in the list, which then enables us to ask for just the new ones when updating. One wrinkle is that we have to turn symmetric diff arguments (of the form a...b) back into symmetric diff form so that --left-right still works, as git rev parse turns a...b into a b ^merge_base(a,b). This also updates a couple of copyright notices. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 03 5月, 2008 3 次提交
-
-
由 Michele Ballabio 提交于
When we are on a detached head - since gitk does not display where we are - reset has no sense, so disable the relevant line on the context menu, and point out to the user that we are on a detached head. Otherwise, a reset from gitk when on a detached head returns the error: can't read "headids()": no such element in array can't read "headids()": no such element in array while executing "removehead $headids($name) $name" (procedure "movehead" line 4) invoked from within "movehead $newhead $mainhead" (procedure "readresetstat" line 20) invoked from within "readresetstat file4" ("eval" body line 1) invoked from within "eval $script" (procedure "dorunq" line 9) invoked from within "dorunq" ("after" script) [paulus@samba.org: changed menu item to "Detached head: can't reset"] Signed-off-by: NMichele Ballabio <barra_cuda@katamail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Christian Stimming 提交于
This includes suggestions by Stephan Beyer. 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>
-
- 02 5月, 2008 3 次提交
-
-
由 Gerrit Pape 提交于
The msg-files msgs/*.msg used to be installed with mode 755 although they're not executables. With this commit, files are forced to be installed with mode 644, directories and executables with mode 755. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Peter Karlsson 提交于
Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Santiago Gala 提交于
I copied the Italian translation and translated the strings to Spanish starting from there. This incorporates suggestions from Wincent Colaiuta and Carlos Rica. Signed-off-by: NSantiago Gala <sgala@apache.org> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 28 4月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
Alex Riesen pointed out that displaying a commit in 'tree' mode fails if some files have names with special characters such as '{' or '}' in them, due to the fact that we treat the line returned from git ls-tree as a Tcl list at one point. This fixes it by doing what I originally intended but didn't quite get right. We split the line from git ls-tree at the first tab and treat the part before the tab as a list (which is OK since it doesn't have special characters in it) and the part after the tab as the filename. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 26 4月, 2008 1 次提交
-
-
由 Paul Mackerras 提交于
This moves the scanning of the argument list for each view into a new function, parseviewargs, which is called from start_rev_list. This also makes the date mode and the merge mode be per-view rather than global. In merge mode, we work out the list of relevant files in a new function called from start_rev_list, so it will be updated on File->Reload. Plus we now do that after running the argscmd, so if we have one and it generates a -d or --merge option they will be correctly handled now. The other thing this does is to make errors detected in start_rev_list not be fatal. Now instead of doing exit 1 we just pop up and error window and put "No commits selected" in the graph pane. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 06 4月, 2008 1 次提交
-
-
由 Gerrit Pape 提交于
With tcl/tk8.5 the lset command seems to behave differently. When changing the background color through Edit->Preferences, the changes are applied, but new dialogs, such as View->New view... barf with Error: unknown color name "{#ffffff}" Additionally when closing gitk, and starting it up again, a bad value has been saved to ~/.gitk, preventing gitk from running properly; it fails with Error in startup script: unknown color name "{#ffffff}" ... This commit fixes the problem by changing the color dialogs to pass the empty string {} as the list index to choosecolor. This causes the lset and lindex commands used by choosecolor to use and set the whole variable (bgcolor, fgcolor or selectbgcolor) rather than treating them as a 1-element list. Tested with tcl/tk8.4 and 8.5. Dmitry Potapov reported this problem through http://bugs.debian.org/472615Signed-off-by: NGerrit Pape <pape@smarden.org> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 14 3月, 2008 2 次提交
-
-
由 Michele Ballabio 提交于
Signed-off-by: NMichele Ballabio <barra_cuda@katamail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Paul Mackerras 提交于
This is a similar change to that submitted by Junio C Hamano for git-gui. It tests whether the msgfmt command can be run successfully with --tcl, -l and -d, and if not, falls back to using po/po2msg.sh. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
- 11 3月, 2008 3 次提交
-
-
由 Paul Mackerras 提交于
-
由 Paul Mackerras 提交于
Michele Ballabio <barra_cuda@katamail.com> pointed out that gitk sometimes throws a Tcl error (can't read "yscreen") when switching views, and proposed a patch. This is a different way of fixing it which is a bit neater. Basically, in showview we only set yscreen if the selected commit is on screen to start with, and then we only scroll the canvas to bring it onscreen if yscreen is set and the same commit exists in the new view. Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 David Aguilar 提交于
Launching gitk on a bare repository or a .git directory would previously show the work tree as having removed all files. We now inhibit showing local changes when gitk is not launched from within a work tree. Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-