Commit Graph

32 Commits

Author SHA1 Message Date
Christian Stenger
91a82da6b7 Adapt to upstream change
Change-Id: I013c61805eeed05937fa46eb6e6e330d4b99ebb1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-08-01 07:02:39 +00:00
Jarek Kobus
8060ca5204 Adapt to upstream changes
Change-Id: I0ec67b57432ac03b3cf3f93802686effdfce78c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 08:03:40 +00:00
Christian Stenger
f46df201aa Adapt to upstream change
Change-Id: Ic977a404aee47bb71a927bdd77fd4f06d98e1e95
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-23 06:59:11 +00:00
Christian Stenger
8cec0274a5 Adapt to upstream changes
Change-Id: Iaa94ecf5614aa1fa86f288b7db9141efbb06318d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-03-09 09:00:36 +00:00
Christian Stenger
b5d598956d Adapt to upstream changes
* FilePathification
* SynchronousProcess -> QtcProcess

Change-Id: I973ff68585788c8742652f69a7c057e28aafbaf4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-08-06 08:52:20 +00:00
hjk
439d8cc52a Adapt to upstream findTopLevelForFile change
Change-Id: I699d524c7b9317ac74f3f2ca3027271923ab982b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-07-30 07:59:49 +00:00
hjk
395af1b83e Fossil: Adapt to Make SynchronousProcess results more directly accessible
Change-Id: Ifd5f79ba50e38fdec9e3f5c412210a95d53e8a96
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-17 09:15:08 +00:00
hjk
7fd9cde17a Fossil: Revert some unintentional hunk
Amends 36f3cf69.

Change-Id: I4a8ea5f2353fb2feb88087af86fec6d0f7919974
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-29 06:51: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
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
Orgad Shaneh
a8c30c9253 Merge remote-tracking branch 'origin/4.13'
Change-Id: I87977120608b94bd2576b2217337c02fe34e4ceb
2020-07-17 07:38:17 +03:00
Artur Shepilko
a0f4ce71e8 Work around MSVC error initializing QString from const char *
This deals with the error while compiling with MSVC 2017:

fossilclient.cpp(398): error C2440: 'initializing': cannot convert from 'const char *' to 'QString'
fossilclient.cpp(398): note: No constructor could take the source type, or constructor overload resolution was ambiguous

No problem building that with gcc.

Change-Id: Iddb9754cd5010505b182ca9b81e390a7c3b8fdda
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-07-16 19:46:35 +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
Artur Shepilko
3d7697667d Adapt to Fossil client version 2.12
Fossil 2.12 changes the output of 'info' command replacing the label
that attributes the check-out's hash-id from 'uuid' to 'hash' [1].

[1]: https://fossil-scm.org/fossil/info/8ad5e4690854a81 "src/info.c"

Change-Id: I1277d784c377ee37434abc017db748d16353b31e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-17 18:02:59 +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
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
b418e205cf Adapt to upstream changes
Change-Id: I105277aba8e7d897ed65f8bba4cd803091046212
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-12-19 15:42:01 +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
adf0b8f87f FossilClient: De-noise
Change-Id: I9129d1e542073c2454ed1758af1b8dfc06ba0e1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-15 06:12:31 +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
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
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
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
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
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
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