git, branch v1.8.3-rc2

Git 1.8.3-rc2

2013-05-13T18:09:42Z

Signed-off-by: Junio C Hamano

Merge git://ozlabs.org/~paulus/gitk

2013-05-13T14:51:41Z

* git://ozlabs.org/~paulus/gitk: gitk: On OSX, bring the gitk window to front gitk: Add support for -G'regex' pickaxe variant gitk: Add menu item for reverting commits gitk: Simplify file filtering gitk: Display the date of a tag in a human-friendly way gitk: Improve behaviour of drop-down lists gitk: Move hard-coded colors to .gitk

gitk: On OSX, bring the gitk window to front

2013-05-13T11:29:43Z

On OSX, Tcl/Tk application windows are created behind all the applications down the stack of windows. This is very annoying, because once a gitk window appears, it's the downmost window and switching to it is pain. The patch is: if we are on OSX, use osascript to bring the current Wish process window to front. Signed-off-by: Tair Sabirgaliev Thanks-to: Stefan Haller Signed-off-by: Paul Mackerras

gitk: Add support for -G'regex' pickaxe variant

2013-05-13T11:29:40Z

git log -G'regex' is a very useful alternative to the classic pickaxe. Minimal patch to make it usable from gitk. [zj: reword message] [paulus@samba.org: reword droplist item] Signed-off-by: Zbigniew Jędrzejewski-Szmek Signed-off-by: Paul Mackerras

test-bzr: do not use unportable sed '\+'

2013-05-11T19:51:19Z

Using sed -e '/[0-9]\+//' to find "one or more digits" is not portable. Use the Basic Regular Expression '/[0-9][0-9]*//' instead. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

Merge git://git.bogomips.org/git-svn

2013-05-11T18:09:00Z

* git://git.bogomips.org/git-svn: git-svn: added an --include-path flag Git::SVN::*: add missing "NAME" section to perldoc git-svn: avoid self-referencing mergeinfo

gitk: Add menu item for reverting commits

2013-05-11T08:31:50Z

Sometimes it's helpful (at least psychologically) to have this feature easily accessible. Code borrows heavily from cherrypick. Signed-off-by: Knut Franke Signed-off-by: Paul Mackerras

gitk: Simplify file filtering

2013-05-11T07:37:08Z

git diff is perfectly able to do this with '-- files', no need for manual filtering. This makes gettreediffs consistent with getblobdiffs. Signed-off-by: Felipe Contreras Signed-off-by: Paul Mackerras

gitk: Display the date of a tag in a human-friendly way

2013-05-11T07:09:27Z

By selecting a tag within gitk you can display information about it. This information is output by using the command 'git cat-file tag ' This outputs the *raw* information from the tag, amongst which is the time - in seconds since the epoch. As useful as that value is, I find it a lot easier to read and process time which it is something like: "Mon Dec 31 14:26:11 2012 -0800" This change will modify the display of tags in gitk like so: @@ -1,7 +1,7 @@ object 5d417842efeafb6e109db7574196901c4e95d273 type commit tag v1.8.1 -tagger Junio C Hamano 1356992771 -0800 +tagger Junio C Hamano Mon Dec 31 14:26:11 2012 -0800 Git 1.8.1 -----BEGIN PGP SIGNATURE----- Signed-off-by: Anand Kumria Signed-off-by: Paul Mackerras

gitk: Improve behaviour of drop-down lists

2013-05-11T07:08:41Z

The drop-down lists used for things like the criteria for finding commits (containing/touching paths/etc.) use a combobox if we are using the ttk widgets. By default the combobox exports its value as the selection when it is changed, which is unnecessary, and sometimes the combobox wouldn't release the selection, which is annoying. To fix this, we make these comboboxes not export their selection, and also clear their selection whenever they are changed. This makes them more like a simple selection of alternatives, improving the look and feel of gitk. Signed-off-by: Paul Mackerras