Commit Graph

1109 Commits

Author SHA1 Message Date
Orgad Shaneh
cd48c5e513 IVersionControl: Implement topic cache in the base class
Derivatives need to derive TopicCache, implement its pure virtual
functions and pass it in IVersionControl's constructor.

Change-Id: I3a904c84541fda95eee75296f86441c4bae55d79
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-19 09:25:31 +01:00
hjk
c68ebeed2e QtcProcess: Introduce a QtcProcess::Arguments class
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.

As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.

Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-19 09:19:28 +01:00
Orgad Shaneh
c43db28195 Git: Fix wrong variable name
Change-Id: Ie79fddadc6835805f1fa6e811592c30cf32e5c9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-19 08:36:06 +01:00
jkobus
73cf43f323 Add DiffEditorManager, refactoring.
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).

Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-18 13:46:49 +01:00
hjk
a74de6af81 Utils: Merge FilterLineEdit into FancyLineEdit
Change-Id: Ic53836dade3985c36b0f6767e43b5af0ddb80d72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-14 16:58:43 +01:00
Orgad Shaneh
48a5fb4b13 PushToGerrit: Do not calculate number of commits for empty input
Change-Id: Ib2e5305dd47b486a963edf5bb04e6d16d76d5e68
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-14 10:38:34 +01:00
Orgad Shaneh
5a562e9239 PushToGerrit: Pass local branch to determineRemoteBranch
Simpler

Change-Id: Ice180200a1b78e57b8ff6b246db7b2e8f3b39eb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-14 10:38:30 +01:00
Orgad Shaneh
0c6ee31684 Git: Fix target branch auto-detection in Push to Gerrit
Initialization order is important.

* updateCommits populates the LogChangeWidget.
* determineRemoteBranch looks up by earliest commit (for which the
  LogChangeWidget must already by populated)
* Assignment to m_suggestedRemoteBranch must come before calling
  setRemoteBranches
* remoteComboBox was wrongfully used instead of targetBranchComboBox

Change-Id: Ib0db057313c8fd65910b0ec7394b6b8c7d997dab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-14 10:38:24 +01:00
Orgad Shaneh
635a355f97 Git: Suppress "No local commits" error message in Push to Gerrit
Change-Id: Ib0cf79acf48d24848fda92a8b7b06efe62b46dbc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:45 +01:00
Orgad Shaneh
b7d2268ff3 Git: Suppress log output in LogChangeWidget
It's distracting

Change-Id: I6c522ee61ba7261611002bf40c01a9d1d23a0259
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:42 +01:00
Orgad Shaneh
0bb318939b Git: Suppress for-each-ref
Another plumbing command

Change-Id: I1450baae370e46e8daf5c440def7e9f04d9d01bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:37 +01:00
Orgad Shaneh
7ed1576083 Clean up single namespace forward-declarations
Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-12 09:30:37 +01:00
Tobias Hunger
8c1c284789 Qbs/qmake: Fix dependencies of plugins
... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 13:23:26 +01:00
Orgad Shaneh
1ed9f6bbca Git: Enable local branch selection in Push to Gerrit
Show dialog even if there are no local commits in current branch

Change-Id: I11e0c6505981712df51bb33694a6cba9704d7324
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 12:06:29 +01:00
Orgad Shaneh
292e4599aa Git: Rename branch -> targetBranch in Push to Gerrit
Change-Id: I725a7e9ece2bf1e8854dc077cb93a1f7cc1eb90c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 12:06:24 +01:00
Orgad Shaneh
517c357770 Git: Factorize ctor of Push to Gerrit
Change-Id: Ib668d0e29bac25bc2f78d8885b4dfa89c292b489
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 12:06:19 +01:00
Orgad Shaneh
6db52645b9 Git: Silence rev-list execution
It's plumbing. Not interesting for the user.

Change-Id: I65bb7849c64f32ac24684715290acf26441c5d2b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 12:06:12 +01:00
jkobus
7267c95acf Fix a crash on "Switch to Text Diff Editor"
Task-number: QTCREATORBUG-11448

Change-Id: Id0239d5cf71ff857ac384e18136348df92a98b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-11 11:40:46 +01:00
Orgad Shaneh
346f0c3177 Git: Remove unused functions
Change-Id: I279dcf1ee1c1fe16d3a1fd866af4f9cc4a8c9070
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-10 10:44:25 +01:00
Orgad Shaneh
757a5a2867 Git: Detect rc versions
Rename local vars to avoid collision with macros defined in
<sys/sysmacros.h>

Change-Id: I6da7354102cca898d2600296242131e4c343c019
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-06 11:10:09 +01:00
Orgad Shaneh
92a133b09a Git: Increase limit in LogChangeDialog to 1000 entries
Task-number: QTCREATORBUG-11200
Change-Id: Iff6073c4f84926a18006c1f47b30a0525134c2ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-02 06:44:34 +01:00
Jarek Kobus
edac8f082d Get rid of DiffShowEditor.
Made DiffEditor customizable instead

Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-01-30 19:13:48 +01:00
Jarek Kobus
c18fa9112b Rename DiffEditorWidget -> SideBySideDiffEditorWidget
It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-01-30 17:13:14 +01:00
Orgad Shaneh
aa6dd83e08 Git: Replace bool argument with flags
For a start, it's a single flag. Will be extended.

