feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
40,626 Commits 108 Branches 368 Tags
e7616f8769514b39cde4be8907adb0530a75267f
Commit Graph

281 Commits

Author SHA1 Message Date
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
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
96a0920440 Git: Use file directory as editor source for files opened inside git dir 
* git rev-parse --show-toplevel doesn't work inside git dir.
* Only "Describe (show)" should be available for those files. show
  works when running from inside the git dir

Change-Id: If5f3d1af8da2f8d149ac1e03ffd70b530e609557
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-10 10:38:23 +02:00
Orgad Shaneh
808f4492c5 VCS: Add a property to Command to indicate expected repo changes 
Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-10 10:37:36 +02:00
Orgad Shaneh
e8c1b8b739 Git: Remove unused forward declarations 
Change-Id: I1926733dc88902e75921a6bfa184e3f6b27ce98d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-10 10:25:43 +02:00
hjk
8510c2ab2b Git: Try do consolidate code duplication 
Change-Id: I5ac34d96152d6e4f9abc8f6dd18d1e1eab0bde7f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-06-04 13:20:33 +02:00
Petar Perisin
36bec480ae Git - execute push asynchronously 
Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:59:38 +02:00
Petar Perisin
dd7c2e622e Git - refactor executeGit and remove unnecessary args 
Change-Id: Idf770a20db66191b4d7fe3a704d31bdce70505c5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:59:06 +02:00
Petar Perisin
80a7107691 Git - execute fetch asynchronously 
Change-Id: Ic2243adaa36444099f834676186331927f3f4588
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:58:56 +02:00
hjk
3814e262ff DiffEditor: Rename DiffEditorEditable to DiffEditor 
More in line with current naming conventions.

Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-03 17:28:48 +02:00
Orgad Shaneh
bcd8c02aea Git: Prevent or close fixup editor if no local commits are found 
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-03 10:36:22 +02:00
Orgad Shaneh
05a6fc48ba Git: Support change links on commit editor 
Useful for commit messages with "reverts <hash>" for example.

Can later be extended for interactive rebase

Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-31 14:53:02 +02:00
Petar Perisin
77c136646b Gerrit - Removed all patch set stuff 
Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-05-31 06:08:35 +02:00
Petar Perisin
86d7e28db4 Git - added submoduleDataMap to handle submodule data 
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-28 21:53:26 +02:00
Orgad Shaneh
b75cf96868 Git: Refactor stash handling 
* Replace RebaseManager with ConflictHandler
* Store StashGuard in GitClient, allow popping after
  a whole process is done (e.g. pull with resolved conflicts)

Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:43:44 +02:00
Orgad Shaneh
829357b397 Git: Only execute stash if there are changes 
...even when NoPrompt is specified

Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:00:48 +02:00
Orgad Shaneh
5d558c141c Git: Add m_ prefix to StashGuard members 
Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:00:36 +02:00
jkobus
2ddb726dd5 Add file list combobox to diff editor 
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 14:14:06 +02:00
jkobus
97a86c50dc Basic integration of diff editor inside git plugin 
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-15 16:24:38 +02:00
Orgad Shaneh
e836cd082c Git: Prefer remote tracking branch in GerritPushDialog 
In case it contains the latest remote commit

Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:01:08 +02:00
Orgad Shaneh
8695fe6d7c Git: Implement "Fixup previous commit" 
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 20:01:04 +02:00
Orgad Shaneh
5d325f6b1a Git: Use StashGuard inside RebaseManager 
If the rebase succeeds without conflicts, pop

Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 20:00:39 +02:00
Orgad Shaneh
20f1208e0f Git: Pass CommitData by reference 
It is used for both input and output, the pointer is assumed
to be valid

Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 16:52:55 +02:00
Orgad Shaneh
06da25f610 Git: Add commit type to CommitData 
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 16:52:10 +02:00
Orgad Shaneh
7b851602cc Git: Use an enum for simple/amend commit 
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 14:38:00 +02:00
Orgad Shaneh
a5962841cf Git: Support graph log for all log types (file, project, repo) 
* Added a Graph toggle button for log editor
* Hide diff parameters when Diff is off
* Remove GitClient::graphLog

Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-29 11:01:05 +02:00
Petar Perisin
d425d6485e Git - move ensureStash inside StashGuard 
this is where stash popup question belongs

