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
con
b8726d503f
Merge commit 'origin/1.0.0'
2009-02-13 15:56:18 +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
mae
522cf96b0e
activate diff editor after creating it
2009-02-04 19:10:36 +01:00
mae
ebcb9dce5a
separate EM::setCurrentEditor and EM::activateEditor
2009-01-26 16:36:02 +01:00
mae
145f9c24ba
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
...
Conflicts:
src/plugins/perforce/perforceplugin.cpp
2009-01-20 17:10:34 +01:00
hjk
897c05f57c
replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance()
2009-01-20 15:31:33 +01:00
hjk
f6b0820315
forgot this
2009-01-20 11:54:18 +01:00
mae
c0c5342386
first edition of the new editor view, splitting still missing
2009-01-16 17:34:34 +01:00
Daniel Molkentin
59affcfffc
Bump year in licence header.
2009-01-13 19:22:14 +01:00
Friedemann Kleint
e2ef36a65d
Fixes: Enable multiselection in file list of git submit editor
...
Details: Refactor the git command to be able to run a batch. Run diff and diff --cached in a batch
2009-01-13 17:25:09 +01:00
con
281c462d24
Fixes: - ProgressManagerInterface --> ProgressManager
...
Details: - Conform to conventions.
2009-01-13 15:44:26 +01:00
con
c9889120c3
Fixes: - Rename ActionManagerInterface --> ActionManager
...
Details: - To make it conform to naming convention.
2009-01-13 15:44:25 +01:00
Friedemann Kleint
4741a7282d
Fixes: Make git diff work for staged files, do not launch submit if file list empty, make file model read only, add conveniences
...
Details: Add a type data field to the git file model
2009-01-13 10:06:06 +01:00
Friedemann Kleint
17daca603a
Fixes: Use a model for the submit file list (to resolve the git diff mess)
2009-01-12 17:44:04 +01:00
Friedemann Kleint
05033a9d36
Fixes: Show untracked files in git submit dialog
...
Details: Move routine to get project file list into VCSBase, use it in p4 and git to filter submit lists.
2009-01-09 17:52:41 +01:00
Friedemann Kleint
defc270896
Fixes: Start a git branch dialog.
2008-12-19 17:42:08 +01:00
Friedemann Kleint
4db2f99836
Fixes: Add ensureStashed() method asking user to stash before a change such as pull
2008-12-19 11:45:30 +01:00
Friedemann Kleint
d6fbb1b573
Fixes: gcc 4.3.2 compile warnings
2008-12-19 10:49:29 +01:00
hjk
da3cb14483
chancge Nokia GPL exception version from 1.2 to 1.3
2008-12-16 17:20:00 +01:00
con
0722e95682
Fixes: - Don't popup the git output window at all operations
2008-12-10 15:22:45 +01:00
hjk
4a552ead9f
use QTC_ASSERT instead of Q_ASSERT
2008-12-09 15:25:01 +01:00
Friedemann Kleint
c149046b15
Fixes: Add revert to git, name stage options according to git gui
2008-12-04 15:35:16 +01:00
Friedemann Kleint
d63c68f39a
Fixes: Refactor git settings code, add some more menu options
2008-12-04 11:23:03 +01:00
Friedemann Kleint
d1ebbcb810
Fixes: git commit fails due to wrong working directory
...
Details: Execute git status from repo directory
2008-12-03 15:56:24 +01:00
Friedemann Kleint
0b99d82d4e
Fixes: Enable switching of VCS according to currentProject
...
Task: 205821
RevBy: con
Details: Add a IVersionControl to git. Extend IF to able to return a name and add enabling options. Connect project explorer to enable the right VCS.
2008-12-03 15:04:51 +01:00
Thorbjørn Lindeijer
b8ce2b1031
Disambiguation for files in git commands
...
With many git commands it is safer to disambiguate files from refs by
putting '--' in front of the list of files.
Also corrected a margin in the git submit panel.
2008-12-03 13:27:00 +01:00
Friedemann Kleint
5d316a4919
Fixes: Move icons into VCSBase, use buttons for submit
2008-12-02 17:05:53 +01:00
Friedemann Kleint
c4c2437dd4
Fixes: Ability to uncheck files in git.
2008-12-02 15:43:58 +01:00
hjk
df7aacd637
more file cosmetics
2008-12-02 15:08:31 +01:00
hjk
ab83dcd87c
off-by-one in headers
2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3
end-of-line whitespace correction of the new headers
2008-12-02 14:17:16 +01:00
con
05c35356ab
Initial import
2008-12-02 12:01:29 +01:00