Commit Graph

2048 Commits

Author SHA1 Message Date
Eike Ziller
559e66cb35 Merge remote-tracking branch 'origin/3.0' 2013-11-22 09:11:51 +01:00
Petar Perisin
390e90a07a Git: Fix ability to open file on double click
since show can be called with file name as source, we get its
repository as source in diffhandler

Task-number: QTCREATORBUG-10780
Change-Id: Ib0076c583eb5d43e66deb68adfdff1d25fc5a798
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-11-22 05:08:35 +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
4442a92729 Braces cleanup
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-14 08:13:52 +01:00
Orgad Shaneh
f18bc27a39 Git: Preserve check state for untracked files
Untracked files always appear last, so filename comparison fails for
them.

Change-Id: I6e0addaddec7ca423b3d63e3e71fe00dbc6ca95e
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-11 14:08:34 +01:00
Christian Kandeler
4c0d07a9aa Git: Fix build.
Change-Id: I55d90f3030c97871ecc931a629b2358f9a5e6144
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-11-11 11:35:25 +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
Eike Ziller
49b7e95e7f Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
2013-11-06 14:02:08 +01:00
Orgad Shaneh
6bdb402f31 Git: Prefer first match on Push to Gerrit with detached head
Following matches are likely to be merges, and not the branch that the
first commit originated from.

Change-Id: I80a442bf9f7bc7f5859a1f4c3d3e167d55b28241
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-11-05 11:57:07 +01:00
Eike Ziller
242b7bd209 Merge remote-tracking branch 'origin/3.0' 2013-10-29 08:17:05 +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
ba4473aa45 Git: Disallow whitespace in topic on Push to Gerrit dialog
Change-Id: I02416c8a55fcdfdea1cbe349f7e78204c0200fd9
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-28 22:29:29 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
Eike Ziller
c3119d1aa7 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
2013-10-24 08:56:29 +02:00
Petar Perisin
ab71755326 Git: Fix popup message for merge
Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-22 20:42:50 +02:00
Eike Ziller
1eb88443d7 Merge remote-tracking branch 'origin/2.8' into 3.0 2013-10-22 11:38:21 +02:00
Eike Ziller
4eabcdc8fd Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
2013-10-22 08:40:59 +02:00
Friedemann Kleint
50f522b2f7 Remove most trailing newlines from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 08:05:09 +02:00
Leo.Lei
f5f2993658 Git: Set commit log encoding to 'UTF-8'
To solve displaying error of commit log with non-latin characters
in the commit description editor.

Change-Id: I8fd4ccdd82c0e5a286fe7d9f694b80915ef477ff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 04:18:51 +02:00
Orgad Shaneh
9ef8d71e2c Git: Indicate affected commits for range operations
* Reset: Strikethrough discarded commits
* Interactive Rebase: Mark included commits
* Push to Gerrit: Mark pushed commits

Change-Id: I5599a72055fd94b88c55b74b3a1116c07e35c113
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-17 16:39:08 +02:00
Orgad Shaneh
089c5dd927 Git: Open LogChangeDialog on top of the main window
Change-Id: I9fe92f4e1e91e7a4a80a34e802d0d6b8d92b77e4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-17 16:38:07 +02:00
Orgad Shaneh
a64adc4cd1 Git: Fix crash on show stash
* show() is called with a QString reference to the model
* And editor is opened, which triggers stateChanged()
* stateChanged() updates StashDialog, which refreshes the model with an
  empty directory (another bug)
* The QString name reference is invalidated => crash on access

Task-number: QTCREATORBUG-10397
Change-Id: I0c4077f8c4fc90905568f80d1cd89f61c4cd2cba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-17 10:46:19 +02:00
Petar Perisin
7da9ad56c8 Git: Standardize error message handling
Change-Id: I5574abf0acf7ed430f5f7f3b89ebcbddb31f3016
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-16 10:34:42 +02:00
Orgad Shaneh
a5c970bea2 Git: Rename widget member to m_widget
Follow coding style