Change-Id: Ib3435f12eacd0b932ba2a67ecd728e5a41c0c64a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-26 14:13:12 +02:00
Petar Perisin
5478cf3c78 Git - bugFix in submoduleList 
it looks like submodule list in git config does not return paths. that
is why I have direct reading of .gitmodules file now.

Change-Id: I7f441d0b2e31ad7b73fbc8c05e5c9a9e0c84036c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-24 20:18:12 +02:00
Petar Perisin
44f14351b4 Git - command in progress in Topic 
Change-Id: I83a00e9677924efc244a91d20cdded77ee9cdff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-21 23:09:36 +02:00
Petar Perisin
311ca8cd01 Git - added continue and abort 
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-21 23:07:46 +02:00
Orgad Shaneh
e6da908321 Git: Refactor reset 
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-19 14:12:25 +02:00
Petar Perisin
93e51c186a Git: make ensureStash dialog more clear. 
Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-19 07:48:27 +02:00
Petar Perisin
7c6bb25248 Git: Also show tags in the branches dialog 
Change-Id: I74e010af7bff046647ac75e731a87867ff34b0f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-11 17:06:24 +02:00
Petar Perisin
c49fe8350d Git: Add a function for getting current local branch 
Change-Id: Ibda70cb896633cc7afa3a845b99aac523246c558
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-08 19:23:47 +02:00
Petar Perisin
fe1f7e4bf6 Gerrit: Added pushToGerrit dialog 
Change-Id: Ic16eae2def11343ef7be5ce8378d24b5fd11a386
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:28:05 +02:00
Petar Perisin
83d51b2691 Gerrit: added ability to save path for applying patches 
Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:27:57 +02:00
Petar Perisin
5d4c4a6968 Git: Added submodule update 
Change-Id: If8a4b0c572b0ca2d57f80f1304c7ebf141a40148
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-04 19:18:23 +02:00
Petar Perisin
b1c9d0eb37 Git: Added Checkout Commit 
Change-Id: I9446060b9a8ee1717b832f1f7b7dbcaf8e739ad3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-04 19:16:50 +02:00
Petar Perisin
31ed90b47b Git: Show remote branch in topic 
No extra terminal commands are executed.

Change-Id: Ia875b5dbce2784962b9fc2b7c9c1b0a696a02ec8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-04-02 12:03:45 +02:00
Orgad Shaneh
56881e3179 Git: Interactive rebase 
Change-Id: I3d106ce5b071df4a7a3d77be43e7c24bd7c91dfa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:39 +01:00
Orgad Shaneh
8705862786 Git: Use Qt Creator as an editor for Git 
Qt Creator runs Git in a "dumb" terminal which does not
allow opening an editor. Use Qt Creator itself as an editor
when needed.

Change-Id: Ide073299964803d02479dade24ddee0283ebd83b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:28 +01:00
Orgad Shaneh
cc3f1ad07d Git: Run continue command asynchronously 
Git might request an editor on continue

Change-Id: I374e9889e32ea1b1b5ed04f9be9d2a829f3b6440
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-03-15 12:49:11 +01:00
Orgad Shaneh
34191f3cc1 Git: Detect rebase-merge 
Change-Id: I2107a2fad456d52989002e560750af78281bd5db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:48:52 +01:00
Orgad Shaneh
17019955cd Git: Move some functions from MergeTool to GitClient 
Needed for interactive rebase

Change-Id: I5ba82735f6521087e7d23d8ee3e1beacd10db30a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:25:35 +01:00
Orgad Shaneh
2f302d640b Git: Make handleMergeConflicts public 
Change-Id: Id33f3ff4b79242e6e86ff51a1699fe41df022bf9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 13:00:27 +01:00
Orgad Shaneh
eb194a8126 Git: Update TODO file 
Change-Id: I4afd7ba6ccce650711df4239d89d1b7643a2373b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-27 15:27:27 +01:00
Orgad Shaneh
34fd5ca532 Git: Handle "no changes" case on conflict resolving 
Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:39 +01:00
Orgad Shaneh
bf61858375 Git: Show conflicted commit 
Change-Id: I398437db96082e8813090b5eb78ae1c8b8158ffe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:15 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00