view etc/images/new.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.

/* XPM */
static char * new_xpm[] = {
"24 24 127 2",
"  	c None",
". 	c #000000",
"+ 	c #D3D3D3",
"@ 	c #F6F6F6",
"# 	c #FFFFFF",
"$ 	c #F9F9F9",
"% 	c #DADADA",
"& 	c #585858",
"* 	c #C7C7C7",
"= 	c #D1D1D1",
"- 	c #D6D6D6",
"; 	c #FEFEFE",
"> 	c #FDFDFD",
", 	c #C0C0C0",
"' 	c #E1E1E1",
") 	c #F0F0F0",
"! 	c #9B9B9B",
"~ 	c #FCFCFB",
"{ 	c #FBFBFB",
"] 	c #AFAFAE",
"^ 	c #E9E9E9",
"/ 	c #DFDFDF",
"( 	c #8F8F8F",
"_ 	c #FAFAF9",
": 	c #F9F9F8",
"< 	c #A4A4A3",
"[ 	c #F4F4F4",
"} 	c #CFCFCF",
"| 	c #A2A2A2",
"1 	c #F8F8F7",
"2 	c #F8F7F6",
"3 	c #9E9E9E",
"4 	c #F7F6F5",
"5 	c #F6F6F4",
"6 	c #F4F3F2",
"7 	c #DEDDDC",
"8 	c #D3D2D0",
"9 	c #B7B7B5",
"0 	c #9F9E9D",
"a 	c #706F6F",
"b 	c #65625A",
"c 	c #F5F4F3",
"d 	c #F2F2F0",
"e 	c #E4E4E2",
"f 	c #DAD9D7",
"g 	c #D8D8D6",
"h 	c #CDCCCA",
"i 	c #AFAEAC",
"j 	c #88847B",
"k 	c #F3F3F1",
"l 	c #EFEFED",
"m 	c #EEEDEB",
"n 	c #EDECEA",
"o 	c #E9E8E6",
"p 	c #D5D4D3",
"q 	c #C4C3C2",
"r 	c #8F8A81",
"s 	c #F6F5F4",
"t 	c #F5F5F3",
"u 	c #F1F1EF",
"v 	c #F1F0EE",
"w 	c #ECEBE9",
"x 	c #EAE9E7",
"y 	c #E5E4E2",
"z 	c #E4E3E0",
"A 	c #D2D1CE",
"B 	c #8D887E",
"C 	c #F3F2F1",
"D 	c #F0F0EE",
"E 	c #F0EFED",
"F 	c #EFEEEC",
"G 	c #E8E7E5",
"H 	c #E5E4E1",
"I 	c #E2E1DE",
"J 	c #E1DFDC",
"K 	c #979288",
"L 	c #A49E93",
"M 	c #E8E7E4",
"N 	c #E7E6E3",
"O 	c #E3E2DF",
"P 	c #E2E0DD",
"Q 	c #E1E0DC",
"R 	c #E0DFDB",
"S 	c #A19C90",
"T 	c #EDEDEB",
"U 	c #EBEAE8",
"V 	c #E9E8E5",
"W 	c #E6E4E1",
"X 	c #E3E2DE",
"Y 	c #DFDEDA",
"Z 	c #DEDDD9",
"` 	c #DDDCD8",
" .	c #A19B90",
"..	c #E7E5E2",
"+.	c #E4E3DF",
"@.	c #DCDBD7",
"#.	c #E6E5E2",
"$.	c #E5E4E0",
"%.	c #E2E1DD",
"&.	c #DBD9D5",
"*.	c #D9D7D3",
"=.	c #9F998D",
"-.	c #E4E2DF",
";.	c #DDDBD7",
">.	c #DCDAD6",
",.	c #D8D6D2",
"'.	c #9E988D",
").	c #EDEDED",
"!.	c #E1E0DD",
"~.	c #E0DEDA",
"{.	c #D8D6D1",
"].	c #D7D5D1",
"^.	c #9D978B",
"/.	c #E1DFDB",
"(.	c #DEDCD8",
"_.	c #D7D6D1",
":.	c #D5D3CE",
"<.	c #9B958A",
"[.	c #999891",
"}.	c #A39E92",
"|.	c #A39D92",
"1.	c #A39D91",
"2.	c #A29C90",
"3.	c #A19B8F",
"4.	c #9D978C",
"5.	c #9B968A",
"6.	c #676359",
"                                                ",
"      . . . . . . . . . . . . .                 ",
"    . + @ # # # # # # # # $ % & .               ",
"    . @ # # # # # # # # # # * = - .             ",
"    . # # # # # # # ; # ; > , ' ) ! .           ",
"    . # # # # # ; > ~ > ~ { ] ^ # / ( .         ",
"    . # # # ; > ~ { _ { _ : < ) # [ } | .       ",
"    . # ; > ~ { _ : 1 : 1 2 3 . . . . . . .     ",
"    . # ~ { _ : 1 2 4 2 4 5 6 7 8 9 0 a b .     ",
"    . # _ : 1 2 4 5 c 5 c 6 d e f g h i j .     ",
"    . # 1 2 4 5 c 6 k 6 k d l m n o p q r .     ",
"    . # s t 6 6 k d u d u v m w x y z A B .     ",
"    . # 6 C d D l v E v E F w G H z I J K .     ",
"    . # 6 C d D l v E v E F w G H z I J L .     ",
"    . # D l l F m n n n n w M N O P Q R S .     ",
"    . # T n w w w U V U V V H W X Y Z `  ..     ",
"    . # U o o G M M N M N ..+.X R Z ` @. ..     ",
"    . # N #.#.#.H W $.W $.+.%.R Z @.&.*.=..     ",
"    . $ z O X -.+.%.X %.X Q Q Z ;.>.*.,.'..     ",
"    . ).!.J Q R %.R Q R Q Y ~.;.>.*.{.].^..     ",
"    . = /.~.Y Z R Z ~.Z ~.(.(.>.>.,._.:.<..     ",
"    . [.}.L |.1.|.S 2.S 2.3. .=.=.4.4.5.6..     ",
"      . . . . . . . . . . . . . . . . . .       ",
"                                                "};