Commit Graph

130 Commits

Author SHA1 Message Date
Friedemann Kleint
3c13f9484f Gerrit: Display dependent changes as tree.
Add a depth member to GerritChange indicating the tree depth
and populate it by searches over the dependent changes.
Display the root changes sorted by date and add dependent changes
to their deph=1 parent, avoiding deeply nested items.

Change-Id: I66ccf392ce47514841c661820797e81996e9e5cc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-23 13:58:14 +02:00
Friedemann Kleint
bb4031dccf Gerrit: Refactor preparing the introduction of a hierarchical model.
Change model and dialog methods to use QModelIndex and remove
obsolete methods. Split out method to populate a list of standard items
from a change. Change GerritModel::itemForId() to recurse
over the tree.

Change-Id: I9393f498ffbdf63ba3ad78146d041bcda3835527
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-20 15:24:53 +02:00
Friedemann Kleint
ded93b43d2 Gerrit: Read out dependency information.
Pass on the command line argument --dependencies to the client,
read out dependent/needed by changes and display them in the
detailed text view. Move the toHtml() method from GerritChange to
GerritModel to be able to display titles of dependent changes.

Change-Id: I1d0b67a995d45a9fe5b7bdb3ff51cc905d58478f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-06-19 15:11:24 +02:00
Eike Ziller
063b95d970 Use more descriptive progress bar titles
Change-Id: I70450a2aa675d69f820de48dd75909f36051efe0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 14:32:25 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
hjk
98917598d3 ProjectManager: Use Core::Id for progress types
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 14:59:06 +02:00
hjk
df36184371 Core: Static pattern for ProgressManager, clean up all users
Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-02 12:41:47 +02:00
Erik Verbruggen
0e62487fb3 Git: fix compilation failure in Qt4 specific code.
Caused by 762099487c where a memory pool
was introduced to fix memory leakage.

Change-Id: Ib2f7c53e9560ff473fcdfedd6dcfce50455095da
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-17 14:31:46 +02:00
Orgad Shaneh
74a512892a Git: Use Git process environment for Gerrit plugin processes
Change-Id: Iab0124d3aeed189c5ffd900c02ce6b87293b9c79
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-17 11:42:14 +02:00
Friedemann Kleint
9393335c1d Clean headers in Git.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 15:10:02 +02:00
Friedemann Kleint
281b2332d2 Fix Krazy warnings about includes/header guards in version control.
Change-Id: I75f2040e9b3dd5d9786faf2e829ec808af7f1304
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-12 13:56:47 +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
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
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
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Friedemann Kleint
0f27043fe6 Add a timeout to the gerrit query process.
Task-number: QTCREATORBUG-7977
Change-Id: I35c3e6f916a690595a6fc03ad3a995b361c76f54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-08 15:55:15 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Friedemann Kleint
236980eaa1 Gerrit: Make column headers and tooltip consistent.
Use terms from the Gerrit web interface (except '#').

Change-Id: I1a8af47122e17f9e3daf2a19967ee1dc165e0ea5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-30 16:25:41 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Orgad Shaneh
7c77331ea4 Gerrit: Replace 'additional queries' with a query completer
Change-Id: Idbc3f0a0dc47c63eb02ee105965ec52fda712f84
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-04 09:20:39 +02:00
Orgad Shaneh
cb8c8ca19e Gerrit: Allow custom query
Change-Id: I8ee0967a8f0013c785bc4d6e98ff7b634f488e97
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-04 09:20:27 +02:00
Orgad Shaneh
e6820b741d Gerrit: Simplify query model
Use plain QString for queries instead of QStringList

Change-Id: Ia8a9086937fa34bce91d62d7434b26aa33b41163
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-11 17:44:15 +02:00
Friedemann Kleint
3815988c8a Gerrit: Make number a URL.
Change-Id: I15e07746290241ae10f0c9ecaaad1be5d86ed76c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 12:51:07 +02:00
Friedemann Kleint
615f35f144 Gerrit: Fix compilation with MSVC2010, Qt 5.
Change-Id: I8fe5047d99bcac8e81053f750d5ce038773a0ca2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 11:15:57 +02:00
Friedemann Kleint
f1b52256cd Gerrit: Add 'Details' text to dialog.
- Add a splitter and a text browser containing detailed text
  for the change using HTML links for email and URL, allowing
  for removal of 'Open', 'Copy URL' buttons.
- Remove large tooltip from list, rename methods to toHtml()
  and use them for the details text.
- Parse out reviewer email.
- Display approval level with sign.

Change-Id: I2d71a80bbe19643e5bfa9deeaaeb3650976f00b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 17:38:02 +02:00
Friedemann Kleint
37def2aa1c Gerrit: Differentiate by approval type.
- Parse approval type and description.
- Format tooltip as HTML table, listing approvals by type
- Format the approval column similar to the web view by
  type character.
- Fix the special character issue in Qt 4.8 (query tool
  actually outputs UTF8 instead of escapes).

Change-Id: I803f289a03c5a8ede0029d972a19381b5e783d36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 14:26:59 +02:00
Friedemann Kleint
d681bc10c9 Gerrit: Introduce bold marking of changes.
Owned changes: Mark using bold if approval != 0,1.
Changes for review: Mark using bold if review is missing.

Derive verbose user name from first query.

Change-Id: I0ba85c1c7fff088846261b3ba8c5dbaaf259db9a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-30 14:00:41 +02:00
Friedemann Kleint
dc327294d6 Gerrit: Fix tooltip.
Change-Id: I3ba09461226841c25f68c6d1f5bf8c45f4af588b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-30 11:29:28 +02:00
Friedemann Kleint
2193915cca Start on a gerrit plugin as a sub-plugin of git.
- Add a gerrit window that shows a list of changes
  and buttons to display, apply or check out
  a change.
- Uses the new Qt 5 Json API or the utils/json
  classes for Qt 4.

Tested-by: Tobias Hunger <tobias.hunger@nokia.com>
Tested-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I14c6c2c2de8f95fb785752c7319be8638b386a1e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-26 14:34:41 +02:00