summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitclient.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Refactor source propertyjkobus2013-12-191-1/+1
| | | | | | | | Get rid of source property out of DiffEditorWidget, attach dynamic property when it's needed instead. Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Enable choosing non-fast-forward mergeOrgad Shaneh2013-12-091-3/+17
| | | | | | | 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>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-051-1/+1
|\ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
| * Limit cdUp to rootOrgad Shaneh2013-12-031-1/+1
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-10860 Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-291-9/+21
|\ \ | |/
| * git: Suppress stderr when running diff on Windows.Friedemann Kleint2013-11-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Change GitClient::executeGit() to take flags instead of bool.Friedemann Kleint2013-11-281-7/+11
| | | | | | | | | | Change-Id: I3cb83914be7e9665f49baf9f563c753c6c3919f1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-221-1/+1
|\ \ | |/
| * Git: Fix ability to open file on double clickPetar Perisin2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-191-9/+3
|\ \ | |/
| * Git: Really add new/existing filesOrgad Shaneh2013-11-181-9/+3
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-10117 Change-Id: Ic254cb2f7860ca0973cfda58cf66f62b1b8eaeb7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-151-16/+3
|\ \ | |/ | | | | | | | | | | Conflicts: share/qtcreator/debugger/gdbbridge.py Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
| * Braces cleanupOrgad Shaneh2013-11-141-2/+1
| | | | | | | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
| * Git: Suggest mergetool on stash restore conflictsOrgad Shaneh2013-11-091-14/+2
| | | | | | | | | | | | | | Removed warning popup, but stderr is still visible in Version Control pane Change-Id: I6f5779f0382b8ead1e7140eb6ad533ea0c91dcc2 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Fix build.Christian Kandeler2013-11-111-1/+1
| | | | | | | | | | Change-Id: I55d90f3030c97871ecc931a629b2358f9a5e6144 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Git: Allow push after fixupPetar Perisin2013-11-081-4/+15
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-291-2/+2
|\ \ | |/
| * Remove most leading/trailing blanks from translated messages.Friedemann Kleint2013-10-241-2/+2
| | | | | | | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I363138212b692cf75fe1605df8af3721315d37e1 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Git: Create local branch after checkoutPetar Perisin2013-10-291-4/+64
| | | | | | | | | | Change-Id: I2f9c47862304773234612250bb1e3e2e759a159e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Git: Refactor revParseCmdPetar Perisin2013-10-291-20/+21
| | | | | | | | | | Change-Id: I5125694ba334e2f3774ed19c64d671d3cb726bf4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-241-7/+7
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri src/plugins/qnx/qnxutils.cpp Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
| * Git: Fix popup message for mergePetar Perisin2013-10-221-5/+5
| | | | | | | | | | | | | | | | 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>
| * Remove most trailing newlines from translated messages.Friedemann Kleint2013-10-221-2/+2
| | | | | | | | | | | | | | | | | | 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>
* | Git: Set commit log encoding to 'UTF-8'Leo.Lei2013-10-181-0/+5
|/ | | | | | | | 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>
* Git: Standardize error message handlingPetar Perisin2013-10-161-171/+99
| | | | | | Change-Id: I5574abf0acf7ed430f5f7f3b89ebcbddb31f3016 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Do not try to add files that are already trackedOrgad Shaneh2013-10-111-0/+9
| | | | | | | | 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>
* Git: Always set working directory for created editorsOrgad Shaneh2013-10-101-0/+3
| | | | | Change-Id: Ie4bec25ee56a3832d0c373c045662c13a8520c13 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Rename diffBaseDirectory -> workingDirectoryOrgad Shaneh2013-10-101-5/+5
| | | | | | | Can have other usages than diff Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Pass workingDirectory for annotateOrgad Shaneh2013-10-101-5/+5
| | | | | | | | | | 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>
* Git: Fix compiler warningsOrgad Shaneh2013-10-071-5/+2
| | | | | | | Unhandled enum values in switch Change-Id: I6533d8773ff4fa663a1e33c1f95c81f53790b642 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Git: Disallow Commit and Push if rebase is in progressOrgad Shaneh2013-10-051-0/+9
| | | | | Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Git: Move hasRemotes out of panel dataOrgad Shaneh2013-10-051-1/+1
| | | | | | | | | 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>
* Git: Allow direct push after commitAndre Hartmann2013-09-301-0/+2
| | | | | | | | | | | 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>
* Git: Remove setting for side-by-side diffOrgad Shaneh2013-09-301-56/+33
| | | | | | | | 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>
* VCS: Abort previous command for the same editorOrgad Shaneh2013-09-301-2/+5
| | | | | | | | | | | | 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>
* Changing diff editor's parameters shouldn't switch diff typejkobus2013-09-271-4/+7
| | | | | | | Task-number: QTCREATORBUG-10221 Change-Id: I215460b11fa02605151523c8d4439b369fe7c3aa Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Support staging a single chunk.Francois Ferrand2013-09-261-2/+7
| | | | | | | | | 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>
* Close the other diff view when switching between diff viewsjkobus2013-09-241-0/+3
| | | | | | | Task-number: QTCREATORBUG-10203 Change-Id: If15fac2743768572d02ce9962b54dfaab4ca1af3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Preserve source for state recoveryOrgad Shaneh2013-09-131-1/+9
| | | | | | | Task-number: QTCREATORBUG-10126 Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git Show: Use %n for message and add Linguist comment.Friedemann Kleint2013-09-131-1/+2
| | | | | | | 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>
* Git: Fix crash on diffOrgad Shaneh2013-09-121-28/+12
| | | | | | Task-number: QTCREATORBUG-10138 Change-Id: I7c7f054e6253c677b52a3ea24d7ace562f1ad4af Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* VCS: Remove dead codeTobias Hunger2013-09-121-20/+0
| | | | | Change-Id: I9505cdd4c59f8f66e686945a3340990b195fcb55 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Apply 'static' pattern to VcsManagerhjk2013-09-031-2/+2
| | | | | | | Adapt user and surrounding code. Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Update progress bar for commands that output progressOrgad Shaneh2013-08-301-0/+22
| | | | | Change-Id: I643df94c72068259817092d7d48f71984288fdb5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add a toolbutton for switching diff view modejkobus2013-08-301-114/+332
| | | | | | | | Task-number: QTCREATORBUG-10035 Change-Id: I83cb7cec3f4ba484ab068f398a12096501017668 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Some cleanup for branches on showOrgad Shaneh2013-08-301-6/+11
| | | | | | | | * Suppress command logging * If no branches are found, do not add "Branches:" line Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Invert Command -> runVcs dependencyOrgad Shaneh2013-08-301-7/+6
| | | | | | | | | * 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>
* Git: Use default show format for diff viewerOrgad Shaneh2013-08-291-1/+1
| | | | | | | | 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>
* Git: Extend show output on diff editorOrgad Shaneh2013-08-281-2/+32
| | | | | | Change-Id: I51d3d0af96b28ec56bedaac163f9ce72158d8dc2 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: List branches on showOrgad Shaneh2013-08-281-4/+20
| | | | | | Change-Id: Ie69a58efc7068c699abf0e3d396216d9809346f4 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
View Lorry Controller Status