Commits on Jul 30, 2007
  1. git-gui: Minor refactoring of merge command line in merge support

    spearce committed Jul 30, 2007
    This is just a small code movement to cleanup how we generate
    the command line for a merge.  I'm only doing it to make the
    next series of changes slightly more readable.
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Use more modern looking icons in the tree browser

    spearce committed Jul 30, 2007
    This is a replacement of all of the icons in our tree browser
    window, as the prior icons just looked too 1980s Tk-ish.  The
    icons used here are actually from a KDE themed look, so they
    might actually be familiar to some users of git-gui.
    Aside from using more modern looking icons we now have a special
    icon for executable blobs, to make them stand out from the normal
    non-executable blobs.  We also denote symlinks now with a different
    icon, so they stand out from the other types of objects in the tree.
    Signed-off-by: Shawn O. Pearce <>
  3. git-gui: Don't offer to stage hunks from untracked files

    spearce committed Jul 30, 2007
    If the user looks at an untracked file in our diff pane we used
    to offer "Stage Hunk For Commit" in the context menu when they
    right-clicked in that pane.  The problem is we don't actually
    have any diff hunks in untracked files, so there is nothing to
    really select for staging.  So we now grey out the menu item,
    so the user cannot invoke it and think its broken when it does
    not perform any useful action.
    Signed-off-by: Shawn O. Pearce <>
  4. git-gui: Make sure remotes are loaded when picking revisions

    spearce committed Jul 30, 2007
    If we are started for only a blame/browser/citool run we don't
    usually initialize the list of remotes, or determine which refs
    are tracking branches and which are local branch heads.  This is
    because some of that work is relatively expensive and is usually
    not going to be needed if we are started only for a blame, or to
    make a single commit.
    However by not loading the remote configuration we were crashing
    if the user tried to open a browser for another branch through
    the Repository menu, as our load_all_heads procedure was unable
    to decide which refs/heads/ items were actually local heads.  We
    now force all remote configuration data to be loaded if we have
    not done so already and we are trying to create a revision mega
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 29, 2007
  1. git-gui: Use progress bar while resetting/aborting files

    spearce committed Jul 29, 2007
    Resetting a large number of files on a slow filesystem can take
    considerable time, just as switching branches in such a case can
    take more than two seconds.  We now take advantage of the progress
    meter output by read-tree and show it in the main window status
    bar, just like we do during checkout (branch switch).
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Honor core.excludesfile when listing extra files

    spearce committed Jul 29, 2007
    Recent git versions have a git-status that honors the core.excludesfile
    configuration option when it reports on untracked files.  Unfortunately
    I missed the introduction of this configuration option in the core
    porcelain implementation, so it was not reflected here in git-gui.
    Found and reported by Lars Noschinski <>.
    Signed-off-by: Shawn O. Pearce <>
  3. git-gui: Unify wording to say "to stage" instead of "to add"

    cstim committed with spearce Jul 28, 2007
    Also, the warning message when clicking "Reset" is adapted to
    the wording "Reset" rather than a confusion "Cancel commit?".
    Signed-off-by: Christian Stimming <>
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 27, 2007
  1. git-gui: Don't kill modified commit message buffer with merge templates

    spearce committed Jul 27, 2007
    If the user is in the middle of a merge and has already started to
    modify their commit message we were losing the user's changes when
    they pressed 'Rescan' after resolving issues or making changes in
    the working directory.
    The problem here was our background timer that saves the commit
    message buffer.  It marks the commit message buffer as not being
    modified when it writes it out to disk, so during the rescan we
    assumed the buffer should be replaced with what we read from the
    MERGE_MSG file.  So we now only read these files from .git if we
    have a valid backup file.  Since we clear it on commit this will
    only have an impact while the user is actively editing the current
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 25, 2007
  1. git-gui: Remove usernames from absolute SSH urls during merging

    spearce committed Jul 25, 2007
    If we are being asked to merge a tracking branch that comes from a
    remote repository accessed by the very common SSH URL format of
    "user@host:/path/to/repo" then we really don't need the username
    as part of the merge message, it only clutters up the history and
    makes things more confusing.  So we instead clip the username part
    off if the local filesystem path is absolute, as its probably not
    going to be an ambiguous URL even when it is missing the username.
    On the other hand we cannot clip the username off if the URL is
    not absolute, because in such cases (e.g. "user@host:myrepo") the
    directory that the repository path is resolved in is relative to
    the user's home directory, and the username becomes important.
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Format tracking branch merges as though they were pulls

    spearce committed Jul 25, 2007
    If we are merging a tracking branch we know exactly what remote URL
    that branch is fetched from, and what its name is on that remote
    repository.  In this case we can setup a merge message that looks
    just like a standard `git-pull $remote $branch` operation by filling
    out FETCH_HEAD before we start git-merge, and then run git-merge just
    like git-pull does.
    I think the result of this behavior is that merges look a lot nicer
    when the came off of local tracking branches, because they no longer
    say "commit 'origin/...'" to describe the commit being merged but
    instead now mention the specific repository we fetched those commits
    Signed-off-by: Shawn O. Pearce <>
  3. git-gui: Cleanup bindings within merge dialog

    spearce committed Jul 25, 2007
    Misc. code cleanups in the merge dialog's binding setup and action
    button creation.
    Signed-off-by: Shawn O. Pearce <>
  4. git-gui: Replace merge dialog with our revision picker widget

    spearce committed Jul 25, 2007
    Now that we only support merging one branch we can offer the user
    a better user interface experience by allowing them to select the
    revision they want to merge through our revision picking widget.
    This change neatly solves the problem of locating a branch out of
    a sea of 200 tracking branches, and of dealing with very long branch
    names that all have a common prefix.
    Signed-off-by: Shawn O. Pearce <>
  5. git-gui: Show ref last update times in revision chooser tooltips

    spearce committed Jul 25, 2007
    If we can we now show the last modification date of a loose ref as
    part of the tooltip information shown in the revision picker.  This
    gives the user an indication of when was the last time that the ref
    was modified locally, and may especially be of interest when looking
    at a tracking branch.
    If we cannot find the loose ref file than we try to fallback on the
    reflog and scan it for the date of the last record.  We don't start
    with the reflog however as scanning it backwards from the end is not
    an easy thing to do in Tcl.  So I'm being lazy here and just going
    through the entire file, line by line.  Since that is less efficient
    than a single stat system call, its our fallback strategy.
    Signed-off-by: Shawn O. Pearce <>
  6. git-gui: Display commit/tag/remote info in tooltip of revision picker

    spearce committed Jul 25, 2007
    Our revision chooser mega-widget now sets up tooltips for itself so
    that it displays details about a commit (or a tag and the commit
    it refers to) when the user mouses over that line in the filtered
    ref list.  If the item is from a remote tracking branch then we also
    show the remote url and what branch on that remote we fetch from, so
    the user has a clear concept of where that revision data originated.
    To help the merge dialog I've also added a new constructor that
    makes the dialog only offer unmerged revisions (those not in HEAD),
    as this allows users to avoid performing merges only to get "Already
    up to date" messages back from core Git.
    Signed-off-by: Shawn O. Pearce <>
  7. git-gui: Save remote urls obtained from config/remotes setup

    spearce committed Jul 25, 2007
    I'm storing the URLs of any pre-configured remote repositories
    that we happen to come across so that we can later use these
    URLs to show to the user in parts of the UI that might care.
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 23, 2007
  1. git-gui: Avoid unnecessary symbolic-ref call during checkout

    spearce committed Jul 22, 2007
    If we are checking out the branch we are already on then there is no
    need to call symbolic-ref to update the HEAD pointer to the "new"
    branch name, it is already correct.
    Currently this situation does not happen very often, but it can be
    seen in some workflows where the user always recreates their local
    branch from a remote tracking branch and more-or-less ignores what
    branch he/she is on right now.  As they say, ignorance is bliss.
    This case will however become a tad more common when we overload
    checkout_op to actually also perform all of our merges.  In that
    case we will likely see that the branch we want to "checkout" is
    the current branch, as we are actually just merging into it.
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Refactor current branch menu items to make i18n easier

    spearce committed Jul 23, 2007
    The i18n team has also identified a rather ugly block of code in
    git-gui that is used to make a pair of Repository menu items show
    the current branch name.  This code is difficult to convert to use
    [mc ...] to lookup the translation, so I'm refactoring it into a
    Signed-off-by: Shawn O. Pearce <>
  3. git-gui: Refactor diff popup into a procedure to ease i18n work

    spearce committed Jul 23, 2007
    The folks working on the i18n version of git-gui have had some
    trouble trying to convert these English strings into [mc] calls
    due to the double evaluation.  Moving this block into a standard
    procedure eliminates the double evaluation, making their work
    Signed-off-by: Shawn O. Pearce <>
  4. git-gui: Paper bag fix quitting crash after commit

    spearce committed Jul 23, 2007
    My earlier introduction of the GITGUI_BCK file (which saves the user's
    commit message buffer while they are typing it) broke the Quit function.
    If the user makes a commit we delete the GITGUI_BCK file; if they then
    immediately quit the application we fail to rename the GITGUI_BCK file
    to GITGUI_MSG.  This is because the file does not exist, but our flag
    still says it does.  The root cause is we did not unset the flag during
    Signed-off-by: Shawn O. Pearce <>
  5. git-gui: Clarify meaning of add tracked menu option

    spearce committed Jul 23, 2007
    Junio recently pointed out on the mailing list that our "Add Existing"
    feature is a lot like `git add -u`, which is generally described as
    "(Re)Add Tracked Files".  This came up during discussion of how to
    translate "Add Existing" into Japanese, as the individual working on
    the translation was not quite sure what the option meant and therefore
    had some trouble selecting the best translation.
    I'm changing the menu option to "Add Tracked Files To Commit" and the
    button to "Add Tracked".  This should help new users to better understand
    the actions behind those GUI widgets.
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 22, 2007
  1. git-gui: Fix unnecessary fast-forward during checkout

    spearce committed Jul 22, 2007
    If we are trying to checkout a local branch which is matched to a
    remote tracking branch, but the local branch is newer than the remote
    tracking branch we actually just want to switch to the local branch.
    The local branch is "Already up to date".
    Unfortunately we tossed away the local branch's commit SHA-1 and kept
    the remote tracking branch's SHA-1, which meant that the user lost the
    local changes when we updated the working directory.  At least we did
    not update the local branch ref, so the user's data was still intact.
    We now toss the tracking branch's SHA-1 and replace with the local
    branch's SHA-1 before the checkout, ensuring that we pass of the right
    tree to git-read-tree when we update the working directory.
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Completely remove my Tools/Migrate hack

    spearce committed Jul 21, 2007
    This menu option of Tools/Migrate has been living inside of git-gui
    as a local hack to support some coworkers of mine.  It has no value
    to anyone outside of my day-job team and never really should have
    been in a release version of git-gui.  So I'm pulling it out, so
    that nobody else has to deal with this garbage.
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 21, 2007
  1. git-gui: Internally allow fetch without storing for future pull support

    spearce committed Jul 20, 2007
    This is actually just an underlying code improvement that has no user
    visible component yet.  UI improvements to actually fetch and merge via
    an arbitrary remote with no tracking branches must still follow to make
    this change useful for the end-user.
    Our tracking branch specifications are a Tcl list of three components:
      - local tracking branch name
      - remote name/url
      - remote branch name/tag name
    This change just makes the first element optional.  If it is an empty
    string we will run the fetch, but have the value be saved only into the
    special .git/FETCH_HEAD, where we can pick it up and use it for this one
    time operation.
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Skip unnecessary read-tree work during checkout

    spearce committed Jul 20, 2007
    I totally missed this obvious optimization in the checkout code path.
    If our current repository HEAD is actually at the commit we are moving
    to, and we agreed to perform this switch earlier, then we have no files
    to update in the working directory and any stale mtimes are simply not
    of consequence right now.  We can pretend like we ran a read-tree and
    skip right into the post-read-tree work, such as updating the branch
    and setting the symbolic-ref.
    Signed-off-by: Shawn O. Pearce <>
  3. git-gui: Simplify error case for unsupported merge types

    spearce committed Jul 20, 2007
    If we are given a merge type we don't understand in checkout_op there
    is probably a bug in git-gui somewhere that allowed this unknown merge
    strategy to come into this part of the code path.  We currently only
    recognize three merge types ('none', 'ff' and 'reset') but are going
    to be supporting more in the future.  Rather than keep editing this
    message I'm going with a very generic "Uh, we don't do that!" type of
    Signed-off-by: Shawn O. Pearce <>
  4. git-gui: Factor out common fast-forward merge case

    spearce committed Jul 20, 2007
    In both the ff and reset merge_types supported by checkout_op the
    result is the same if the merge base of our target commit and the
    existing commit is the existing commit: its a fast-forward as the
    existing commit is fully contained in the target commit.
    This minor cleanup in logic will make it easier to implement a
    new kind of merge_type that actually merges the two trees with a
    real merge strategy, such as git-merge-recursive.
    Signed-off-by: Shawn O. Pearce <>
  5. git-gui: Save the merge base during checkout_op processing

    spearce committed Jul 20, 2007
    I've decided to teach checkout_op how to perform more than just a
    fast-forward and reset type of merge.  This way we can also do a full
    recursive merge even when we are recreating an existing branch from
    a remote.  To help with that process I'm saving the merge-base we
    computed during the ff/reset/fail decision process, in case we need
    it later on when we actually start a true merge operation.
    Signed-off-by: Shawn O. Pearce <>
  6. git-gui: Automatically backup the user's commit buffer

    spearce committed Jul 21, 2007
    A few users have been seeing crashes in Tk when using the undo key
    binding to undo the last few keystroke events in the commit buffer.
    Unfortunately that means the user loses their commit message and
    must start over from scratch when the user restarts the process.
    git-gui now saves the user's commit message buffer every couple of
    seconds to a temporary file under .git (specifically .git/GITGUI_BCK).
    At exit time we rename this file to .git/GITGUI_MSG if there is a
    message, the file exists, and it is currently synchronized with the
    Tk buffer.  Otherwise we do our usual routine of saving the Tk buffer
    to .git/GITGUI_MSG and delete .git/GITGUI_BCK, if it exists.
    During startup we favor .git/GITGUI_BCK over .git/GITGUI_MSG.  This
    way a crash doesn't take out the user's message buffer but instead
    will cause the user to lose only a few keystrokes.  Most people do
    not type more than 200 WPM, and with 30 possible saves per minute
    we are unlikely to lose more than 7 words.
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 19, 2007
  1. git-gui: Completely remove support for creating octopus merges

    spearce committed Jul 19, 2007
    I'm working on refactoring the UI of the merge dialog, because as it
    currently stands the dialog is absolutely horrible, especially when
    you have 200+ branches available from a single remote system.
    In that refactoring I plan on using the choose_rev widget to allow
    the user to select exactly which branch/commit they want to merge.
    However since that only selects a single commit I'm first removing
    the code that supports octopus merges.
    A brief consultation on #git tonight seemed to indicate that the
    octopus merge strategy is not as useful as originally thought when
    it was invented, and that most people don't commonly use them.  So
    making users fall back to the command line to create an octopus is
    actually maybe a good idea here, as they might think twice before
    they use it.
    Signed-off-by: Shawn O. Pearce <>
  2. git-gui: Don't show blame tooltips that we have no data for

    spearce committed Jul 19, 2007
    If we haven't yet loaded any commit information for a given line but
    our tooltip timer fired and tried to draw the tooltip we shouldn't;
    there is nothing to show.
    Signed-off-by: Shawn O. Pearce <>
  3. git-gui: Translate standard encoding names to Tcl ones

    spearce committed Jul 19, 2007
    This is a essentially a copy of Paul Mackerras encoding support from
    gitk.  I stole the code from gitk commit fd8ccbe, as Paul has
    already done all of the hard work setting up this translation table.
    Signed-off-by: Shawn O. Pearce <>
  4. git-gui: Avoid unnecessary global statements when possible

    spearce committed Jul 19, 2007
    Running global takes slightly longer than just accessing the variable
    via its package name, especially if the variable is just only once in
    the procedure, or isn't even used at all in the procedure.  So this is
    a minor cleanup for some of our commonly invoked procedures.
    Signed-off-by: Shawn O. Pearce <>
  5. git-gui: Bind Ctrl/Cmd-M to merge action

    spearce committed Jul 19, 2007
    Users who merge often may want to access the merge action quickly,
    so we now bind M to the merge action.
    Signed-off-by: Shawn O. Pearce <>
  6. Don't offer my special Tools/Migrate hack unless in multicommit

    spearce committed Jul 18, 2007
    Users shouldn't see this menu option if they startup a browser or
    blame from the command line, especially if they are doing so on a
    bare repository.
    Signed-off-by: Shawn O. Pearce <>
Commits on Jul 18, 2007
  1. git-gui: Convert merge dialog to use class system

    spearce committed Jul 18, 2007
    I've found that the class code makes it a whole lot easier to create
    more complex GUI code, especially the dialogs.  So before I make any
    major improvements to the merge dialog's interface I'm going to first
    switch it to use the class system, so the code is slightly cleaner.
    Signed-off-by: Shawn O. Pearce <>