Commit Graph

527 Commits

Author SHA1 Message Date
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
072d551c73 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
2013-12-05 11:58:42 +01:00
Orgad Shaneh
0a71091260 Limit cdUp to root
Task-number: QTCREATORBUG-10860

Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-03 14:42:07 +01:00
Eike Ziller
0e4de8c108 Merge remote-tracking branch 'origin/3.0' 2013-11-29 11:50:41 +01:00
Friedemann Kleint
6ec8838f68 git: Suppress stderr when running diff on Windows.
When using autocrlf, warnings
"LF will be replaced by CRLF in ..."
occur, causing the command window to pop up, which is not
desired.

Change-Id: I399080a98f9386dbbaff2c90c6d4ba4877d08057
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-28 13:41:52 +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
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
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
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
e31426366b Git: Refactor revParseCmd
Change-Id: I5125694ba334e2f3774ed19c64d671d3cb726bf4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-29 07:26:51 +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
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
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
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
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
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
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
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
Orgad Shaneh
003e25d488 VCS: Abort previous command for the same editor
It is very common to have output from a previous (longer) command appear
instead of the newly created one.

For example: Open a log. Check "Show Diff" and immediately uncheck it.
If this is done fast enough (or with a high Log Count limit) the output
with the diff will appear instead of the normal log.

Change-Id: Ie64cc4a383a261f5328a4d0486eec93f73766679
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-30 16:36:00 +02:00
jkobus
f8799a5583 Changing diff editor's parameters shouldn't switch diff type
Task-number: QTCREATORBUG-10221

Change-Id: I215460b11fa02605151523c8d4439b369fe7c3aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-27 08:54:43 +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
jkobus
aa32c2be87 Close the other diff view when switching between diff views
Task-number: QTCREATORBUG-10203

Change-Id: If15fac2743768572d02ce9962b54dfaab4ca1af3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-24 09:12:23 +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
Friedemann Kleint
4f9594ad03 Git Show: Use %n for message and add Linguist comment.
Change-Id: I09af9ea6531af2f768e393f37e28962860b47e5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-13 10:12:26 +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
Tobias Hunger
9e93082344 VCS: Remove dead code
Change-Id: I9505cdd4c59f8f66e686945a3340990b195fcb55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-12 10:30:41 +02:00
hjk
267e441af4 Apply 'static' pattern to VcsManager
Adapt user and surrounding code.

Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:01:24 +02:00
Orgad Shaneh
fc6ff05472 VCS: Update progress bar for commands that output progress
Change-Id: I643df94c72068259817092d7d48f71984288fdb5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 12:19:25 +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
47b01acd32 Git: Some cleanup for branches on show
* Suppress command logging
* If no branches are found, do not add "Branches:" line

Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:42:38 +02:00
Orgad Shaneh
f2e4b2b9c8 VCS: Invert Command -> runVcs dependency
* Unclutter runVcs
* Enable more dynamic signal/slot usage in Command

Change-Id: Ie97b17078778b0c86b74d5725a78e766828ac6d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:11:56 +02:00
Orgad Shaneh
a60cf5d0fa Git: Use default show format for diff viewer
The widget is quite small, no reason to load it with
(normally useless) data

Change-Id: I092233124505f64d05a49d9da6463b64bbb398bb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 10:57:18 +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