feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
30,508 Commits 108 Branches 368 Tags
cc7c3c96238c540bc7b09c7fe2012e9c33d236b6
Commit Graph

913 Commits

Author SHA1 Message Date
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION 
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.

Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-09 15:14:10 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath 
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-09 13:51:42 +02:00
Orgad Shaneh
41b51ff67f Git: Preserve reset type 
Task-number: QTCREATORBUG-9666
Change-Id: I364bc0eefef376a9a14953b259e9d7b2eb29c228
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-09 12:00:07 +02:00
Orgad Shaneh
02512e234e Git: Use direct settings member instead of accessors 
Change-Id: Iba2954934218bec92716a8df1c04fe9347defd17
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-07-09 08:50:54 +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
Orgad Shaneh
2c21100725 Git: Disambiguate branch/tag names 
Task-number: QTCREATORBUG-9700
Change-Id: I48e779fba65afc71ba13b426e526c3cb82070142
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:28:23 +02:00
Orgad Shaneh
b2a09f7b45 Git: Rename branchName -> fullName 
The model can contain tags

Change-Id: I70a75534848232476447125801a5ca7e963bbdcc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:22:31 +02:00
Orgad Shaneh
2af4c05b8c Git: Use -x for cherry-pick 
Change-Id: Iaa6bfdaa1307a3c7a73fd80fb0ffe3b80a01312d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:21:47 +02:00
Orgad Shaneh
aad68917b9 Git: Always allow stash before cherry-pick/revert 
Currently done only from "Actions on Commits"

Change-Id: Ide34e198e72f554ba6fd75ef21aaaf35917b4f6a
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:21:41 +02:00
Orgad Shaneh
8aa1c9bc37 VCS: Remove removeColorCodes 
status output can be uncolorized using the git config value
color.status=false (works for short status since git 1.7.0)

Change-Id: I0887ab9a02f4c98fe54a94a53ffcd4f91fef8699
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:47:56 +02:00
Orgad Shaneh
54b7146986 Gerrit: Notify on invalid configuration 
Task-number: QTCREATORBUG-9548
Change-Id: I4c5f9a4c6b7a818d296a923df1d665c22afd8292
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:47:03 +02:00
Orgad Shaneh
ffdd317773 Git: Support remove/rename for tags 
Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:43:13 +02:00
Orgad Shaneh
0ae3d29a66 Git: Simplify button enabling conditions in branches 
Change-Id: I6484dd62eac80e1e4aba00890926e7dfb542f0be
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:30:34 +02:00
Orgad Shaneh
45ccd7d919 Git: Fix crash on checkout branch 
Task-number: QTCREATORBUG-9756
Change-Id: I3bdba870737bbffde6c0e6a9046a58ba78f097be
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-08 11:24:03 +02:00
Orgad Shaneh
a6626b49c4 Git: Reorder reset types 
Hard is now the default (as it is in 2.7), and the types are
properly ordered

Task-number: QTCREATORBUG-9733
Change-Id: I54fb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-06 20:18:52 +02:00
Orgad Shaneh
3cefd0288e Git: Remove wrong assertions 
Changed in 89523c14

Change-Id: I872c37633a877e982046b2a44266159d86defbde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-06 20:18:14 +02:00
Petar Perisin
6312cc18e2 Git - added ability to launch git gui 
Change-Id: I65ed3e0408e43e354a289bbbd385aec2e254746c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-05 10:16:59 +02:00
Orgad Shaneh
2103a4a96c Git: Clear branches model when repository becomes empty 
Change-Id: I78932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-04 17:59:49 +02:00
Orgad Shaneh
a26c884b70 Git: Preserve current selection on log change refresh 
Change-Id: Ic6be652a1d5cca87ae5effdcb3cb5df7b1b73c2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 16:57:43 +02:00
Orgad Shaneh
be5133cf72 Git: Update branches dialog when repository is changed 
and on fetch

Task-number: QTCREATORBUG-9667
Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 15:26:39 +02:00
Eike Ziller
8685ff8a28 Merge remote-tracking branch 'origin/2.8' into HEAD 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
 2013-07-03 16:55:27 +02:00
Orgad Shaneh
3e117b125d SynchronousProcess: Use the same codec for stdout and stderr 
Change-Id: I4a7e5a5748dd9e16b1e62b3879cce8ccab0f3e01
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-02 10:29:13 +02:00
Orgad Shaneh
00337585ab Git: Add some null protections 
Change-Id: Ia28c70690c6f79499fb8075935ec123b763bcc01
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-07-02 08:52:30 +02:00
Orgad Shaneh
5f131da166 DiffEditor: Show tags and branches in Show pane 
Change-Id: I39be7c3fb9b57b133c4da3639813527aa280ae33
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-07-01 15:50:12 +02:00
Orgad Shaneh
32217a0c3c Git: Move static strings out of GitClient class 
They're only used in gitclient.cpp, define them there

Change-Id: I601f23a6f2a8e533127d2ed068526815e1b9717d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-01 15:42:16 +02:00
Orgad Shaneh
f621ee5bc4 Git: Diff current file against index 
Task-number: QTCREATORBUG-9663

