feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,082 Commits 108 Branches 368 Tags
1fd87607898079366084b64e9132c9ee07e63cb6
Commit Graph

289 Commits

Author SHA1 Message Date
Peter Kümmel
65cd8ea4c2 Git: Fix config encoding on Windows 
This fixes commit d72b4851b4
which has removed the conversion from Utf-8 on Windows.

Task-number: QTCREATORBUG-12092
Change-Id: I83c4d2d5eacb79ca99ef0b6f385344689582079e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-04-22 17:43:26 +02:00
Orgad Shaneh
187bb36945 Git: Continue command after failed merge tool attempt 
Change-Id: Ic3b7d4aee51897e226a78979bbecb82f06095b2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-27 15:11:44 +01:00
Orgad Shaneh
d72b4851b4 Git: Avoid QByteArray -> QString -> QByteArray conversions for encoding 
Change-Id: Ib2eb3000a08021336c9071d35d499371c9b88976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 14:30:09 +01:00
Orgad Shaneh
e6d0e6872d Git: Replace QStringList with QString in readConfig 
All the calls pass a single argument

Change-Id: I95a7c44114ff2bb38cd65ab79a1e455dc969a62b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 14:28:41 +01:00
Orgad Shaneh
0d61ddce84 Git: Consolidate codec configuration retrieval 
Change-Id: I6c099a5d0e4ffa180289bbecfe6d552b39d4aeaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 14:27:47 +01:00
Orgad Shaneh
7872981d62 Git: Simplify commit message codec handling 
Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 13:44:58 +01:00
Orgad Shaneh
86d7916b5b Git: Factor out commitEncoding 
Task-number: QTCREATORBUG-11115

Change-Id: I58f3759c13d963aaf3e7891d7cc0a41c1ae14ecd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 11:39:54 +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
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
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
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
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
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
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
4a5af14b7f Git: Enable choosing non-fast-forward merge 
Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-09 11:14:02 +01:00
Eike Ziller
0e4de8c108 Merge remote-tracking branch 'origin/3.0' 2013-11-29 11:50:41 +01:00
Friedemann Kleint
6c02c27e9e Change GitClient::executeGit() to take flags instead of bool. 
Change-Id: I3cb83914be7e9665f49baf9f563c753c6c3919f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-11-28 13:25:45 +01:00
Eike Ziller
8fe04ce0ad Merge remote-tracking branch 'origin/3.0' 2013-11-19 07:41:47 +01:00
Orgad Shaneh
920fa79667 Git: Really add new/existing files 
Task-number: QTCREATORBUG-10117

Change-Id: Ic254cb2f7860ca0973cfda58cf66f62b1b8eaeb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-11-18 10:11:14 +01:00
Eike Ziller
4538ccb46c Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
 2013-11-15 10:26:57 +01:00
Orgad Shaneh
647c65c96e Git: Suggest mergetool on stash restore conflicts 
Removed warning popup, but stderr is still visible in Version Control pane

Change-Id: I6f5779f0382b8ead1e7140eb6ad533ea0c91dcc2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-11-09 17:25:19 +01:00
Petar Perisin
6c61559399 Git: Allow push after fixup 
Direct push after fixup is really useful, especially on gerrit, because
it allows easy fixing and direct pushing commits under HEAD.

Change-Id: I83980e451c9ae86ac1ac0a55170d6d4141f27d49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-11-08 12:42:08 +01:00
Petar Perisin
cd041f3f93 Git: Create local branch after checkout 
Change-Id: I2f9c47862304773234612250bb1e3e2e759a159e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-10-29 07:39:37 +01:00
Petar Perisin
9bb93246c1 Git: Remove function pointer in changeRelatedActions 
makes code more readable

Change-Id: I8f6369bf571144dde468546b8f47695fd4ffdf44
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-10-29 07:27:19 +01:00
Petar Perisin
e31426366b Git: Refactor revParseCmd 
Change-Id: I5125694ba334e2f3774ed19c64d671d3cb726bf4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-10-29 07:26:51 +01:00
Orgad Shaneh
fdb6ef90fc VCS: Do not try to add files that are already tracked 
Task-number: QTCREATORBUG-2455
Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-11 12:43:25 +02:00
Orgad Shaneh
7b08d993bf VCS: Pass workingDirectory for annotate 
Required for supporting renames on annotate.

The renamed file (and possibly its parent directory) doesn't exist
anymore, so it shouldn't be passed as a working directory.

Change-Id: I809e8df17c1dc5199e533b525244a668eccbcd5f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 18:59:43 +02:00
Orgad Shaneh
63e7fe19b9 Git: Remove setting for side-by-side diff 
Use the diff switcher state as a permanent setting

