Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Corrected merge conflict navigation |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
800cc3cd25a3cce4f9061064d5f2ac15 |
| User & Date: | peter 2012-02-19 20:03:55.216 |
Context
|
2012-02-19
| ||
| 21:58 | Handle files with -review under Fossil correctly. check-in: eb8cfe7274 user: peter tags: trunk | |
| 20:03 | Corrected merge conflict navigation check-in: 800cc3cd25 user: peter tags: trunk | |
| 19:07 | Support regsub preprocessing controlled per side. check-in: f6d185bb23 user: peter tags: trunk | |
Changes
Changes to src/merge.tcl.
| ︙ | ︙ | |||
393 394 395 396 397 398 399 |
$w.m.ms add command -label "All Right" -command "selectMergeAll $top 2"
$w.m add cascade -label "Goto" -underline 0 -menu $w.m.mg
menu $w.m.mg
$w.m.mg add command -accelerator "Up" -label "Previous" -command "nextMerge $top -1"
$w.m.mg add command -accelerator "Down" -label "Next" -command "nextMerge $top 1"
if {$anyC} {
| | | < > | | < < | 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 |
$w.m.ms add command -label "All Right" -command "selectMergeAll $top 2"
$w.m add cascade -label "Goto" -underline 0 -menu $w.m.mg
menu $w.m.mg
$w.m.mg add command -accelerator "Up" -label "Previous" -command "nextMerge $top -1"
$w.m.mg add command -accelerator "Down" -label "Next" -command "nextMerge $top 1"
if {$anyC} {
$w.m.mg add command -accelerator "Ctrl-Up" -label "Previous Conflict" -command "nextMerge $top -1000"
$w.m.mg add command -accelerator "Ctrl-Down" -label "Next Conflict" -command "nextMerge $top 1000"
}
$w.m.mg add command -accelerator "Shift-Up" -label "Previous 10" -command "nextMerge $top -10"
$w.m.mg add command -accelerator "Shift-Down" -label "Next 10" -command "nextMerge $top 10"
$w.m add cascade -label "Config" -underline 0 -menu $w.m.mc
menu $w.m.mc
$w.m.mc add radiobutton -label "Line end LF" -value lf -variable ::eskil($top,mergetranslation)
$w.m.mc add radiobutton -label "Line end CRLF" -value crlf -variable ::eskil($top,mergetranslation)
if {$::eskil($top,mode) eq "conflict"} {
$w.m.mc add separator
|
| ︙ | ︙ | |||
437 438 439 440 441 442 443 444 445 446 447 448 449 450 |
ttk::button $w.f.b1 -text "Prev" -command "nextMerge $top -1"
ttk::button $w.f.b2 -text "Next" -command "nextMerge $top 1"
bind $w <Key-Down> "focus $w ; nextMerge $top 1"
bind $w <Key-Up> "focus $w ; nextMerge $top -1"
bind $w <Shift-Key-Down> "focus $w ; nextMerge $top 10"
bind $w <Shift-Key-Up> "focus $w ; nextMerge $top -10"
ttk::button $w.f.bs -text "Save" -command "saveMerge $top"
ttk::button $w.f.bq -text "Close" -command "closeMerge $top"
wm protocol $w WM_DELETE_WINDOW "closeMerge $top"
grid $w.f.rb1 $w.f.rb2 $w.f.rb3 $w.f.rb4 x $w.f.b1 $w.f.b2 x \
$w.f.bl $w.f.br x $w.f.bs $w.f.bq -sticky we -padx 1
| > > | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 |
ttk::button $w.f.b1 -text "Prev" -command "nextMerge $top -1"
ttk::button $w.f.b2 -text "Next" -command "nextMerge $top 1"
bind $w <Key-Down> "focus $w ; nextMerge $top 1"
bind $w <Key-Up> "focus $w ; nextMerge $top -1"
bind $w <Shift-Key-Down> "focus $w ; nextMerge $top 10"
bind $w <Shift-Key-Up> "focus $w ; nextMerge $top -10"
bind $w <Control-Key-Down> "focus $w ; nextMerge $top 1000"
bind $w <Control-Key-Up> "focus $w ; nextMerge $top -1000"
ttk::button $w.f.bs -text "Save" -command "saveMerge $top"
ttk::button $w.f.bq -text "Close" -command "closeMerge $top"
wm protocol $w WM_DELETE_WINDOW "closeMerge $top"
grid $w.f.rb1 $w.f.rb2 $w.f.rb3 $w.f.rb4 x $w.f.b1 $w.f.b2 x \
$w.f.bl $w.f.br x $w.f.bs $w.f.bq -sticky we -padx 1
|
| ︙ | ︙ |