feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,096 Commits 108 Branches 368 Tags
7545ce072f64cd6b16f7663b0643fb0024bdeff1
Commit Graph

694 Commits

Author SHA1 Message Date
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
 2013-03-04 15:07:19 +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
6275308f63 Git: Externally set dialog title for LogChangeDialog 
Change-Id: I5869e17145f9974eb274d4300bbb23ebdc0990f0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:24:28 +01:00
Orgad Shaneh
15374275a1 Git: Rename ResetDialog -> LogChangeDialog 
Required for interactive rebase

Change-Id: I024505bbde1c58a7ccb4ce931322e0f5b467552b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:24:07 +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
e427eab068 Git: Close submit editor if all changes were committed externally 
Change-Id: Iae4e9d52aed333def0e5f0c56bca9c68a38430a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:25:22 +01:00
Peter Kümmel
e4e43352a8 Git's config is UTF-8 encoded on Windows 
'git config' command returns UTF-8 strings if the encoding of the file was not hijacked by the user.

Task-number: QTCREATORBUG-8696

Change-Id: I6181a26e56e2883ad5d46194f974e799bfd2aafb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:09:43 +01:00
Orgad Shaneh
391094ed2c Git: Do not detect repository inside git dir 
Change-Id: I74f7c7eab6dee584bd4c42499ce8e1613d008043
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:40 +01:00
Orgad Shaneh
0cabae0f77 Git: Remove unneeded class qualification 
Change-Id: I7f604973ba1fdb974d6097abeb7127273786f69c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:25 +01:00
Orgad Shaneh
75c15d1f9d Git: Remove redundant check 
outputWindow() cannot be null.

Change-Id: Ie50bff33a3590a20e9de6b2602dac9cd70eb77bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:11 +01:00
Orgad Shaneh
9376c24fd0 Git: Fix regexp for cherry-pick and revert conflict 
Output should contain a \n in the end, so $ is counter-productive

Change-Id: I3a7d1dcbed1aa7c78e9a96cafdb3c0d1e65edc7a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:51:58 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
 2013-02-28 12:02:40 +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
7a7117cd33 Git: Undo changes on pull with rebase when user chooses not to stash 
Task-number: QTCREATORBUG-7031

Change-Id: I10bee004482bf8f066f1ddfcf720797e8005ebec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-27 15:27:10 +01:00
Orgad Shaneh
a547b6af46 Git: Fix unstaging modified files 
Regression introduced in ab85e7342e

Change-Id: I92ec1f9d45b713d426fdae99d16e93ba5eb455cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-26 12:54:48 +01:00
Orgad Shaneh
1193b0f5fb Git: Fix dialog titles 
Add one, remove unused one

Change-Id: I3866525238e11f75ecf002b4c9efc916c40e9abd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-26 12:54:40 +01:00
Orgad Shaneh
44acdb6748 Git: Decorate commits on reset dialog 
Change-Id: I42bf5eb87e8d3038746df033cc759492201dc130
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-21 14:57:15 +01:00
Orgad Shaneh
cdcc8256a0 Git: Require 1.7.2 
Remove legacy code

Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-20 13:29:11 +01:00
Orgad Shaneh
0c92cb015f Git: Simplify cloning of a specific branch 
Delete master branch option is removed since the master branch
is not created when specifying a branch to clone

Change-Id: Ided5e28a40ad459dcfaa3ef91ffa7c24e585d0ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 20:18:39 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
 2013-02-18 14:16:53 +01:00
Orgad Shaneh
4e3f83e388 Git: Mute status calls 
Called from several places for which popping the pane is strange

Change-Id: Ib83cb51e7926a6b27ff59631f6f4452a41f6a950
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:19:28 +01:00
Orgad Shaneh
95a18afc7d Git: Logically reorder fields in change selection dialog 
Initial focus should be on change, not on the button box

Change-Id: I72cc8f887e3dbaba2db909d207432ab369ec572d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:19:23 +01:00
Orgad Shaneh
7f2191ddb6 Git: Disambiguate file argument on log 
Change-Id: Ie89dc32b59af8900764e2af4b8b93354a6c56a51
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:06:21 +01:00
Orgad Shaneh
610a355eb3 Git: Fix cherry-pick/revert commit resolving on conflict 
Change-Id: I3dee32864f1000afce098c1716307929b4da2462
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:06:12 +01:00
Orgad Shaneh
e5e384a237 Fix popping a saved stash 
stash pop accepts only explicit object (stash@{N})

