Commit Graph

2048 Commits

Author SHA1 Message Date
Orgad Shaneh
d24e509662 Gerrit: Some more cleanup
* Remove qualification for types in Gerrit::Internal
* Remove action/command pair. Action is stored in Command.

Change-Id: I946bedd3909e217279e9d7a538e8460e0a61de0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-07 10:14:32 +02:00
Orgad Shaneh
c79413a4bd GitPlugin: Reserve enough entries for repository actions
There are currently ~40 actions. Reserve some extra for future use.

Change-Id: I50284105f4f11df43ed5fb8b246b4a457f2447c1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:07:48 +02:00
Orgad Shaneh
17d2605951 Git: Disable "Actions on Commits" when there is no repository
It does nothing in this case anyway

Change-Id: I9b8ab5280375f10b3bd943855648a0a2946a4094
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:07:29 +02:00
Orgad Shaneh
0eb363f959 Gerrit: Use current top level as default repository
* Remove repository setting
* Disable Gerrit menu entry if there is no top level

Change-Id: Ie3f4ca36ae4e7b350034dea7a0de52382da94e90
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:06:50 +02:00
Orgad Shaneh
f7db3258b4 Gerrit: Remove the "Always prompt" setting
It's confusing. The user can just choose the path in the dialog rather
than in a popup

Change-Id: I91422ec9baf5508d3e3d2e552afc6b955fd84748
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:06:35 +02:00
Orgad Shaneh
e75cd440ed Gerrit: Cleanup GerritPlugin
* Use Git::Internal namespace
* Use a static function for accessing GitClient
* Avoid needless data() calls for QSharedPointer

Change-Id: I590b75bbee4831be368894c1844c29237e7800eb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-03 08:43:04 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Orgad Shaneh
187bb36945 Git: Continue command after failed merge tool attempt
Change-Id: Ic3b7d4aee51897e226a78979bbecb82f06095b2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-27 15:11:44 +01:00
Orgad Shaneh
5101938974 Git: Remove branches from show header
It is too slow on large repositories. Will be revived in 3.2 with a
trigger button.

Task-number: QTCREATORBUG-11293
Change-Id: I6ba2028b280821b2acb49b7664ec9ece063c8981
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-24 13:25:35 +01:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Orgad Shaneh
d72b4851b4 Git: Avoid QByteArray -> QString -> QByteArray conversions for encoding
Change-Id: Ib2eb3000a08021336c9071d35d499371c9b88976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:30:09 +01:00
Orgad Shaneh
e6d0e6872d Git: Replace QStringList with QString in readConfig
All the calls pass a single argument

Change-Id: I95a7c44114ff2bb38cd65ab79a1e455dc969a62b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:28:41 +01:00
Orgad Shaneh
0d61ddce84 Git: Consolidate codec configuration retrieval
Change-Id: I6c099a5d0e4ffa180289bbecfe6d552b39d4aeaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:27:47 +01:00
Orgad Shaneh
7872981d62 Git: Simplify commit message codec handling
Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 13:44:58 +01:00
Orgad Shaneh
ca5d52fee9 Git: Open untracked files on double-click
Task-number: QTCREATORBUG-6612
Change-Id: Ic56f4cd20063c9d4d05316607636aa3df1d1a5a3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 12:00:25 +01:00
Andre Hartmann
ae09c33fdf Git: Use commit encoding for git show.
At least for the Side-By-Side Diff for now.

Task-number: QTCREATORBUG-11115

Change-Id: Ic7cb91f48ca810a99c39b2d00acc0cf227d051be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:54:04 +01:00
Orgad Shaneh
e568d14b36 Git: Use commit encoding for interactive rebase and commit editors
Task-number: QTCREATORBUG-11115

Change-Id: Ie922d94d66bed2882d3fc2b8b2de1bdc328d4d1c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:40:24 +01:00
Orgad Shaneh
86d7916b5b Git: Factor out commitEncoding
Task-number: QTCREATORBUG-11115

Change-Id: I58f3759c13d963aaf3e7891d7cc0a41c1ae14ecd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:39:54 +01:00
Robert Loehning
991e1bfa0a VCS: Fix message in GitClient
Change-Id: I1184b15a8b225430b59e0abb35cd9395cb7d1850
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-17 21:12:36 +01:00
Jarek Kobus
2c42b06f00 Fix some strings.
Change-Id: Iaac415d25ebfac507df73fc4b3977425df521979
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-14 15:57:28 +01:00
Jarek Kobus
96a3fd53e8 Fix tooltips, add lacking dots
Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-13 12:06:27 +01:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-12 12:06:10 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1'
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
2014-03-11 13:39:55 +01:00
Tobias Hunger
02b3a79c5f VCS: Open diff/blame editors in other split
... if there are other splits that is.

Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 16:02:14 +01:00
Tobias Hunger
c9b6897e78 EditorManager: Add OpenEditorFlags to openEditorWithContents
This requires moving the activateEditor call into openEditorWithContents.

Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.

Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 15:56:43 +01:00
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document.
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 16:27:52 +01:00
Tobias Hunger
bddf1d1101 Git: Report additional search paths
Change-Id: I07d9ea0946ec44b4d1a7d7d02b1f50dbaf78f6e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-05 14:00:43 +01:00
Sergio Ahumada
c375436847 Fix some typos
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 09:39:42 +01:00
Friedemann Kleint
b653ca1f18 Revert "Git: Replace %n with %1 in string"
This does not work, it needs to be either:

