Commit Graph

21 Commits

Author SHA1 Message Date
Orgad Shaneh
a155f69ca9 Adapt to master
Change-Id: Iee445c716469a4cc257c7eccc986a5e1d50411ff
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-21 09:57:53 +00:00
Artur Shepilko
4d0a7377c0 Create a correct editor for 'Log Current File'
- affects legacy versions of the fossil client

Change-Id: I72a7eca4199fe3867fb82ff872d2bedecfd85ff3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-09-06 15:53:10 +00:00
Artur Shepilko
c75bb148e8 Add Reload button to Log and Diff editors
Change-Id: I524f114c2642a793a06c03e18c1eeab019209fd7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-09-02 19:39:57 +00:00
Orgad Shaneh
bb6da94e5d Suppress command output on revision query
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>
2018-08-28 19:13:20 +00:00
Orgad Shaneh
d3998c6319 Adapt to upstream VCS change
Change-Id: I4097fb789a887e656d510a3fff67f5bf396a9a0a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-28 07:27:12 +00:00
Artur Shepilko
88e11284ea Add support for annotation of any given revision
- 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>
2018-08-08 17:15:00 +00:00
Artur Shepilko
b1e1cdef86 Allow to specify the plugin source commit-id used in the build
- 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>
2018-07-27 16:30:25 +00:00
Artur Shepilko
e74016a32f Update clone wizard icons
Change-Id: I45d1595094c132e28d714df00c3b480a9e7e33bc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-27 14:55:32 +00:00
Artur Shepilko
15007920a3 Update to use supportedProjectType
- Same change as in qt-creator aa37df645d

Change-Id: I1dfda4b8e7a9ce40954f5029efc2e51a5366b974
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-27 13:19:42 +00:00
Artur Shepilko
06d73b2e24 Update copyright year
Change-Id: I2b1db2013cad9d25d2a54439866aae63a62623f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-16 20:49:28 +00:00
Artur Shepilko
e32b8e4ca2 Adapt to QtCreator 4.7
Change-Id: I9eb8d740e1ef33622a8ba15e4e832755f0141a94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-13 10:16:41 +00:00
Eike Ziller
ee7505444c Fix isVcsFileOrDirectory
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>
2017-10-17 10:01:52 +00:00
Eike Ziller
ed94e8bda2 Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: Id67fed3d81082f1bb68d92083222bcb7dcd9e825
2017-10-11 10:02:11 +02:00
Eike Ziller
f6cea871f1 Adapt to change in VCS registration
Was changed in qt-creator/19c9194b117bf4d5a4d5ef19e6f9d84d92c67620

Change-Id: I1b6449d3435a418f7fdd1cc3b94c2e752c062672
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-06 11:40:53 +00:00
Eike Ziller
bf3f576c4a Adapt to changes in VcsBase
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>
2017-10-06 11:40:40 +00:00
Eike Ziller
cb9135ade9 Add missing override
Change-Id: I0202df0c8823203c8f1571b1866b911e784b9305
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-06 11:40:13 +00:00
Artur Shepilko
8cc9b5c57d Vcs: Jump to the current source line in Fossil Annotate editor
* 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>
2017-04-26 15:56:36 +00:00
Artur Shepilko
ac8005190d Vcs: Re-implement Fossil's topic indicator using a TopicCache sub-class
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>
2017-04-21 15:00:02 +00:00
Eike Ziller
ecf70972e8 Doc: Add a doc project for the Fossil plugin
Change-Id: Ic465b8838f090688fab2fc966fa3fbf7409c13a2
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-03-09 12:39:31 +00:00
Eike Ziller
0d957a88f9 Add Qbs file
Change-Id: Ia3eb819c51eec501fac0feae7c515fb39e3d1a19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-10 09:58:30 +00:00
Artur Shepilko
dea25a6b62 Vcs: Add Fossil SCM integration plugin
* Qt Creator base-commit: f77af5e336
* 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>
2017-02-09 16:43:38 +00:00