diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/git-gui/lib/branch_checkout.tcl | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/git-gui/lib/branch_checkout.tcl')
-rw-r--r-- | third_party/git/git-gui/lib/branch_checkout.tcl | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/third_party/git/git-gui/lib/branch_checkout.tcl b/third_party/git/git-gui/lib/branch_checkout.tcl deleted file mode 100644 index d06037decc1a..000000000000 --- a/third_party/git/git-gui/lib/branch_checkout.tcl +++ /dev/null @@ -1,93 +0,0 @@ -# git-gui branch checkout support -# Copyright (C) 2007 Shawn Pearce - -class branch_checkout { - -field w ; # widget path -field w_rev ; # mega-widget to pick the initial revision - -field opt_fetch 1; # refetch tracking branch if used? -field opt_detach 0; # force a detached head case? - -constructor dialog {} { - global use_ttk NS - make_dialog top w - wm withdraw $w - wm title $top [mc "%s (%s): Checkout Branch" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - ${NS}::label $w.header -text [mc "Checkout Branch"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.create -text [mc Checkout] \ - -default active \ - -command [cb _checkout] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - set w_rev [::choose_rev::new $w.rev [mc Revision]] - $w_rev bind_listbox <Double-Button-1> [cb _checkout] - pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 - - ${NS}::labelframe $w.options -text [mc Options] - - ${NS}::checkbutton $w.options.fetch \ - -text [mc "Fetch Tracking Branch"] \ - -variable @opt_fetch - pack $w.options.fetch -anchor nw - - ${NS}::checkbutton $w.options.detach \ - -text [mc "Detach From Local Branch"] \ - -variable @opt_detach - pack $w.options.detach -anchor nw - - pack $w.options -anchor nw -fill x -pady 5 -padx 5 - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _checkout]\;break - wm deiconify $w - tkwait window $w -} - -method _checkout {} { - set spec [$w_rev get_tracking_branch] - if {$spec ne {} && $opt_fetch} { - set new {} - } elseif {[catch {set new [$w_rev commit_or_die]}]} { - return - } - - if {$opt_detach} { - set ref {} - } else { - set ref [$w_rev get_local_branch] - } - - set co [::checkout_op::new [$w_rev get] $new $ref] - $co parent $w - $co enable_checkout 1 - if {$spec ne {} && $opt_fetch} { - $co enable_fetch $spec - } - - if {[$co run]} { - destroy $w - } else { - $w_rev focus_filter - } -} - -method _visible {} { - grab $w - $w_rev focus_filter -} - -} |