("%1").arg(n) or ("%n, 0, n)

The %n syntax is preferred here since although there probably
are always > 1 elements, some languages use different grammatical
cases for various numerical ranges (Russian, Polish).

This reverts commit c09e80b853.

Change-Id: Id3f480f0ec0de2dd8893b8de256c5e6c9628a6f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-28 15:35:32 +01:00
Orgad Shaneh
c09e80b853 Git: Replace %n with %1 in string
There is no plural form in this message

Change-Id: I85b584d4e53e68128279d50cb6b63e259f7a35b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-28 10:37:56 +01:00
Orgad Shaneh
1817c48c7b Git: Use git describe for topic before falling back to "Detach Head"
Change-Id: Iaf8be78ac3b6119f01ad3491eec7eccfa5f45e26
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:54 +01:00
Orgad Shaneh
f74021260a Git: Reorder buttons in branches dialog
Reset works on current branch by the contents of another, like Merge and
Rebase.

Change-Id: I904823c177dd3c79ff8e1f49fe32d82be9bb8797
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:27 +01:00
Orgad Shaneh
4465276e10 Git: Conditionally enable Reset button in branches dialog
Conditions:
* There is an active local branch
* The selected node is a leaf
* The selected node is not the active branch

Change-Id: I539dd13750737934378e503484646634e50a1aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:04 +01:00
Orgad Shaneh
cb7f9fe496 Git: Remove refs/heads/ prefix from reset message in branches dialog
Change-Id: Ia93cbb52038c1ea29f5fa441c9eb0e88cb11d9aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:42 +01:00
Orgad Shaneh
5c942d04c5 Git: Suppress show-ref command logging
Yet another plumbing command...

Change-Id: I88ba2349d8c15e47372addb3034f1bed2de170f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:38 +01:00
Orgad Shaneh
18906fac4f Git: Protect against removal of the "Local Branches" node
... When a single local branch is being removed

Change-Id: I4321d045ebb6faaf5f864ff33cb4f34c15d2264b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:12 +01:00
Tobias Hunger
d967b6413f Git: Add reset button to branches dialog
Task-number: QTCREATORBUG-11391

Change-Id: I5146a8b00a88124f96c788cba2bbfa786618ee20
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-25 15:44:10 +01:00
Lorenz Haas
ac70c168da Optimize usage of QPalette
setPalette() does not replace the old one but rather adds the
difference. Thus a previous copy of the palette is unnecessary.

Change-Id: I5c06da456b76144efc4a984ccda13c7d2243a7bc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-21 08:53:28 +01:00
Orgad Shaneh
cd48c5e513 IVersionControl: Implement topic cache in the base class
Derivatives need to derive TopicCache, implement its pure virtual
functions and pass it in IVersionControl's constructor.

Change-Id: I3a904c84541fda95eee75296f86441c4bae55d79
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-19 09:25:31 +01:00
hjk
c68ebeed2e QtcProcess: Introduce a QtcProcess::Arguments class
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.

As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.

Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-19 09:19:28 +01:00
Orgad Shaneh
c43db28195 Git: Fix wrong variable name
Change-Id: Ie79fddadc6835805f1fa6e811592c30cf32e5c9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-19 08:36:06 +01:00
jkobus
73cf43f323 Add DiffEditorManager, refactoring.
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).

Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-18 13:46:49 +01:00
hjk
a74de6af81 Utils: Merge FilterLineEdit into FancyLineEdit
Change-Id: Ic53836dade3985c36b0f6767e43b5af0ddb80d72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-14 16:58:43 +01:00
Orgad Shaneh
48a5fb4b13 PushToGerrit: Do not calculate number of commits for empty input
Change-Id: Ib2e5305dd47b486a963edf5bb04e6d16d76d5e68
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-14 10:38:34 +01:00
Orgad Shaneh
5a562e9239 PushToGerrit: Pass local branch to determineRemoteBranch
Simpler

Change-Id: Ice180200a1b78e57b8ff6b246db7b2e8f3b39eb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-14 10:38:30 +01:00
Orgad Shaneh
0c6ee31684 Git: Fix target branch auto-detection in Push to Gerrit
Initialization order is important.

* updateCommits populates the LogChangeWidget.
* determineRemoteBranch looks up by earliest commit (for which the
  LogChangeWidget must already by populated)
* Assignment to m_suggestedRemoteBranch must come before calling
  setRemoteBranches
* remoteComboBox was wrongfully used instead of targetBranchComboBox

Change-Id: Ib0db057313c8fd65910b0ec7394b6b8c7d997dab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-14 10:38:24 +01:00
Orgad Shaneh
635a355f97 Git: Suppress "No local commits" error message in Push to Gerrit
Change-Id: Ib0cf79acf48d24848fda92a8b7b06efe62b46dbc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:45 +01:00
Orgad Shaneh
b7d2268ff3 Git: Suppress log output in LogChangeWidget
It's distracting

Change-Id: I6c522ee61ba7261611002bf40c01a9d1d23a0259
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:42 +01:00
Orgad Shaneh
0bb318939b Git: Suppress for-each-ref
Another plumbing command

Change-Id: I1450baae370e46e8daf5c440def7e9f04d9d01bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:37 +01:00