Also change the default for includeRemotes to false (most callers pass false)

Change-Id: I969f89a06b85a42c134c0232d2947d58fe19ea0d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-29 11:05:13 +01:00
Orgad Shaneh
25ddacc238 Git: Add using Git::Internal to GerritPushDialog
Change-Id: I7b2dab05809040397c7221ed830730bc1c5a019d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-29 11:05:04 +01:00
Eike Ziller
3422995521 VCS editors: Fix revision markers
Resets the revisions when setting the contents of text editor documents
in general.

Task-number: QTCREATORBUG-11356
Change-Id: I4069d629d8a612d42c7deae707300d50690e2db7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-29 10:04:47 +01:00
Petar Perisin
e163356f9f Git: Branches dialog - ensure all documents are saved
Change-Id: Ia48157b10fb2f9eb3a8b9b8e7e541a736dd75b4f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-27 16:23:09 +01:00
Tobias Hunger
88a4421a84 DocumentManager: Refactor saveModified methods
Introduce methods to save a document/list of documents/all documents,
both silently and with a dialog to the DocumentManager.

All of these return a bool that signifies whether the save was
successful or not.

Detailed information on which files failed to load or whether the
save was canceled by the user are still available as optional
in/out parameters.

Change-Id: Id17798302f2a8ba6b85a07c1f0b91f03b20da03f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-23 13:50:29 +01:00
Eike Ziller
cdd19fe6ad Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f
2014-01-20 14:21:46 +01:00
Orgad Shaneh
7dc19b46ed Git: Set a title for change selection dialog
Lost in 13a0b348b

Change-Id: Id798c849cd30c44db1e16d14ddfba4c78a77e2f2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-01-16 17:08:41 +01:00
jkobus
a74b59ffd6 Add DiffEditorController
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-16 14:36:53 +01:00
Petar Perisin
f23922f84a Git: Added ability to checkout and reset in GitEditor
Especially useful in reflog.

Change-Id: I1d63221f152ebc7e69934482785b433d016e4ead
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2014-01-16 00:54:22 +01:00
Petar Perisin
3a3dbb3746 Git: Fixed bug with branches missing from a list
Change-Id: Id4fa9f6c4f874c9b1ac5112efceaf0c22ed84d00
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-01-16 00:52:54 +01:00
Petar Perisin
b245bfc65d Git: fix checkout in ChangeSelectionDialog
Change-Id: I17f9d4926bb1fc0c075aa1b706f6fb65b463ab48
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2014-01-15 21:10:37 +01:00
Orgad Shaneh
5eff132253 Git: Pop stored stash after checkout
Change-Id: I41eda91149c0152fd0b9f3d2c0294120153377b5
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2014-01-15 08:19:15 +01:00
Petar Perisin
27ce04bb5b Git: search for gitk in path if all else fails
Change-Id: I4799791b2baffa61092c01699a4128f01151b53c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-01-14 18:13:34 +01:00
Orgad Shaneh
9ce8e85109 Git: add completion to ChangeSelectionDialog
Change-Id: I4511c26af7b02fb0ffab76e5170e80d6cf79b10b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-14 11:31:01 +01:00
Orgad Shaneh
df9299fd24 Git: Do not hang on Continue Cherry-Pick/Revert
...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-14 11:11:29 +01:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 07:43:00 +01:00
jkobus
1d954b1b2a Get rid of DiffEditor::editorWidget();
Change-Id: I3078002359871dad74d4a07924d5beeaeb9f82ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-01-13 13:32:10 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Orgad Shaneh
aeab5d9ab9 Git: Trim change on ChangeSelectionDialog
When a ref is copied from an external source (e.g. gerrit), it might
includes a trailing whitespace.

Change-Id: I61305af27959f457795afa37654e683622d38259
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2014-01-07 14:42:36 +01:00
Orgad Shaneh
7073f7daed Git: Fix draft ref for gerrit
Change-Id: I884bcab46a7e11cbc3ea6c453bddd8b9d599e4cc
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-12-31 15:10:08 +01:00
Orgad Shaneh
c17f798a01 Git: Do not invoke git for details about empty change
Change-Id: I2a7b36063ad3c67d3a1fbe999659dc0051723b10
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-12-23 06:45:21 +01:00
Orgad Shaneh
ddfec003ad Revert "Git: add completion to ChangeSelectionDialog"
Missing dependency

This reverts commit 724690132cf6d8fb812ea67e1665d7bbf7c5d290

Change-Id: Ib20b7bbd23b0a22e271006f951095d805e4639e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-12-22 08:47:06 +01:00
Orgad Shaneh
1f4587955d Git: add completion to ChangeSelectionDialog
Change-Id: I0b693ec00008b9cd39e05148acc5441fed39a196
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-12-22 08:46:42 +01:00
jkobus
0d13028440 Refactor source property
Get rid of source property out of DiffEditorWidget,
attach dynamic property when it's needed instead.

Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-12-19 14:06:51 +01:00
Eike Ziller
1adab4c4cc Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-18 11:34:34 +01:00
Eike Ziller
deb43b4c8a Preferences: Add default implementation for filtering
The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.

Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-10 13:31:48 +01:00