Change-Id: I18b4ec5577bf0114075141583c938eaa02d5eded
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-07-01 11:22:49 +02:00
Orgad Shaneh
893b1e9a16 Git: Support commit.template under ~ 
Task-number: QTCREATORBUG-9530

Change-Id: I21ee4202aa750a9d4d89f05d51af7c63489eb6c3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-01 11:21:54 +02:00
Orgad Shaneh
62554e7647 Git: Add a soft assertion 
If directory is empty, buttons remains NULL, which leads to a crash

To reproduce, open Branches dialog then close all editors
and projects and click Log for a branch

Change-Id: Icf06b76c58585c0dd6062017e94e07dad016c275
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-01 10:35:02 +02:00
Orgad Shaneh
a0ee1300c3 Git: List conflicted files on stash pop conflict 
Change-Id: I0dd71c928b430ca4a54034b9ddaa0d10e75ded54
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-26 10:26:18 +02:00
Leena Miettinen
41411165ba Doc: use standard wording in \brief commands 
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 11:22:47 +02:00
Orgad Shaneh
57a6f04ce6 Git: Prevent tracking tags 
Change-Id: Iea935aa226b70de936653b7637b4b9bb5e9c64cf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-19 22:07:06 +02:00
Orgad Shaneh
11e7c706be Git: Make tree layout consistent on add branch 
Change-Id: I3b49d76ef0e3da9ab60d6859a8b8e18092794bbb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-19 22:06:22 +02:00
Eike Ziller
f7349e49df Fix build 
The (un)expectDirectoryChange API addition has been reverted

Change-Id: I4736f51a77eb2f63b3e4a7b44426ad15a06624c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-06-19 11:49:52 +02:00
jkobus
f5a2c1469a Add a DiffShowEditor showing an additional info 
Task-number: QTCREATORBUG-9489

Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-06-19 09:11:42 +02:00
Petar Perisin
159a7d61dd Git - stash scope guard in submoduleUpdate 
Change-Id: I888d4013e88fdc6977f29ef3e27d243e55a1f1a7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-06-17 22:22:31 +02:00
Orgad Shaneh
8ce981e673 Git: Fix false positive for tracking branch 
Change-Id: Ib08b5b276708a5951ed421e674a10d4763032502
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 15:51:50 +02:00
Orgad Shaneh
744d5d51ab Git: Display tracking branch for newly created branches 
+ Get rid of a workaround done for retrieving sha

Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 13:51:27 +02:00
Orgad Shaneh
3591c1df57 Git: Disable rebase and fixup when there's a command in progress 
Change-Id: Ifa2f781cb1f31afaf7b0af4e4a0dd08fb58296d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 11:21:19 +02:00
Orgad Shaneh
1686e314bd Git: Use log instead of show to display commit without diff 
Change-Id: I12ff53e3375470704fb6aafa6ec0a3eaadd9aadb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 11:20:43 +02:00
Orgad Shaneh
096daac0bd Git: Execute rebase asynchronously 
Rebase --continue might request an editor, which hangs if run
synchronously

Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:56:05 +02:00
Orgad Shaneh
fc2a5d7f50 VCS: Preserve uncheckable files on submit editor refresh 
Change-Id: I652b5a96c994a13f8d0c02d850b15c5846d56e64
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:54:51 +02:00
Orgad Shaneh
9f72e43fb1 Git: Refresh log entries on fixup commit 
Change-Id: Icd14c8916dc006874b77aa922b3f1c6746e0549c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:53:14 +02:00
Orgad Shaneh
7ff6dcabd1 Git: Handle merge conflicts on stash pop 
Change-Id: I41a9173be2feae4ab529fd9b3f2e1e7cc5ae92ff
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 10:44:27 +02:00
Orgad Shaneh
e9443ff51f Git: Show tracking branch on Branches dialog 
Simplify branch model parsing a bit

Change-Id: Id9e41c6c2769397d6eee3ab74de4afbb94111e25
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-06-14 13:50:50 +02:00
Orgad Shaneh
89523c1467 Git: Allow merge and rebase for detached HEAD 
Change-Id: Ia00c061b1f4a705cf815052921e6f6cf43d0867d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-13 17:20:15 +02:00
Nikolai Kosjar
c51195d9bb Git: Specify shotcurts in StashDialog 
Change-Id: I05eabdd146f66a908e0cf44f229a0a2e6efe4f93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-12 14:57:41 +02:00
Orgad Shaneh
709920e013 Git: Fix expecting changes in executeGit 
Calling setExpectChanges after execute is too late

Change-Id: I852c224206fcd758943252029b8e9b050920ca5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-12 10:15:00 +02:00
Orgad Shaneh
2073a0660f Git: Ensure documents are saved before executing destructive calls 
Change-Id: I9ec0ae0ff6a1b70e5d4c322dbf2e53be57e3009f
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-11 22:46:57 +02:00
Andre Hartmann
f1ed40a02c Git: Add Gerrit to Locator 
The Gerrit dialog itself was missing while Push to Gerrit was already
there.

Change-Id: Ie4b85cad9dba96beafb595c505daf28d0a1ceeb5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-06-11 16:24:47 +02:00
Orgad Shaneh
eb2a359f06 Gerrit: Close write channel for fetch process 
Change-Id: I1557d2e57f5838d7820bcb41190ff2bb4b9a0473
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-06-11 15:11:18 +02:00