Commit Graph

31 Commits

Author SHA1 Message Date
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
cerf
6a72edb28a vcsbase: throw away VCSJobRunner, replaced by GitCommand
VCSBase::Command was created from GitCommand, it replaces VCSJobRunner.
VCSBase::Command is simpler to use (in VCSBaseClient) and commands
can show up in the progress manager.
From now on, the git plugin can easily rely on vcsbase.

Change-Id: I40593f354249cd94a4c79e90f9bf1362ff3bf5ec
Merge-request: 394
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6078
2011-10-05 17:33:28 +02:00
cerf
425261d69a Bazaar: fix whitespaces
Merge-request: 2208
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I4f803ebe6bfc4eda5635c1ee60d7c049d8c70250
Reviewed-on: http://codereview.qt-project.org/5302
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 11:45:15 +02:00
cerf
10b667ad58 vcsbase: add mechanism to ease management of VCS settings
Management of VCS settings was rather laborious (see BazaarSettings,
GitSettings, ...).
To overcome this, the base class VCSBaseClientSettings is now
equipped with a mechanism factorizing redundant code for VCS settings,
like operator=(), operator==(), writeSettings(), ...
Heir classes of VCSBaseClientSettings only need to declare the
settings (key + default value).

Bazaar and Mercurial plugins are impacted.

Change-Id: I7e4093a6d9476f3c8954f4d104f1b26ac185beb9
Merge-request: 2204
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-09-14 13:22:30 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:53 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
cerf
a8fc5e2134 vcsbase: refactor status output signal in VCSBaseClient
There is now a clear distinction between the basic status command
and the status command used to emit parsed output

Change-Id: Ie398a866ffcd8f4cc33b864ddbe23ce9d2e97437
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3337
2011-08-22 17:51:37 +02:00
cerf
0dcd66ef46 vcsbase: rename slot VCSBaseClient::settingsChanged()
Rename VCSBaseClient::settingsChanged() to handleSettingsChanged().
This avoids confusion with a signal (note : Bazaar and Mercurial
plugins are impacted)

Change-Id: I8afd8d60be300088081338a4ed682c2760ba42eb
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3336
2011-08-22 17:51:29 +02:00
cerf
3907824b4d vcsbase: refactor status parsing in VCSBaseClient
This impacts Bazaar and Mercurial plugins

Change-Id: Ife1e83083b268e597928fbae30378e488e31ee96
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3335
2011-08-22 17:51:19 +02:00
cerf
b46072c724 vcsbase: auto save settings when requested by Core::ICore
Bazaar and Mercurial plugins are impacted

Change-Id: Ia781dae79983350d773f454de32f812e876bfbfb
Merge-request: 350
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/645
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-06-23 10:59:38 +02:00
cerf
21c048363e Bazaar: save settings on plugin destruction
Change-Id: I94d5c1f1944b51a284e41ad9be0168f3edc99292
Merge-request: 345
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/462
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-06-10 17:47:09 +02:00
cerf
eed4d1e149 vcsbase: make settings mutable inside VCSBaseClient
VCSBaseClient takes now a pointer to VCSBaseClientSettings, so settings
can be changed within the VCS client. For example diff settings can now
be loaded and saved from within the VCS client.
This impacts the Bazaar and Mercurial plugins

Change-Id: I84882b1f3355e0ca2597704f48f589dca42fd661
Merge-request: 344
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-06-10 16:03:51 +02:00
Tobias Hunger
7f33ef02e7 VCS: Do not hide virtual methods
Change-Id: I818eb8246f27b023e35155d50a8d08548660f709
Reviewed-on: http://codereview.qt.nokia.com/350
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-06-07 10:49:20 +02:00
cerf
b48f1d6801 Bazaar: add support of the "max log count" user setting
Merge-request: 327
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-12 16:37:59 +02:00
cerf
e6bbf52f29 Get rid of VCSBaseClient::ExtraCommandOptions
It is replaced by QStringList, allowing a simpler approach to add extra
arguments to a command.
The Bazaar and Mercurial VCS plugins are impacted by this change

Merge-request: 325
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-12 14:48:10 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Orgad Shaneh
e237a84339 VCS: Added a shortcut for Diff Selected Files
Merge-request: 289
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-03 16:00:52 +02:00
cerf
326ea080c5 vcsbase: VCSBaseClient::log() now accepts extra options
Merge-request: 323
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-03 14:44:38 +02:00
Oswald Buddenhagen
469199e7a5 abort commit if commit message cannot be saved 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
e35fe2a770 file manager: introduce saveFile() and remove blockFileChange() & unblockFileChange()
this replaces the ever-repeating idiom block/save/unblock with a single
call.
2011-04-18 14:10:12 +02:00
Tobias Hunger
bcd8740a6e VCS: Notify project wizard about config changes
... and have the project wizard update the available VCS.

Task-number: QTCREATORBUG-4423
2011-04-15 17:45:34 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
cerf
1ceb461b1c Bazaar: fix conflicting keyboard shortcuts
Bazaar commands can now be triggered with ALT+Z as combination prefix
instead of the already used ALT+B

Merge-request: 278
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-21 11:39:30 +01:00
cerf
d87f03825d Bazaar: fix commit error for 'rename' changes
Merge-request: 276
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-18 09:56:49 +01:00
cerf
750248f3e8 Bazaar: fix indentation and whitespaces
Merge-request: 276
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-18 09:56:44 +01:00
cerf
f93226fbf3 Bazaar: set global Bazaar user ID when changed
This ID is automatically set when the user settings have been changed
and applied from the "Options" dialog. This calls 'bzr whoami' under
the hood

Merge-request: 275
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:14 +01:00
cerf
3a4c036b7f Bazaar: mark unused parameters with Q_UNUSED
Merge-request: 272
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:10 +01:00
cerf
8d97e3bdf2 Bazaar: satisfy naming policy
Merge-request: 272
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:10 +01:00
Friedemann Kleint
273b1da2fc Bazaar: Fixup, set unique action id.
Duplicate ids in Mercurial, Bazaar.
2011-02-28 17:29:21 +01:00
Tobias Hunger
3adb533ad7 Bazaar: Cleanups
Clean up whitespaces and coding style issues.
2011-02-28 16:10:47 +01:00
cerf
f9bb4c59dc Added new Bazaar plugin
Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-02-28 16:08:38 +01:00