Commit Graph

127 Commits

Author SHA1 Message Date
Friedemann Kleint
4105dc5f4b VCS[SVN]: svn add: Accommodate for older Mac-versions.
by adding directories in a loop. Introduce #ifdef for Macs in the hopes
that the code can be deprecated at some time.
2010-01-08 12:55:30 +01:00
Tobias Hunger
cacdc6c736 Add display name to VCS plugin structs
Reviewed-by: Friedemann Kleint
2010-01-08 11:51:53 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint
b4969672d3 VCS[Perforce/SVN/CVS]: Add "Annotate" to single file logs.
...over change numbers. Add missing "Log project/repository"
actions and log count limits.
Task-number: QTCREATORBUG-503
2010-01-07 11:33:30 +01:00
Friedemann Kleint
7c0f4e8f50 VCS[SVN, CVS, Perforce]: Implement "Annotate Previous" context menu.
in annotation editor, including base infrastructure in
VCSBaseEditor. Pass signals of VCSBaseEditor to opaque
VCSBaseEditable (IEditor) for convenience.

Task-number: QTCREATORBUG-503
2010-01-06 17:24:40 +01:00
Friedemann Kleint
ce684eb664 SVN: Pass "--parent" to "add" to automatically add directories. 2010-01-06 10:57:07 +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
Friedemann Kleint
730fd82ac8 VCS: Add "Open file" context menu action to VCS log pane
to be used for status/opened output. enabling convenient opening.
Append repository as block data to log text to be able to resolve
relative paths.
2009-12-15 14:20:06 +01:00
Friedemann Kleint
dde46ec1eb VCS: Introduce configureable timeout to vcs,svn, p4.
as already present for git, mercurial.

Task-number: QTCREATORBUG-475
2009-12-14 12:45:45 +01:00
Friedemann Kleint
0af3c1f13a VCS Submit: Run check script in repository, do not front-trim message.
Make checkscript a bit more verbose.

Task-number: QTCREATORBUG-451
Task-number: QTCREATORBUG-422
2009-12-14 10:56:50 +01:00
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
ff1054fc8d Subversion: Adapt to new VCSBasePlugin.
Remove logic handling several repositories.
2009-12-08 16:50:27 +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
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac.
Since that was fixed in Qt.
2009-10-09 13:33:56 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +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
5aa65b12f3 Version control: Do not keep lock on message file while committing.
Store the file name and do not keep the QTemporaryFile around,
which still seems to maintain some kind of lock on Windows although
it is closed.
2009-09-22 12:23:44 +02:00
Friedemann Kleint
d7c5e2ed24 Version Control: Release the commit message temporary file.
... and add some logging to p4.
2009-08-17 09:49:56 +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
e89a3b00d4 Perforce/Subversion: Display diff/annotation with correct encoding. 2009-08-11 11:22: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
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
d53129d336 Output filenames when doing svn update. 2009-07-15 12:24:47 +02:00
Friedemann Kleint
9a1cafd1b4 Fix up the Subversion plugin.
Add some functionality needed for CVS.
2009-07-14 17:20:20 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED
There were both variants, with and without extra semicolon.
2009-07-13 17:35:17 +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
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
Friedemann Kleint
9a82946d67 Source code typos as reported on mailing list. 2009-06-16 08:33:44 +02:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
2009-06-03 20:54:59 +02:00
Friedemann Kleint
e5c6a29fc4 Raise existing submit window if there is one when Submit is invoked.
Introduce convenience to VCSBaseSubmitEditor.
Task-number: 254644
2009-05-27 16:17:24 +02:00
Friedemann Kleint
85ef2954a2 Enable usage of "_svn" as internal directory name for TortoiseSVN.
Option for  TortoiseSVN to avoid hassle with other IDEs.
2009-05-26 12:25:32 +02:00
Friedemann Kleint
81d69641ab Added ParameterAction class for QActions acting on files.
Reduce inconsistencies in tr()-Strings provided for
QActions that act on a current <something> (mostly files) by
introducing a ParameterAction class that takes the tr()-Strings
at construction time and provides a setParameter(QString) slot,
allows for setting that parameter or an empty string, which
will cause the displayed text to be updated.
2009-05-15 15:41:00 +02:00
Friedemann Kleint
167508da78 Added -non-interactive to svn update to avoid merge prompts. 2009-05-05 10:16:09 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
Oswald Buddenhagen
088cb9c853 remove excess tr()
i don't think it is a good idea to tr() the svn command in the dialog
title
2009-04-20 16:51:10 +02:00
Friedemann Kleint
935cf11470 Make svn plugin work with svn 1.6.
Handle modified 'status' formatting (starting at column 8).
2009-04-03 12:17:33 +02:00
Friedemann Kleint
2dfd7349a3 Make VCS plugins keep the submit editor open if the submit fails. 2009-03-20 16:52:22 +01:00
Friedemann Kleint
927578ed55 Fixes: Polish submit message checking.
Details: Use a global model for nicknames that is shared by all dialogs to solve the updating  problems. Make p4 plugin submit work again. Force a submit prompt in case of shutdown or editor close (as opposed to user clickling on "Submit").
2009-03-20 10:16:18 +01:00
Friedemann Kleint
27cb595bbb Fixes: Add common configuration to the VCSA base plugin; submit message check script and user name configuration. Details: Extend submit editor widget by configureable fields. Use them in the VCS base submit editor to specify users, provide completion and selection dialog for them. 2009-03-19 17:44:50 +01:00
Friedemann Kleint
6ffdf7cf40 Fixes: Add a combo for diff file browsing, bring diff editors to front, exclude qconfig.pri from files examined by p4.
Task: 234842
2009-03-10 11:02:12 +01:00
con
bcf559cd50 Fixes: - Don't use multiple key shortcuts on Mac
Task:     - 244529
Details:  - It just doesn't work in Mac menus (at least not with Qt, but
I suspect it's some Mac thingy), so just don't do it.
2009-03-05 15:28:20 +01:00
hjk
12018c89d6 Fixes: simplify ProjectExplorerPlugin::instance() access 2009-03-04 09:38:01 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
mae
8598a59b9f fix context definitions of the vcs editors (this makes shortcuts work again) 2009-02-16 12:50:15 +01:00