Change-Id: Ie3d40173ffd94849bde30076235f65d5e4e92cc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:05:54 +01:00
Tobias Hunger
6f0294b03d Git: pull --rebase when appropriate 
Task-number: QTCREATORBUG-8732

Change-Id: I510ac93b118e93cba591c4717cb6779d64869be1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-14 15:36:30 +01:00
Orgad Shaneh
0e86785019 Git: Preserve multiple branches that link to the same commit 
If remote HEAD commit is referenced by multiple branches, only the last
one is currently listed

Change-Id: Iac689125610aaf49c0bc31285a0d283fd48a271c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-14 15:00:18 +01:00
Orgad Shaneh
976c052c0b Git: Remove debug output 
Change-Id: I5610ce9117c997a82ce8d28ff2440bebd28d9181
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-13 21:12:01 +01:00
Tobias Hunger
83d6e81d94 Vcs: Remove "waiting for data" when process fails 
Task-number: QTCREATORBUG-7946

Change-Id: Ic3c3ceddd3b4bf115a1da78a5b5e5b640dbbd1f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-13 12:53:21 +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
c68adbf9c0 Git: Enable skipping a commit on rebase 
Change-Id: Ib83ca453c86b93cb359a2a0a9774c7d39533be4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:31 +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
Leena Miettinen
6b27295b92 UI text: edit merge tool message 
Change-Id: I225f4ec11bc365b48b9f18ae993cbd7dd52f1a7c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-12 17:05:41 +01:00
Leena Miettinen
1dbb3083bd UI text: fix capitalization of Gerrit strings 
Change-Id: I3cbddc2634a5eabd45dee8efe0c79b7b53a133b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-02-12 16:02:36 +01:00
Orgad Shaneh
2c68c80196 Git: Make file state resolving more accurate 
Change-Id: I238ef964df126a341c87dacf9344ff1570f31845
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-11 11:10:11 +01:00
Orgad Shaneh
ae58073080 Git: Add test-case for untracked file 
Change-Id: I29e0e470c926d1051cc892fbd39874d8b071268c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-11 11:10:05 +01:00
Orgad Shaneh
7eebf9abba Git: Fix preserving selection from previous submit editor 
Change-Id: Ideab3cb6c9250ab45f4a896e21ffd6007d810158
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-11 11:09:54 +01:00
Leena Miettinen
2473349c3d UI text: fix git cherry-picking strings 
Fix grammar and capitalization.

Change-Id: Iccabb01c72783f486cdb7d574c2cbb942d4d1cfe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-09 19:27:47 +01:00
Leena Miettinen
81a69f3e42 UI text: fix Git messages 
Fix capitalization and punctualization of Git messages.

Change-Id: I76de86dc87727b17eca6d0deabc530f889fa284e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-09 19:27:03 +01:00
Oswald Buddenhagen
b3c017c341 Merge branch '2.7' 2013-02-07 10:20:03 +01:00
Daniel Teske
d7b76a47d3 Git Locator: Add "git show" 
Change-Id: Id42c285ed4f31a5a1ad0288166fecff4ac630561
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-05 15:04:44 +01:00
Yuchen Deng
79e8f88536 Git: Fix log encoding 
We should using "i18n.logOutputEncoding" as we can.
In default, it should be 'utf-8'.

Change-Id: Ic5af2869e5fd5273a712f28e8e59149a4c2ef2b7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-05 10:50:12 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +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
Orgad Shaneh
8f4817152c Git: Add subject to log combobox 
Change-Id: Icb76ad1c0783615172d929e8cf402feaffaddbdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-30 10:26:58 +01:00
Orgad Shaneh
7cb80f0e16 VCS: Use entries combobox for log 
Tests included

Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-30 10:26:31 +01:00
Orgad Shaneh
ea33bed564 VCS: Un-static testDiffFileResolving 
Change-Id: I43c40585e5ac50369422d78f74240d7249be95ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-30 10:26:07 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
c57e6029c6 Gerrit: Use GitClient functions for checkout and cherry-pick 
This is cleaner, and for cherry-pick also handles conflicts

Change-Id: I50a7035c532a2cfa07fdd960e70ffb4af666a80e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-24 13:47:57 +01:00
Orgad Shaneh
cf5f109b68 Git: Remove "Branch" from synchronousCheckoutBranch 
Other refs can also be checked out using this function

Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-24 13:25:06 +01:00