view etc/images/show.xpm @ 111350:8027e412df98

Backport VC improvements from trunk. * vc/log-edit.el (log-edit-rewrite-fixes): New var. (log-edit-author): New dynamic var. (log-edit-changelog-ours-p, log-edit-insert-changelog-entries): Use it to return the author if different from committer. (log-edit-insert-changelog): Use them to add Author: and Fixes headers. * vc/vc-hooks.el (vc-default-mode-line-string): Doc fix. * vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers. (vc-root-diff, vc-print-root-log, vc-log-incoming) (vc-log-outgoing): Use it. (vc-diff-internal): Set diff-vc-backend. * vc/diff-mode.el (diff-vc-backend): New var. * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' buffer-locally to lambda that re-runs the vc diff command. (Bug#6447) * vc/log-view.el (log-view-mode-map): Bind revert-buffer. Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and log-outgoing commands. * vc/vc.el (vc-log-internal-common): Add a new argument and use it to create a buffer local revert-buffer-function variable. (vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a revert-buffer-function lambda. Improve VC create/retrieve tag/branch. * vc.el (vc-create-tag): Do not read the directory name for VCs with repository revision granularity. Adjust the tag/branch prompt. Reset VC properties. (vc-retrieve-tag): Do not read the directory name for VCs with repository revision granularity. Reset VC properties. Add optional support for resetting VC properties. * vc-dispatcher.el (vc-resynch-window): Add new optional argument, call vc-file-clearprops when true. (vc-resynch-buffer): Add new optional argument, pass it down. (vc-resynch-buffers-in-directory): Likewise. Improve support for special markup in the VC commit message. * vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup. * vc-hg.el (vc-hg-checkin): Add support for Date:. * vc-git.el (vc-git-checkin): * vc-bzr.el (vc-bzr-checkin): Likewise. Add support for vc-log-incoming, improve vc-log-outgoing for Git. * vc-git.el (vc-git-log-view-mode): Fix font lock for incoming/outgoing logs. (vc-git-log-outgoing, vc-git-log-incoming): New functions. * vc-git.el (vc-git-log-outgoing): Use the same format as the short log. (vc-git-log-incoming): Likewise. Run "git fetch" before the log command Add bindings for vc-log-incoming and vc-log-outgoing. * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming and vc-log-outgoing. * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming and vc-log-outgoing. Improve state updating for VC tag commands. * vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer to update the state of all buffers in the directory. * vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204) * vc.el (vc-checkin, vc-modify-change-comment): Adjust to new vc-start/finish-logentry. (vc-find-conflicted-file): New command. (vc-transfer-file): Adjust to new vc-checkin. (vc-next-action): Improve scoping. * vc-git.el (vc-git-checkin): Use log-edit-extract-headers. (vc-git-commits-coding-system): Rename from git-commits-coding-system. * vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files. * vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers. (vc-bzr-conflicted-files): New function. * log-edit.el (log-edit-summary, log-edit-header) (log-edit-unknown-header): New faces. (log-edit-headers-alist): New var. (log-edit-header-contents-regexp): New const. (log-edit-match-to-eoh): New function. (log-edit-font-lock-keywords): Use them. (log-edit): Insert a "Summary:" header as default. (log-edit-mode): Mark font-lock rules as case-insensitive. (log-edit-done): Cleanup headers. (log-edit-extract-headers): New function to replace it. * vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with the windows/frames. * vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*. * vc-dir.el (vc-dir-kill-line): New command. (vc-dir-mode-map): Bind it to C-k. (vc-dir-headers): Abbreviate the working dir. * vc-git.el (vc-git-revision-table): Include remote branches. New VC methods: vc-log-incoming and vc-log-outgoing. * vc.el (vc-print-log-setup-buttons, vc-log-internal-common) (vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing): New functions. (vc-print-log-internal): Just call vc-log-internal-common. (vc-log-view-type): New permanent local variable. * vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing. * vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. (vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions. * vc-git.el (vc-git-log-outgoing): New function. (vc-git-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. * vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. Highlight the tag. (vc-hg-log-incoming, vc-hg-log-outgoing): New functions. (vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode): (vc-hg-incoming-mode): Remove. (vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing. Fix default-directory for vc-root-diff. * vc.el (vc-root-diff): Bind default-directory to the root directory for the diff command. * vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling `vc-hg-command' with a list of flags. * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to log-edit-before-checkin-process. * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry. * vc-bzr.el, vc-hg.el (log-edit-mode): Declare. * vc-dispatcher.el (vc-start-logentry): Doc fix. (log-view-process-buffer, log-edit-extra-flags): Declare. Add special markup processing for commit logs. * log-edit.el (log-edit): Add new argument MODE. Use that mode when non-nil instead of the log-view-mode. * vc.el (vc-default-log-edit-mode): New function. * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to log-edit. Support for shelving snapshots and for showing shelves. * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): New functions. (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) (vc-bzr-extra-menu-map): Map them.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 31 Oct 2010 23:13:42 -0400
parents 75b06a7624a1
children
line wrap: on
line source

