@matheusbsbs / matheus-bagliano / commits / 390adaeafb
Fork 0

git-gui: Misc. formatting cleanups.

A number of lines were line wrapping in a rather ugly way when opened in vim with line numbers enabled, so I split most of these lines over two lines using a sensible wrapping policy. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Nov 11, 2006 at 19:40 UTC 390adaeafbefc49a88d06c3a2ad68bc00fe0c614
1 file changed +16 -11
git-gui
+16 -11
@@ -197,7 +197,8 @@ proc update_status {{final Ready.}} {
197 set ui_status_value {Refreshing file status...}
198 set fd_rf [open "| git update-index -q --unmerged --refresh" r]
199 fconfigure $fd_rf -blocking 0 -translation binary
200 - fileevent $fd_rf readable [list update_status_stage2 $fd_rf $final]
200 + fileevent $fd_rf readable \
201 + [list update_status_stage2 $fd_rf $final]
202 }
203 }
204
@@ -402,8 +403,6 @@ proc show_diff {path {w {}} {lno {}}} {
403
404 set cmd [list | git diff-index -p $PARENT -- $path]
405 switch $m {
405 - AM {
406 - }
406 MM {
407 set cmd [list | git diff-index -p -c $PARENT $path]
408 }
@@ -828,7 +827,8 @@ proc post_pull_remote {remote branch success} {
827 set PARENT $HEAD
828 set $ui_status_value {Ready.}
829 } else {
831 - update_status "Conflicts detected while pulling $branch from $remote."
830 + update_status \
831 + "Conflicts detected while pulling $branch from $remote."
832 }
833 }
834
@@ -1548,7 +1548,7 @@ set maincursor [. cget -cursor]
1548 switch -glob -- "$tcl_platform(platform),$tcl_platform(os)" {
1549 windows,* {set M1B Control; set M1T Ctrl}
1550 unix,Darwin {set M1B M1; set M1T Cmd}
1551 -default {set M1B M1; set M1T M1}
1551 +* {set M1B M1; set M1T M1}
1552 }
1553
1554 # -- Menu Bar
@@ -1720,19 +1720,22 @@ button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
1720 -command do_rescan \
1721 -font $font_ui
1722 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
1723 -lappend disable_on_lock {.vpane.lower.commarea.buttons.rescan conf -state}
1723 +lappend disable_on_lock \
1724 + {.vpane.lower.commarea.buttons.rescan conf -state}
1725
1726 button .vpane.lower.commarea.buttons.amend -text {Amend Last} \
1727 -command do_amend_last \
1728 -font $font_ui
1729 pack .vpane.lower.commarea.buttons.amend -side top -fill x
1729 -lappend disable_on_lock {.vpane.lower.commarea.buttons.amend conf -state}
1730 +lappend disable_on_lock \
1731 + {.vpane.lower.commarea.buttons.amend conf -state}
1732
1733 button .vpane.lower.commarea.buttons.incall -text {Include All} \
1734 -command do_include_all \
1735 -font $font_ui
1736 pack .vpane.lower.commarea.buttons.incall -side top -fill x
1735 -lappend disable_on_lock {.vpane.lower.commarea.buttons.incall conf -state}
1737 +lappend disable_on_lock \
1738 + {.vpane.lower.commarea.buttons.incall conf -state}
1739
1740 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
1741 -command do_signoff \
@@ -1743,7 +1746,8 @@ button .vpane.lower.commarea.buttons.commit -text {Commit} \
1746 -command do_commit \
1747 -font $font_ui
1748 pack .vpane.lower.commarea.buttons.commit -side top -fill x
1746 -lappend disable_on_lock {.vpane.lower.commarea.buttons.commit conf -state}
1749 +lappend disable_on_lock \
1750 + {.vpane.lower.commarea.buttons.commit conf -state}
1751
1752 # -- Commit Message Buffer
1753 frame .vpane.lower.commarea.buffer
@@ -1769,7 +1773,8 @@ text $ui_comm -background white -borderwidth 1 \
1773 -font $font_diff \
1774 -yscrollcommand {.vpane.lower.commarea.buffer.sby set} \
1775 -cursor $maincursor
1772 -scrollbar .vpane.lower.commarea.buffer.sby -command [list $ui_comm yview]
1776 +scrollbar .vpane.lower.commarea.buffer.sby \
1777 + -command [list $ui_comm yview]
1778 pack $ui_coml -side top -fill x
1779 pack .vpane.lower.commarea.buffer.sby -side right -fill y
1780 pack $ui_comm -side left -fill y
@@ -1848,8 +1853,8 @@ wm geometry . [lindex $gm 0]
1853 .vpane.files sash place 0 \
1854 [lindex $gm 2] \
1855 [lindex [.vpane.files sash coord 0] 1]
1851 -}
1856 unset gm
1857 +}
1858
1859 # -- Key Bindings
1860 bind $ui_comm <$M1B-Key-Return> {do_commit;break}