Commit Graph

28 Commits

Author SHA1 Message Date
hjk
d71e3fd441 Adapt to IVersionControl FilePath changes
Change-Id: I26e95992b69d8b38f107234fd47e04f02eae8436
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-07-30 07:58:44 +00:00
Christian Stenger
c7797cfa5b Adapt to upstream changes
Change-Id: Ib6b36e98229e0f14d07a10ac35f66ff1e7f6379a
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-21 06:04:25 +00:00
hjk
ea431eede1 Fossil: Aspectify settings
Change-Id: I090cf3c63cd705220abb09e5d58eef89e9b55147
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-24 10:26:24 +00:00
Eike Ziller
b573229833 Fix compilation with upstream changes
Change-Id: Ic0b6731339b84005c8d13ffa09793c5786ab1038
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-21 10:39:30 +00:00
Eike Ziller
9a1423bf05 Do not include Core::Id
It moved to Utils.

Change-Id: I8bfbda0857e79577d02d4a9bad518f46769a8c07
Reviewed-by: hjk <hjk@qt.io>
2020-09-22 05:40:26 +00:00
Artur Shepilko
1e3721c874 Use Utils::SkipEmptyParts instead of the deprecated one in QString
- Qt 5.14 introduced Qt::Keep/SkipEmptyParts and deprecated these in
QString namespace.
- Qt Creator defined Utils::SkipEmptyParts conditional on the Qt version,
so we use that for flexibility.
- Remove any explicit references to QString::KeepEmptyParts, as it's a
default value.

Change-Id: I72c65e4901ebc4c5422d4835e63fe23fb6ef28ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-07-19 03:46:27 +00:00
Eike Ziller
cef9a471e6 Fix build after upstream change
Use Utils::Id. The upstream files no longer automatically include
the Core::Id wrapper.

Change-Id: I7b4d6ef865df44b47e07248bb653a913ba68c494
Reviewed-by: hjk <hjk@qt.io>
2020-07-07 11:35:57 +00:00
Orgad Shaneh
53fc320b72 Adapt to upstream changes
Change-Id: I964746d7c34cdf6a23cb027cbf6987b21a6b079f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-18 05:18:03 +00:00
Artur Shepilko
30b04ca919 Push/pull: Fix the handling of the Default URL
On a successful push/pull operation, Fossil allows user to save
the used remote URL, such that the next time it would be used by
default. With Fossil plugin, the user is allowed to choose the
saved Default location, also it's pre-filled in Remote URL field.
A choice is offered to save the newly entered Remote URL,
otherwise the entered URL is used only once without saving.

To use the Default URL, Fossil push/pull command should be called
without specifying any URL explicitly. Otherwise, Fossil client
displays a prompt asking whether to save it, even when it matches
the currently stored one.

Change-Id: I3f517be4b60bef5bf1f5bca19345078ef6d6dda2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-16 19:29:24 +00:00
Orgad Shaneh
57e8de1e0b Adapt to 4.12
Change-Id: Ie49d91582dac4b130c8fcd7db2ce19249ed3f057
Reviewed-by: hjk <hjk@qt.io>
2020-02-14 07:19:03 +00:00
hjk
86f7c7bf12 Adapt to recent VCS base changes
Change-Id: Ia55808cb0e0959ab77333120dabd5401ec51d2a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-10 08:04:10 +00:00
Orgad Shaneh
4a9b113c5c Adapt to upstream changes
Change-Id: Ib8884f1d62129d8275f4036bfd8880137733217c
Reviewed-by: hjk <hjk@qt.io>
2020-02-06 11:23:23 +00:00
Orgad Shaneh
7855122c53 Fix crash on startup
FossilPluginPrivate::instance() was called before dd was assigned.

Change-Id: Id6bb6a0134ffa80e18c9c9cc144fb25ca6a2be6b
Reviewed-by: hjk <hjk@qt.io>
2020-01-31 14:40:49 +00:00
Orgad Shaneh
a565e05fb0 Adapt to upstream changes
Change-Id: I3c55a84419b22d02bf275729220572c10ca11e35
Reviewed-by: hjk <hjk@qt.io>
2020-01-31 12:56:11 +00:00
Orgad Shaneh
b6f137afef Adapt to upstream changes
Change-Id: Ibdbd3abcfd65b091744451830625e2135c6573d9
Reviewed-by: hjk <hjk@qt.io>
2020-01-31 12:10:50 +00:00
Eike Ziller
6296335bf9 Adapt to changes in 4.11
Change-Id: Ie02d61ecdb1a636ca4d21b1e5b09bde530c1fdca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-10-23 09:57:35 +00:00
Eike Ziller
18841cc0f5 Adapt to upstream FileName changes
Change-Id: I5b2a3ec17024fdc569df0c65f8d48564d5a3afea
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-05-29 09:19:35 +00:00
Orgad Shaneh
a1c0d912b2 Adapt to master
Change-Id: Ie1b9f937fe2daaaa2a181d28aec8ba065aff9e3f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-14 08:28:21 +00:00
Eike Ziller
5378134c21 Adapt to 4.9
Change-Id: I9c413eaf6d70eaf09640aed349c876c040ef55ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-05-13 14:20:19 +00:00
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
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
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
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
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
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
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