Commit Graph

69 Commits

Author SHA1 Message Date
Tobias Hunger
13b442f289 Git: ignore spaces in diff
Ignore spacing changes in diff (based on same setting as used to
ignore spacing in git blame).

Task-number: QTCREATORBUG-2526
2010-10-05 12:30:24 +02:00
Tobias Hunger
7a40a7bb0e Git: Do not require the path to be set in the config
Fix regression where creator was no longer able to run git if the
PATH was not explicitly set in the configuration.

Task-number: QTCREATORBUG-2478
Reviewed-by: Robert Loehning
2010-09-28 13:50:10 +02:00
Friedemann Kleint
56e800927e VCS[git]: Environment settings.
Make GitClient::synchronousGit use the process environment.

Windows: Add a setting to fake a 'HOME' environment variable
(%HOMEDRIVE%%HOMEPATH%) to make msysgit look for its SSH-keys
there not only when run from git bash, but also from Qt Creator.
Useful in MinGw-setups, where git must not be in the path.
2010-08-26 13:45:01 +02:00
Friedemann Kleint
6793f1f962 VCS[git]: Add arguments setting for gitk, add to locator.
Task-number: QTCREATORBUG-1577
2010-06-16 09:05:50 +02:00
Friedemann Kleint
bcd020f382 VCS[git]: Introduce optional pull --rebase.
Do 'git rebase --abort' if something fails.
2010-03-19 16:07:34 +01:00
Friedemann Kleint
edf3437644 VCS/git: Add setting for diff --patience and make it default. 2010-03-10 11:19:59 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
214679d65b Git: Improve Timeouts.
- Observe timeout setting when running synchronous commands.
- Increase Default on Windows
- Stop process with terminate first (signal).
Task-number: QTCREATORBUG-777
2010-02-26 17:43:37 +01:00
Friedemann Kleint
c55b5b7b31 Git/SVN: Ignore whitespace in annotation/blame (introduce setting).
Defaulting to true.

Task-number: QTCREATORBUG-502
2010-01-05 15:45:41 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Friedemann Kleint
41a9395d21 Optionally shorten git blame output by removing date+line number. 2009-07-15 15:18:03 +02:00
Friedemann Kleint
2508fa03a0 Make the "prompt to submit" setting a per-plugin one.
Provide a checkable message box to be able to turn
prompting off when asked.
2009-06-19 16:34:38 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Friedemann Kleint
90b094e832 Make the git plugin look for the binary in the path specified in the settings. Previously, the environment was passed to the process, but that did not affect the location of the binary. 2009-02-19 17:47:44 +01:00
lowinu
b6c15d1ba9 Fixes: add timeout value to git plugin
RevBy:    tba
Details:  - as on windows some git commands take much longer it happens fairly often, that git timeouts.
          - added a timeout value to the option to let the user choose maximum timeout value (minimum is 10 seconds, maximum 5 minutes)
2009-02-13 14:09:48 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Friedemann Kleint
d63c68f39a Fixes: Refactor git settings code, add some more menu options 2008-12-04 11:23:03 +01:00