summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-01-083-295/+1032
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: use user-configured background in view definition dialog [PATCH] gitk: Update German translation [PATCH] gitk: Update and fix Makefile gitk: Restore some widget options whose defaults changed in Tk 8.5 gitk: Recode de.po to UTF-8 [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8. [PATCH] gitk i18n: More markup -- various options menus [PATCH] gitk i18n: Initial German translation [PATCH] gitk i18n: Markup several strings for translation [PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs [PATCH] gitk i18n: Add Makefile with rules for po file creation and installation
| * [PATCH] gitk: use user-configured background in view definition dialogGerrit Pape2008-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | 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/457124 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk: Update German translationChristian Stimming2008-01-091-27/+27
| | | | | | | | Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk: Update and fix MakefileChristian Stimming2008-01-091-25/+38
| | | | | | | | | | | | | | 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: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Restore some widget options whose defaults changed in Tk 8.5Paul Mackerras2008-01-061-60/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | 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: Paul Mackerras <paulus@samba.org>
| * gitk: Recode de.po to UTF-8Paul Mackerras2007-12-311-27/+27
| | | | | | | | | | | | | | Somehow de.po got recoded to latin-1 in the process of committing it. This recodes it back to UTF-8. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright ↵Christian Stimming2007-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk i18n: More markup -- various options menusChristian Stimming2007-12-201-46/+46
| | | | | | | | | | Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk i18n: Initial German translationChristian Stimming2007-12-201-0/+703
| | | | | | | | | | Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk i18n: Markup several strings for translationChristian Stimming2007-12-201-200/+201
| | | | | | | | | | | | | | This just marks up plain strings, that aren't used in any unusual way. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk i18n: Import msgcat for message string translation; load ↵Christian Stimming2007-12-201-0/+19
| | | | | | | | | | | | | | | | | | | | | | translation catalogs 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: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk i18n: Add Makefile with rules for po file creation and installationChristian Stimming2007-12-201-0/+45
| | | | | | | | | | | | | | | | 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: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | git.el: Make status refresh faster.Alexandre Julliard2008-01-081-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | Don't set the needs-refresh flag when inserting a new file info, since ewoc refreshes it upon insert already; this makes a full refresh twice as fast. Also make git-fileinfo-prettyprint a little faster by not retrieving permission values twice. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git.el: Refresh files from their real state upon commit.Alexandre Julliard2008-01-081-10/+12
| | | | | | | | | | | | | | | | Instead of just setting the state to up-to-date, retrieve the full state again, so that the file type can be displayed properly. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git.el: Make sure we never insert the same file twice.Alexandre Julliard2008-01-081-3/+3
| | | | | | | | | | | | | | | | Skip non-zero stage files during git-ls-files -c, they are handled later. Also fix git-insert-info-list to merge duplicate file names. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | "git-apply --check" should not report "fixed"Junio C Hamano2008-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running "git apply --check" while --whitespace=fix is enabled (either from the command line or via the configuration), we reported that "N line(s) applied after _fixing_", but --check by itself does not apply and this message was alarming. We could even reword the message to say "N line(s) would have been applied after fixing...", but this patch does not go that far. Instead, we just make it use the "N lines add whitespace errors" warning, which happens to be a good diagnostic message a user would expect from the --check option. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge in GIT 1.5.3.8Junio C Hamano2008-01-083-1/+31
|\ \ | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | GIT 1.5.3.8v1.5.3.8Junio C Hamano2008-01-073-2/+27
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-svn: clarify the "Ignoring error from SVN" pieceEric Wong2008-01-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | I've heard of several users puzzled by this, and it sometimes it appears as if git-svn is doing nothing on slower connections and larger repositories. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-svn: support for funky branch and project names over HTTP(S)Eric Wong2008-01-072-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SVN requires that paths be URI-escaped for HTTP(S) repositories. file:// and svn:// repositories do not need these rules. Additionally, accessing individual paths inside repositories (check_path() and get_log() do NOT require escapes to function and in fact it breaks things). Noticed-by: Michael J. Cohen <mjc@cruiseplanners.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: config: add 'help.*' and 'instaweb.*' variables.Christian Couder2008-01-071-0/+33
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Allow git-mergetool to handle paths with a leading spaceRogan Dawes2008-01-071-2/+5
| | | | | | | | | | | | Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
* | | slightly better auto gc messageNicolas Pitre2008-01-071-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: typofixRalf Wildenhues2008-01-073-5/+5
| | | | | | | | | | | | | | | Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Update draft release notes for 1.5.4Junio C Hamano2008-01-061-2/+13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | diff: do not chomp hunk-header in the middle of a characterJunio C Hamano2008-01-062-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We truncate hunk-header line at 80 bytes, but that 80th byte could be in the middle of a character, which is bad. This uses pick_one_utf8_char() function to make sure we do not cut a character in the middle. This assumes that the internal representation of the text is UTF-8. This needs to be extended in the future but the optimal direction has not been decided yet. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | utf8_width(): allow non NUL-terminated inputJunio C Hamano2008-01-062-34/+54
| | | | | | | | | | | | | | | | | | | | | The original interface assumed that the input string is always terminated with a NUL, but that wasn't too useful. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | utf8: pick_one_utf8_char()Junio C Hamano2008-01-062-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | utf8_width() function was doing two different things. To pick a valid character from UTF-8 stream, and compute the display width of that character. This splits the former to a separate function pick_one_utf8_char(). Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git.el: Display file types and type changes.Alexandre Julliard2008-01-061-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the T status from git-diff-index to display type changes between file/symlink/subproject. Also always show the file type for symlink and subprojects to indicate that they are not normal files. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git.el: Retrieve the permissions for up-to-date files.Alexandre Julliard2008-01-061-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows displaying correctly the executable flag for the initial commit, and will make it possible to show the file type for up-to-date symlinks and subprojects. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git.el: Support for getting diffs from inside the log-edit buffer.Alexandre Julliard2008-01-061-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Take advantage of the new log-edit feature that allows to show a diff with C-c C-d while editing the log message. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Make the git metapackage require the same version of the subpackages.James Bowes2008-01-061-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Without explicit version deps in the rpm spec file, 'yum update git' effectively does nothing. Require explicit versions of the subpackages, so that they get pulled in on an update. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | tree-walk: don't parse incorrect entriesMartin Koegler2008-01-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code can access memory outside of the tree buffer in the case of malformed tree entries. This patch prevents this by: * The rest of the buffer must be at least 24 bytes (at least 1 byte mode, 1 blank, at least one byte path name, 1 NUL, 20 bytes sha1). * Check that the last NUL (21 bytes before the end) is present. This ensures that strlen() and get_mode() calls stay within the buffer. * The mode may not be empty. We have only to reject a blank at the begin, as the rest is handled by if (c < '0' || c > '7'). * The blank is ensured by get_mode(). * The path must contain at least one character. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Document the color.interactive semanticsJeff King2008-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two possible confusions with the color.interactive description: 1. the short name "interactive" implies that it covers all interactive commands; let's explicitly make it so, even though there are no other interactive commands which currently use it 2. Not all parts of "git add --interactive" are controlled by color.interactive (specifically, the diffs require tweaking color.diff). So let's clarify that it applies only to displays and prompts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | add--interactive: allow diff colors without interactive colorsJeff King2008-01-061-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users with color.diff set to true/auto will not see color in "git add -i" unless they also set color.interactive. This changes the semantics of color.interactive to control only the coloring of the interaction aspect of the command and let color.diff to control the color of hunk picker, which would arguably be more convenient. Old $use_color variable is now renamed to $menu_use_color to make it clear that it is about coloring the interaction. The "colored" subroutine now checks if the passed color is defined, instead of checking $use_color variable, to decide if the lines should be colored. The various variables that define colors for different parts of the output are set or unset depending on the setting of color.interactive and color.diff configuration variables. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | add--interactive: remove unused diff colorsJeff King2008-01-061-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When color support was added, we colored the diffs ourselves. However, 4af756f3 changed this to simply run "git diff-files" twice, keeping the colored output separately. This makes the internal diff color variables obsolete with one exception: when splitting hunks, we have to manually recreate the fragment for each part of the split. Thus we keep $fraginfo_color around to do that correctly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | parse_tag_buffer: don't parse invalid tagsMartin Koegler2008-01-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The current tag parsing code can access memory outside the tag buffer, if \n are missing. This patch prevent this behaviour. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: rename gitlink macro to linkgitDan McGee2008-01-06149-603/+603
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: fix "gitlink::foobar[s]"Junio C Hamano2008-01-062-2/+2
| | | | | | | | | | | | | | | | | | They should be spelled with a single colon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: remove gitman.info with "make clean"Junio C Hamano2008-01-061-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | custom pretty format: tolerate empty e-mail addressJunio C Hamano2008-01-062-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When e-mail address is empty (e.g. "A U Thor <>"), --pretty=format misparsed the commit header and did not pick up the date field correctly. Noticed by Marco, fixed slightly differently with additional sanity check and with a test. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation/Makefile - honor $DESTDIR for quick-install targetMark Levedahl2008-01-061-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | filter-branch: work correctly with ambiguous refnamesJunio C Hamano2008-01-061-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'git-filter-branch branch' could fail producing the error: "Which ref do you want to rewrite?" if existed another branch or tag, which name was 'branch-something' or 'something/branch'. [jc: original report and fix were done between Dmitry Potapov and Dscho; I rewrote it using "rev-parse --symbolic-full-name"] Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-rev-parse --symbolic-full-nameJunio C Hamano2008-01-062-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | The plumbing level can understand that the user meant "refs/heads/master" when the user says "master" or "heads/master", but there is no easy way for the scripts to figure it out without duplicating the dwim_ref() logic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-stash clear: refuse to work with extra parameter for nowJunio C Hamano2008-01-061-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it is so tempting to expect "git stash clear stash@{4}" to remove the fourth element in the stash while leaving other elements intact, we should not blindly throw away everything upon seeing such a command. This may change when we start using "git reflog delete" to selectively nuke a single (or multiple, for that matter) stash entries with such a command line. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-stash: use stdout instead of stderr for non error messagesMarco Costalba2008-01-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some scripts and libraries check stderr to detect a failing command, instead of checking the exit code. Because the output from git-status is not primarily for machine consumption, it would not hurt to send these messages to stdout instead and it will make it easier to drive the command for such callers. Signed-off-by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Update draft release notes for 1.5.4Junio C Hamano2008-01-051-1/+4
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-am: Run git gc only once and not for every patch.Michael Stefaniuc2008-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | With "too many unreachable loose objects" git gc --auto will always trigger. This clutters the output of git am and thus git rebase. Signed-off-by: Michael Stefaniuc <mstefani@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | t/t3800: do not use a temporary file to hold expected result.Junio C Hamano2008-01-051-64/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a good practice to write program output to a temporary file during the test, as it would allow easier postmortem when the tested program does break. But there is no benefit in writing the expected output out to the temporary. This actually fixes a bug in check_verify_failure() routine. The intention of the test seems to make sure the "git mktag" command fails, and it spits out the expected error message. But if the command did not fail as expected, the shell function as originally written would not have detected the failure. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | t/t{3600,3800,5401}: do not use egrep when grep would doJunio C Hamano2008-01-053-3/+3
| | | | | | | | | | | | | | | | | | | | | There is nothing _wrong_ with egrep per se, but this way we would have less dependency on external tools. Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status