Commit Graph

20 Commits

Author SHA1 Message Date
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
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
58111b2df2 API Documentation: Add VCSBase. 2011-03-28 14:19:17 +02:00
Friedemann Kleint
d7cddd4e17 VCS[Bazaar, Mercurial]: Add diff formatting, revert chunk.
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.

Fix Bazaar diff interaction (find the file on doubleclick).

Introduce initializeDiffEditor to BaseClient and wire the editors
there.
2011-03-28 11:59:26 +02:00
cerf
cc35cad557 VCSBase: fix working dir in VCSBaseClient::view()
The working directory for the job was wrong in the case where the
source argument is already a path. The fix tests file/dir nature of the
source and ensures a valid path is given to the job command.

Merge-request: 281
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-25 10:12:51 +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
434e32270b vcsbase: concise and readable VCS editor title
The user string returned by VCSBaseClient::vcsEditorTitle() now
begins with the basename of the VCS binary

Merge-request: 270
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:09 +01:00
cerf
901ea8fa95 vcsbase : fix bug in VCSBaseClient::view()
The VCS command was executed in the wrong working directory

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:08 +01:00
cerf
86b77ca950 vcsbase : fix bug in VCSBaseClient::log()
The editor returned by createVCSEditor() had always the wrong source

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:07 +01:00
cerf
c414c1a3f2 vcsbase : corrected ws
Correct Whitespace in header and source files of class VCSBaseClient

Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:05 +01:00
cerf
455a85bd86 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-15 15:47:45 +01:00
cerf
9ffcff105a vcsbase: concise and readable VCS editor title
The user string returned by VCSBaseClient::vcsEditorTitle() now
begins with the basename of the VCS binary

Merge-request: 270
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-14 11:18:49 +01:00
cerf
cba7359afa vcsbase : fix bug in VCSBaseClient::view()
The VCS command was executed in the wrong working directory

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-14 09:41:25 +01:00
cerf
dbbd7244a1 vcsbase : fix bug in VCSBaseClient::log()
The editor returned by createVCSEditor() had always the wrong source

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-14 09:41:25 +01:00
cerf
878157c66f vcsbase : corrected whitespaces in header and source files of class VCSBaseClient
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-11 15:32:08 +01:00
Friedemann Kleint
48ca10b090 Header cleanup. 2011-03-02 12:49:55 +01:00
Friedemann Kleint
fcd4c9e194 L10n: tr()-Fixes. 2011-03-02 12:01:34 +01:00
Tobias Hunger
3adb533ad7 Bazaar: Cleanups
Clean up whitespaces and coding style issues.
2011-02-28 16:10:47 +01:00
cerf
6c1dd96f12 Refactored the Mercurial plugin
Refactored the mercurial plugin which led to new vcsbase common
tools (VCSBaseClient, VCSBaseClientSettings and VCSJobRunner)

Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-02-28 16:08:15 +01:00