/* XPM */
static char * show_xpm[] = {
"24 24 153 2",
"  	c None",
". 	c #000000",
"+ 	c #0E0E0E",
"@ 	c #282828",
"# 	c #616161",
"$ 	c #D3D3D3",
"% 	c #F6F6F6",
"& 	c #FFFFFF",
"* 	c #F9F9F9",
"= 	c #F9F9F8",
"- 	c #E7E7E7",
"; 	c #E4E4E4",
"> 	c #CDCDCD",
", 	c #1F1F1F",
"' 	c #EFEFEE",
") 	c #AFAFAE",
"! 	c #E9E9E9",
"~ 	c #B3B3B3",
"{ 	c #383838",
"] 	c #C1C1C1",
"^ 	c #B4B4B4",
"/ 	c #A4A4A3",
"( 	c #F0F0F0",
"_ 	c #F4F4F4",
": 	c #ABABAB",
"< 	c #050505",
"[ 	c #FEFEFE",
"} 	c #FDFDFD",
"| 	c #FCFCFB",
"1 	c #FBFBFB",
"2 	c #F2F2F2",
"3 	c #9E9E9E",
"4 	c #C0C0C0",
"5 	c #BFBFBF",
"6 	c #BFBFBE",
"7 	c #BEBEBE",
"8 	c #BDBDBC",
"9 	c #BCBCBC",
"0 	c #B9B9B9",
"a 	c #A0A0A0",
"b 	c #B9B7B6",
"c 	c #838381",
"d 	c #848381",
"e 	c #6A6763",
"f 	c #FAFAF9",
"g 	c #F8F8F7",
"h 	c #F8F7F6",
"i 	c #F3F2F1",
"j 	c #E0E0DF",
"k 	c #DCDAD8",
"l 	c #CACAC8",
"m 	c #B6B6B4",
"n 	c #72706C",
"o 	c #BCBCBB",
"p 	c #BCBBBA",
"q 	c #BBBAB9",
"r 	c #BABAB9",
"s 	c #B9B8B7",
"t 	c #B6B6B5",
"u 	c #B6B5B3",
"v 	c #E5E4E2",
"w 	c #C4C3C0",
"x 	c #817D74",
"y 	c #F7F6F5",
"z 	c #F6F6F4",
"A 	c #F5F4F3",
"B 	c #F4F3F2",
"C 	c #EBEAE8",
"D 	c #E1DFDC",
"E 	c #8B867D",
"F 	c #B9B9B8",
"G 	c #B8B8B6",
"H 	c #B7B7B6",
"I 	c #B5B5B3",
"J 	c #B4B3B2",
"K 	c #B3B3B2",
"L 	c #ADADAB",
"M 	c #A49E93",
"N 	c #F6F5F4",
"O 	c #F5F5F3",
"P 	c #F3F3F1",
"Q 	c #F2F2F0",
"R 	c #F1F1EF",
"S 	c #F1F0EE",
"T 	c #EEEDEB",
"U 	c #ECEBE9",
"V 	c #E7E6E3",
"W 	c #E2E1DF",
"X 	c #E4E3E0",
"Y 	c #B8B7B6",
"Z 	c #B5B4B3",
"` 	c #B3B2B0",
" .	c #B0AFAD",
"..	c #ADADAA",
"+.	c #ADACAA",
"@.	c #E2E1DE",
"#.	c #F0F0EE",
"$.	c #EFEFED",
"%.	c #F0EFED",
"&.	c #EFEEEC",
"*.	c #E8E7E5",
"=.	c #E5E4E1",
"-.	c #B3B3B1",
";.	c #AFAEAC",
">.	c #E1E0DC",
",.	c #E0DFDB",
"'.	c #A19C90",
").	c #EDEDEB",
"!.	c #EDECEA",
"~.	c #E9E8E5",
"{.	c #E6E4E1",
"].	c #E3E2DE",
"^.	c #DFDEDA",
"/.	c #DEDDD9",
"(.	c #DDDCD8",
"_.	c #A19B90",
":.	c #B0B0AE",
"<.	c #AFADAB",
"[.	c #E4E2DF",
"}.	c #E2E1DD",
"|.	c #DCDBD7",
"1.	c #E6E5E2",
"2.	c #E5E4E0",
"3.	c #E4E3DF",
"4.	c #DBD9D5",
"5.	c #D9D7D3",
"6.	c #9F998D",
"7.	c #E3E2DF",
"8.	c #DDDBD7",
"9.	c #DCDAD6",
"0.	c #D8D6D2",
"a.	c #9E988D",
"b.	c #EDEDED",
"c.	c #E1E0DD",
"d.	c #E0DEDA",
"e.	c #D8D6D1",
"f.	c #D7D5D1",
"g.	c #9D978B",
"h.	c #D1D1D1",
"i.	c #E1DFDB",
"j.	c #DEDCD8",
"k.	c #D7D6D1",
"l.	c #D5D3CE",
"m.	c #9B958A",
"n.	c #999891",
"o.	c #A39E92",
"p.	c #A39D92",
"q.	c #A39D91",
"r.	c #A29C90",
"s.	c #A19B8F",
"t.	c #9D978C",
"u.	c #9B968A",
"v.	c #676359",
"                                                ",
"      . . . . . . . . . . . . . + @ #           ",
"    . $ % & & & & & & & & * = = - ; > ,         ",
"    . % & & & & & & & & & & = ' ) ! & ~ {       ",
"    . & & ] ] ] ] ] ] ] ] ] ] ^ / ( & _ : <     ",
"    . & & & & & [ } | } | 1 = 2 3 . . . . .     ",
"    . & & ] 4 5 6 7 8 7 8 9 9 0 a b c d e .     ",
"    . & [ } | 1 f = g = g h = i j k l m n .     ",
"    . & | 7 8 9 o p q p q r s t u u v w x .     ",
"    . & f = g h y z A z A B B B B C D D E .     ",
"    . & g p q r F s G s G H I J K L D D M .     ",
"    . & N O B B P Q R Q R S T U V W X D M .     ",
"    . & B Y H m I m u m u Z `  ...+.@.D M .     ",
"    . & B i Q #.$.S %.S %.&.U *.=.X @.D M .     ",
"    . & #.I I Z J -.-.-.-.`  .;.W >.>.,.'..     ",
"    . & ).!.U U U C ~.C ~.~.=.{.].^./.(._..     ",
"    . & C :.:. . . .;. .;.<.[.}.,.(.(.|._..     ",
"    . & V 1.1.1.=.{.2.{.2.3.}.,./.|.4.5.6..     ",
"    . * X 7.].[.3.}.].}.].>.>./.8.9.5.0.a..     ",
"    . b.c.D >.,.}.,.>.,.>.^.d.8.9.5.e.f.g..     ",
"    . h.i.d.^./.,./.d./.d.j.j.9.9.0.k.l.m..     ",
"    . n.o.M p.q.p.'.r.'.r.s._.6.6.t.t.u.v..     ",
"      . . . . . . . . . . . . . . . . . .       ",
"                                                "};