Change-Id: I6c3669090082787ae750596cf3e62973c04d94c3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-30 16:37:25 +02:00
Francois Ferrand
367cfc8419 Git: Support staging a single chunk. 
Add context menu in diff editor to stage/unstage a single chunk from the diff.

Task-number: QTCREATORBUG-5875
Change-Id: Ic244a0d84b5ed5f66b90d7fe8784fc1b8041d183
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-26 23:10:59 +02:00
Orgad Shaneh
f29ce3d9b9 DiffEditor: Preserve source for state recovery 
Task-number: QTCREATORBUG-10126
Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 15:45:36 +02:00
Orgad Shaneh
9df379e0dc Git: Fix crash on diff 
Task-number: QTCREATORBUG-10138
Change-Id: I7c7f054e6253c677b52a3ea24d7ace562f1ad4af
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-09-12 13:02:55 +02:00
Orgad Shaneh
aefd61478a VCS: Replace AbstractCheckoutJob with Command 
Command now provides the same functionality. Deduplicate code.

Change-Id: I789f021050471281870b6ef6a81a94e66fbdf0c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-02 11:50:10 +02:00
jkobus
24ccd50015 Add a toolbutton for switching diff view mode 
Task-number: QTCREATORBUG-10035

Change-Id: I83cb7cec3f4ba484ab068f398a12096501017668
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:21:31 +02:00
Orgad Shaneh
9f2110f8a1 Git: Extend show output on diff editor 
Change-Id: I51d3d0af96b28ec56bedaac163f9ce72158d8dc2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-28 10:12:01 +02:00
Orgad Shaneh
0865e9eb27 Git: List branches on show 
Change-Id: Ie69a58efc7068c699abf0e3d396216d9809346f4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-08-28 09:56:47 +02:00
Orgad Shaneh
afcb9b2c41 Git: Show active branch next to command in progress 
Revised topic is "master (MERGING)" instead of MERGING

This should also fix topic getting stuck as REBASING

Change-Id: I934643f5b4e632318495f141536c666f775bd15d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-27 12:22:43 +02:00
Orgad Shaneh
f9c4889a7f VCS: Use runVcs for Command 
* Removes duplication
* Supports all flags accepted by runVcs
* Supports output while running

Change-Id: Id067791760753184cd2516c23634564880ca5db0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-20 12:54:02 +02:00
Orgad Shaneh
e1e1936073 Git: Add reflog 
Change-Id: Id328492826bdcf4b7f7e6933a9dc3931174de0fb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-19 11:45:02 +02:00
Orgad Shaneh
35798d4ad6 VCS: Use a single filename for log 
The list always contains a single entry (or none) anyway

Take 2. This time it actually compiles ;-)

Change-Id: I71a9822360a9b569ba79afa0f575e27918bb2e03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-07 17:43:58 +02:00
Orgad Shaneh
7c5b19ebf4 Revert "Git: Use a single filename for log" 
Breaks compilation

This reverts commit a05ea71133

Change-Id: I713f06a1fe1ff24f4721cda082fb732dc3f5c270
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-08-06 18:27:09 +02:00
Orgad Shaneh
a05ea71133 Git: Use a single filename for log 
The list always contains a single entry (or none) anyway

Change-Id: I567b622efd42dd6f676bebb92fbf1c8774bd80ff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-06 17:23:25 +02:00
Orgad Shaneh
6b8c93637b VCS: Un-data functions that accept QString 
Change-Id: Iffa82f4ab06162ab57e77301e77fb37ed7230bd5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-31 11:23:00 +02:00
Petar Perisin
e6de18eaab Git - show command name in tooltip 
Change-Id: Ib652813c713e24cf9cbe8cb4b77207d54be7e132
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-21 23:03:00 +02:00
Orgad Shaneh
0c50c5a1d3 VCS: Consolidate codec handling 
Change-Id: I2c9a5031b63f0bc3e884739be680d051d7cf1ab4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:56:34 +02:00
Orgad Shaneh
aa981f4066 PushToGerrit: Filter out stale branches 
Change-Id: Ib4f1d7ead2c40f27be28fa45e042c3694c0444fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-07-12 17:52:38 +02:00
Orgad Shaneh
bcf9c7621f Git: Remove args from diff 
They are unused

Change-Id: I6cff3c6028208f1c7c0937c53b3f5090dae719a6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-11 18:05:03 +02:00
Orgad Shaneh
062b8f5d31 Git: Set remote-tracking branch 
Task-number: QTCREATORBUG-8863
Change-Id: I06df735d85e2f9ed17c71385fed5057f8fc67d55
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-10 12:50:50 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD 
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
 2013-07-08 15:01:17 +02:00