author | Shawn O. Pearce <spearce@spearce.org> | |
Sun, 8 Jul 2007 22:40:56 +0000 (18:40 -0400) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 9 Jul 2007 02:34:46 +0000 (22:34 -0400) | ||
commit | d41b43eb4c73044d0fff2057211fc78e4e7b2094 | |
tree | ebab56d146f4cafef1b1adf740949403329f71ea | tree | snapshot |
parent | 699d5601f59938d62ec2506f319c25a656a403da | commit | diff |
git-gui: Refactor branch switch to support detached head
This is a major rewrite of the way we perform switching between
branches and the subsequent update of the working directory. Like
core Git we now use a single code path to perform all changes: our
new checkout_op class. We also use it for branch creation/update
as it integrates the tracking branch fetch process along with a
very basic merge (fast-forward and reset only currently).
Because some users have literally hundreds of local branches we
use the standard revision picker (with its branch filtering tool)
to select the local branch, rather than keeping all of the local
branches in the Branch menu. The branch menu listing out all of
the available branches is simply not sane for those types of huge
repositories.
Users can now checkout a detached head by ticking off the option
in the checkout dialog. This option is off by default for the
obvious reason, but it can be easily enabled for any local branch
by simply checking it. We also detach the head if any non local
branch was selected, or if a revision expression was entered.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This is a major rewrite of the way we perform switching between
branches and the subsequent update of the working directory. Like
core Git we now use a single code path to perform all changes: our
new checkout_op class. We also use it for branch creation/update
as it integrates the tracking branch fetch process along with a
very basic merge (fast-forward and reset only currently).
Because some users have literally hundreds of local branches we
use the standard revision picker (with its branch filtering tool)
to select the local branch, rather than keeping all of the local
branches in the Branch menu. The branch menu listing out all of
the available branches is simply not sane for those types of huge
repositories.
Users can now checkout a detached head by ticking off the option
in the checkout dialog. This option is off by default for the
obvious reason, but it can be easily enabled for any local branch
by simply checking it. We also detach the head if any non local
branch was selected, or if a revision expression was entered.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh | diff | blob | history | |
lib/branch.tcl | diff | blob | history | |
lib/branch_checkout.tcl | [new file with mode: 0644] | blob |
lib/branch_create.tcl | diff | blob | history | |
lib/branch_delete.tcl | diff | blob | history | |
lib/branch_rename.tcl | diff | blob | history | |
lib/checkout_op.tcl | [new file with mode: 0644] | blob |
lib/choose_rev.tcl | diff | blob | history | |
lib/commit.tcl | diff | blob | history | |
lib/console.tcl | diff | blob | history | |
lib/transport.tcl | diff | blob | history |