Commit Graph

259 Commits

Author SHA1 Message Date
Friedemann Kleint
7ce3683143 CVS: Use new VCSBasePlugin-class.
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
2009-12-09 12:41:10 +01:00
Friedemann Kleint
8097879d6d VCS: Introduce Base class for VCS plugins, use in git.
Fixes:
- Cannot diff a file that does not belong to a project
- Cannot commit when a temporary diff/log view is open
  due to the current file pointing to a temporary directory
- git's project-related actions not passing the correct
  relative path.

Implementation:
- Centralize code to listen for Qt Creator's relevant state changes
  in VCSBasePlugin, dispatching the changes to the instances affected.
  (avoiding multiple invocations of searches/QFileInfo on current).
- Do the same for the corelistener catching closing SubmitEditors.
- Introduce VCSBasePluginState representing the relevant state
  (current file/project).
- Call git with working directory set and relative arguments
- Remove setEnabled/isEnabled() logic of IVersionControl
- Pass toplevel from VCSManager to avoid duplicate searches.
2009-12-08 14:26:41 +01:00
Friedemann Kleint
8335a06ed4 Code model: Update on changes from the versioning system.
Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating. Improved version of reverted
7aa2411693.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2009-11-11 14:32:54 +01:00
con
e4b1a25dd2 Revert "Code model: Update on changes from the versioning system."
This reverts commit 7aa2411693.
It breaks the code model updates completely. So reverting this change
until we have the right thing.

Reviewed-by: Roberto Raggi
2009-11-10 18:19:37 +01:00
Friedemann Kleint
7aa2411693 Code model: Update on changes from the versioning system.
Add state logic to CppCodeModelManagerInterface, making it aware whether
an indexer is running, protect the update methods from another
invocation while running. Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: con <qtc-committer@nokia.com>
2009-11-09 15:57:56 +01:00
Friedemann Kleint
9d4aafebac VCS/git: Make blame go to current editor line
using queued slot/variant cookie magic in command
2009-10-01 17:50:24 +02:00
Friedemann Kleint
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
Friedemann Kleint
40f6f72a5d Git: Make commit work on Windows 2009-08-25 09:57:58 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
188dbc3a43 API naming.
Reviewed-by: hjk
2009-08-12 10:41:30 +02:00
Friedemann Kleint
1e64d9f9b2 Version control: Replace per-VCS output panes with a single one.
...and give it some color and formatting.
2009-08-10 15:46:45 +02:00
Friedemann Kleint
9e2f12c737 VCSBase: Add common functionality, make checkout use page lists.
Move GitClient::filterUntrackedFilesOfProject into submit editor.
Make checkout wizards use page lists for greater flexibility.
2009-07-21 11:14:48 +02:00
Friedemann Kleint
9f14b79cc6 Add a clone wizard for version control (base classes + git/svn).
Task-number: 244831
2009-07-17 17:19:23 +02:00
Friedemann Kleint
41a9395d21 Optionally shorten git blame output by removing date+line number. 2009-07-15 15:18:03 +02:00
dt
4637d56284 Don't ask to reload the file, if the user uses git/undo or git/revert.
Simply do it.

Task-Nr: 254558
2009-06-18 14:30:04 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Daniel Molkentin
5a6c636935 Run git on windows properly when git is called synchronously.
Reviewed-By: Friedemann Kleint
2009-06-15 14:04:14 +02:00
dt
8ef7ad0b62 Fix not beeing able to commit file deletions with creators git plugin
Reviewed-By: mauricek
2009-06-10 18:10:34 +02:00
Friedemann Kleint
e38250d81f Close write channels of git processes.
..in an attempt to suppress password prompts.
2009-05-28 12:27:04 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
Friedemann Kleint
3a5b6825a7 Report termination of git pull/push (which was missing feedback). 2009-04-09 10:05:53 +02:00
dt
3da6ca098c Kill the git process if we timed out waiting for it. 2009-04-07 12:04:43 +02:00
Friedemann Kleint
178fe102e8 Fixes: Suppress colors for git diff project, class names in widget template 2009-03-17 13:00:22 +01:00
Friedemann Kleint
465bf149d5 Fixes: Using a git configuration with colored output breaks much of the git plugin.
Task:     248067
Details:  Use --no-color where appropriate. Use a hack to remove color sequences from output for "status" since it does not support the option as of git 1.6.2.
2009-03-17 12:36:55 +01: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
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