summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add cmake build files4.10Eike Ziller2019-08-192-0/+37
| | | | | | Change-Id: I07353d37163807b9799d8336a9294a2bb99eaf6c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Adapt to upstream FileName changesEike Ziller2019-05-295-20/+20
| | | | | | Change-Id: I5b2a3ec17024fdc569df0c65f8d48564d5a3afea Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* FossilClient: De-noiseOrgad Shaneh2019-05-151-43/+45
| | | | | Change-Id: I9129d1e542073c2454ed1758af1b8dfc06ba0e1a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Adapt to masterOrgad Shaneh2019-05-142-2/+3
| | | | | Change-Id: Ie1b9f937fe2daaaa2a181d28aec8ba065aff9e3f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.9'Orgad Shaneh2019-05-134-8/+9
|\ | | | | | | Change-Id: I830c83b248b541cf4bd1a20f4cb0852b1174e0df
| * Adapt to 4.94.9Eike Ziller2019-05-133-7/+8
| | | | | | | | | | Change-Id: I9c413eaf6d70eaf09640aed349c876c040ef55ba Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Doc: Fix dependency to Qt CreatorTopi Reinio2019-02-131-1/+1
|/ | | | | | | | | As Qt Creator now uses $IDE_DISPLAY_NAME as the doc project name, it expands to 'Qt Creator'. QDoc then constructs the index file name as 'qt-creator', hyphenating the space. Change-Id: Ib818fc1a94b1e65bc568f2552eb721a634e68d7e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2018-10-041-1/+1
|\ | | | | | | Change-Id: If610433167a155e063b2d1f679cafd1e720d27a1
| * Adapt to master4.8Orgad Shaneh2018-09-211-1/+1
|/ | | | | Change-Id: Iee445c716469a4cc257c7eccc986a5e1d50411ff Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Create a correct editor for 'Log Current File'Artur Shepilko2018-09-061-1/+1
| | | | | | | - affects legacy versions of the fossil client Change-Id: I72a7eca4199fe3867fb82ff872d2bedecfd85ff3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add Reload button to Log and Diff editorsArtur Shepilko2018-09-021-0/+5
| | | | | Change-Id: I524f114c2642a793a06c03e18c1eeab019209fd7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add .gitignoreOrgad Shaneh2018-08-311-0/+10
| | | | | | Change-Id: I9e9662e4b7995d75aad50c205545bc4ca95c9e20 Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix build when using QTC_SOURCE environment variableOrgad Shaneh2018-08-291-0/+6
| | | | | | | | It was supported in the subdir, but not in the root project Change-Id: I41e17881fde097d5d2f506efc0c7c9d3fd4817a8 Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Suppress command output on revision queryOrgad Shaneh2018-08-281-1/+2
| | | | | | | | This is an internal operation, no need to log it. Change-Id: Ic031454904437fd648579b1d0922d73ce2259f64 Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt to upstream VCS changeOrgad Shaneh2018-08-283-32/+1
| | | | | Change-Id: I4097fb789a887e656d510a3fff67f5bf396a9a0a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.7'Orgad Shaneh2018-08-2812-26/+114
|\ | | | | | | Change-Id: I9120d22a327226a316489548fc0664aef4a7eb7e
| * Add support for annotation of any given revision4.7Artur Shepilko2018-08-087-25/+111
| | | | | | | | | | | | | | | | | | - Parent commits are also accessible from Annotate context menu - The client functionality was added in `fossil v2.4` Change-Id: Ia6096432cb1151388b5aebca30a6d25c1c6079f4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Allow to specify the plugin source commit-id used in the buildArtur Shepilko2018-07-271-0/+1
| | | | | | | | | | | | | | | | | | - The revision is appended to version string shown in details about plugin - Set FOSSIL_PLUGIN_REVISION qmake variable at the build time - Touch fossilplugin.h to make sure the plugin metadata is re-processed Change-Id: If3e788bc517c41e4439aa82958fd9bead86e8f63 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Update clone wizard iconsArtur Shepilko2018-07-273-0/+1
| | | | | | | | | | | | Change-Id: I45d1595094c132e28d714df00c3b480a9e7e33bc Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Update to use supportedProjectTypeArtur Shepilko2018-07-271-1/+1
| | | | | | | | | | | | | | - Same change as in qt-creator aa37df645d97698afe Change-Id: I1dfda4b8e7a9ce40954f5029efc2e51a5366b974 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-07-1932-48/+53
|\| | | | | | | Change-Id: Iab7c7446c31dd3debfe94624fb585f6ab694bbcd
| * Update copyright yearArtur Shepilko2018-07-1631-31/+31
| | | | | | | | | | Change-Id: I2b1db2013cad9d25d2a54439866aae63a62623f0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Adapt to QtCreator 4.7Artur Shepilko2018-07-134-17/+22
|/ | | | | | Change-Id: I9eb8d740e1ef33622a8ba15e4e832755f0141a94 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.5'4.6Eike Ziller2017-10-171-3/+4
|\ | | | | | | Change-Id: I0240e59cd1211ae15545064cb052131d02b1324a
| * Fix isVcsFileOrDirectory4.5Eike Ziller2017-10-171-3/+4
| | | | | | | | | | | | | | | | | | | | The method should return if the given path is a file or directory that contains the version control system specific data (like .git, .svn), so it only should return true for the fossil db file. Change-Id: I0211b117f43fbeda2c44e782927dbed6b5a19a21 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-115-34/+12
|\| | | | | | | Change-Id: I73f235d00d1f2cb0c0d8d55dc69f77c96aa0e8e9
| * Merge remote-tracking branch 'origin/4.4' into 4.5Eike Ziller2017-10-113-31/+10
| |\ | | | | | | | | | Change-Id: Id67fed3d81082f1bb68d92083222bcb7dcd9e825
| | * Adapt to changes in VcsBase4.4Eike Ziller2017-10-063-31/+10
| |/ |/| | | | | | | | | | | | | | | The VCS editors now directly keep a pointer to their editor config. Changed in qt-creator/a36536813f9aa00944fd8fcab2e2689a385d5387 Change-Id: Icd1c8b0628677b3b6da305ca294b2d67810c7992 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Adapt to change in VCS registrationEike Ziller2017-10-061-2/+1
| | | | | | | | | | | | | | Was changed in qt-creator/19c9194b117bf4d5a4d5ef19e6f9d84d92c67620 Change-Id: I1b6449d3435a418f7fdd1cc3b94c2e752c062672 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * Add missing overrideEike Ziller2017-10-061-1/+1
|/ | | | | Change-Id: I0202df0c8823203c8f1571b1866b911e784b9305 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-268-71/+156
|\ | | | | | | Change-Id: I944d289b40ea54afcb74864886375b6f240da3eb
| * Vcs: Jump to the current source line in Fossil Annotate editorv4.3.04.3Artur Shepilko2017-04-266-44/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Keep track of the current source line number and pass it to Annotate action. * Add a 'List Versions' toggle in Annotate editor to prepend a list of commits that make up the annotated source. * By default do not show the version list so that annotated line number could be matched to the source line. NOTE: VcsBaseEditorWidget::configurationWidget() query is no longer available, yet Fossil client needs it in order to process the effective arguments. So we re-implement it in FossilEditorWidget sub-class. Change-Id: Idc4c21d074ccf4e1c6d041cce2abceb78665c8f2 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * Vcs: Re-implement Fossil's topic indicator using a TopicCache sub-classArtur Shepilko2017-04-213-27/+29
| | | | | | | | | | | | | | | | | | The functionality for tracking project's current topic/branch has long been folded into a base class Core::IVersionControl::TopicCache. Fossil plugin should just sub-class it and pass the instance to the base. Change-Id: I1b6c1631f5fc10987d8a608d573defeecbc31b37 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-03-281-2/+2
|\| | | | | | | Change-Id: If190b0bbd77fbaa3aba7ddf98d658e4cf4491059
| * Adapt to changes in docs.priEike Ziller2017-03-231-2/+2
| | | | | | | | | | Change-Id: Icf270208081b65efc058252663438078f0d2b62d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Merge remote-tracking branch 'origin/master' into 4.3Eike Ziller2017-03-237-11/+79
| |\ | |/ |/| | | Change-Id: I9ef051d215e23b1c7e75c21fb48de438f1e79079
* | Doc: Add a doc project for the Fossil pluginEike Ziller2017-03-097-11/+79
|/ | | | | Change-Id: Ic465b8838f090688fab2fc966fa3fbf7409c13a2 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Add Qbs fileEike Ziller2017-02-101-0/+41
| | | | | Change-Id: Ia3eb819c51eec501fac0feae7c515fb39e3d1a19 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Vcs: Add Fossil SCM integration pluginArtur Shepilko2017-02-0942-0/+5739
| | | | | | | | | | | | | | | | | | | | | | | | | | * Qt Creator base-commit: f77af5e3362cc6c4360ea1d197fb834cd5b072fa * Stand-alone plugin source tree for integration into qtc super-project * Original release: https://github.com/nomadbyte/qtcreator-plugin-fossil * Adapted from Bazaar plugin implementation Configuring Fossil ------------------ 1. Download the [Fossil SCM client](http://fossil-scm.org) and install `fossil` executable file in your `PATH`. 2. Create or designate a directory to store local Fossil repositories and remote clones. For example: `~/fossils/qt`. 3. Configure Version Control Options for the Fossil plugin to use the designated directory as `Local Repositories Default path`. Now Fossil should become available as a VCS choice to create new local repositories, as well as a choice in `New File or Project` to clone a remote Fossil repository. Change-Id: I630184c1b344184d9e08ae2fc24a5e4766f834b9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Initial empty repositoryOswald Buddenhagen2016-11-160-0/+0