Change-Id: I9583cdfc7ec32140614beb8684d3f15344fa7135
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-16 09:01:08 +02:00
Tobias Hunger
741ab2cbfb Vcs: Remove snapshot support
The functionality is unused.

Change-Id: I45017106509b8dbff9f3eff3aaef6de19be31ce7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-15 16:53:58 +02:00
Orgad Shaneh
b034b0b955 DVCS: Never prompt before committing
Commit is local. There's no reason to prompt.

Change-Id: I3aed5ad4931bc49c62d52f906100273739f4af89
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-11 16:40:56 +02: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
2559f98693 Git: Improve branch name validation
* Do not allow leading dash
* Do not allow existing local branches

Change-Id: I3efbb90b7099719a7e90cada85a58a0f91bd9730
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-10 19:00:09 +02:00
Orgad Shaneh
5e585b9eee Git: Support annotate revision for renamed files
Change-Id: I6993cdd6f91f29b6f4e990cc5ba332ff63f7ed9f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-10 19:00:01 +02:00
Orgad Shaneh
2a54270525 Git: Always set working directory for created editors
Change-Id: Ie4bec25ee56a3832d0c373c045662c13a8520c13
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-10 18:59:55 +02:00
Orgad Shaneh
2da85dc686 VCS: Rename diffBaseDirectory -> workingDirectory
Can have other usages than diff

Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-10 18:59:50 +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
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:56:12 +02:00
Leena Miettinen
9230c3b9cd Git: fix UI text capitalization and punctuation
Change-Id: I855c35e2e30b04c97b45f1eecec86ad4bf86750d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-10 09:33:29 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property.
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-09 18:08:56 +02:00
Orgad Shaneh
1ca6842bcd Git: Fix compiler warnings
Unhandled enum values in switch

Change-Id: I6533d8773ff4fa663a1e33c1f95c81f53790b642
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-07 12:02:39 +02:00
Orgad Shaneh
1f0cbbc807 Git: Disallow Commit and Push if rebase is in progress
Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-05 19:15:17 +02:00
Orgad Shaneh
c07eaa2a25 Git: Move hasRemotes out of panel data
It is input only, and doesn't belong to the panel

Also rename it enablePush

Change-Id: I9d5e2246ce76854a54b02e69980214dd35a402ee
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-05 19:15:11 +02:00
Orgad Shaneh
82d4afcba9 Git: Cleanup id comparison
Change-Id: I4aefbd9ec900c54a5cdf5ae83519a07f4e768282
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-02 21:52:09 +02:00
Orgad Shaneh
ef98345241 Git: Readd shortcuts for commit
Change-Id: I290d2fb265df29c3cce44fae85af2366ac918e99
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-02 14:23:54 +02:00
Petar Perisin
6cf030d8d3 Git: Rename push enum values
Change-Id: I2809096774882ba1e7e98e2805ad94f03a70dbdc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-02 08:42:03 +02:00
Orgad Shaneh
13a0b348be Git: Revive ChangeSelectionDialog UI file
Much easier to maintain, real logic is more readable

Change-Id: I7c5f7854ea9ee67a3e1eb7a328702fc19852fdb5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-01 23:14:35 +02:00
Andre Hartmann
9654df9f1f Git: Allow direct push after commit
Git commit dialog: Added a drop-down menu to the commit button to
execute "git push" or open the "Push to Gerrit" dialog directly after
a commit or amend.

Task-number: QTCREATORBUG-8854
Change-Id: I00ff8f816d1768e0cdaf6929126b55826788e578
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-30 19:20:11 +02:00
Orgad Shaneh
e81152acd5 Git: Set default button for change-related actions by triggering action
Change-Id: I536618e9b80f3ed213c6c54dd6c2becbb64c709b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-30 16:37:29 +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