user/sven/git.git/lib/commit.tcl, branch gitgui-0.12.0

git-gui: Fix commit encoding handling.

2008-12-08T16:33:05Z

Commits without an encoding header are supposed to be encoded in utf8. While this apparently hasn't always been the case, currently it is the active convention, so it is better to follow it; otherwise people who have to use commitEncoding on their machines are unable to read utf-8 commits made by others. I also think that it is preferrable to display the warning about an unsupported value of commitEncoding more prominently, because this condition may lead to surprising behavior and, eventually, to loss of data. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Add more integration options to citool.

2008-09-24T16:53:01Z

- Make citool return nonzero exit code if it did not commit. - Add a mode where it does not actually commit and simply exits with zero code. Commit message is either disabled, or simply dumped to GITGUI_EDITMSG before exiting. - Add an option to immediately start it in amend mode. Rationale: 1) Use 'git citool --nocommit' instead of mergetool in scripts. 2) Use 'git citool --amend' to edit commits while rebasing. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Support conflict states _U & UT.

2008-09-05T04:28:55Z

Support _U (local deleted, remote modified) and UT (file type changed in conflict) modes. Note that 'file type changed' does not refer to changes in the executable bit, instead it denotes replacing a file with a link, or vice versa. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Teach git gui about file type changes

2008-08-25T04:36:17Z

Signed-off-by: Gustaf Hendeby Signed-off-by: Shawn O. Pearce

git-gui: (i18n) Fix a bunch of still untranslated strings.

2008-02-04T02:25:29Z

Signed-off-by: Christian Stimming Signed-off-by: Shawn O. Pearce

git-gui: Consolidate hook execution code into a single function

2008-01-21T03:45:38Z

The code we use to test if a hook is executable or not differs on Cygwin from the normal POSIX case. Rather then repeating that for all three hooks we call in our commit code path we can place the common logic into a global procedure and invoke it when necessary. This also lets us get rid of the ugly "|& cat" we were using before as we can now rely on the Tcl 8.4 feature of "2>@1" or fallback to the "|& cat" when necessary. The post-commit hook is now run through the same API, but its outcome does not influence the commit status. As a result we now show any of the errors from the post-commit hook in a dialog window, instead of on the user's tty that was used to launch git-gui. This resolves a long standing bug related to not getting errors out of the post-commit hook when launched under git-gui. Signed-off-by: Shawn O. Pearce

git-gui: Honor the standard commit-msg hook

2008-01-21T03:45:37Z

Under core Git the git-commit tool will invoke the commit-msg hook if it exists and is executable to the user running git-commit. As a hook it has some limited value as it cannot alter the commit, but it can modify the message the user is attempting to commit. It is also able to examine the message to ensure it conforms to some local standards/conventions. Since the hook takes the name of a temporary file holding the message as its only parameter we need to move the code that creates the temp file up earlier in our commit code path, and then pass through that file name to the latest stage (where we call git-commit-tree). We let the hook alter the file as it sees fit and we don't bother to look at its content again until the commit succeeded and we need the subject for the reflog update. Signed-off-by: Shawn O. Pearce

git-gui: Make commit log messages end with a newline

2007-12-30T02:03:55Z

Concatenating commit log messages from multiple commits works better when all of the commits end with a clean line break. Its good to be strict in what you create, and lenient in what you accept, and since we're creating here, we should always try to Do The Right Thing(tm). Signed-off-by: Bernt Hansen Signed-off-by: Shawn O. Pearce

git-gui: fix a typo in lib/commit.tcl

2007-11-22T21:02:09Z

Signed-off-by: Michele Ballabio Signed-off-by: Shawn O. Pearce

Merge branch 'maint'

2007-10-21T00:43:36Z

* maint: git-gui: Don't display CR within console windows git-gui: Handle progress bars from newer gits git-gui: Correctly report failures from git-write-tree Conflicts: lib/commit.tcl lib/console.tcl