GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

"Mount this iso image" and "Unmount this iso image"
to
"Mount ISO" and "Unmount ISO"

Since this option only appears when right-clicking on a specific
ISO image, the current labels feel redundant (also uppercase was missing)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Also update to revision action refreshes log only if its successed: no
need to refresh on failure, it's unchanged.

Dialog executes 'svn cleanup' command for a user picked directory.
This action is available only for directories.
Added functionality:
- delete unversioned files and folders;
- delete ignored files and folders;
- include externals;
- user can change a directory in a dialog itself by typing it or by
picking it;
- added checks if a directory is valid: for invalid paths "OK" button is
disabled.

needs to be explicit in FreeBSD's libc headers).

Use string.h include instead of glibc specific error.h

Summary: Plugin uses DBus but there is Qt::DBus linkage.

Reviewers: #dolphin, elvisangelaccio, meven, kchoi

Reviewed By: #dolphin, meven, kchoi

Differential Revision: https://phabricator.kde.org/D29834

The mountiso plugin adds a contextual menu entry for .iso files to
either mounting or unmounting the file as a loopback device depending on
the mount state.
This plugin uses udisksctl to either mount or unmount the iso file.
It also uses losetup to check if an iso file is already mounted

FEATURE: 175051
FIXED-IN: 20.08.0

Summary:
{F8324215}
Added dialog for SVN Update, SVN Revert and SVN Commit actions.
This dialog is universal and prints everything from stdout and stderr (stderr prints in red).
Supports for "Cancel" action which sends terminate signal to a running process.

Test Plan:
1) Try "SVN Commit", "SVN Revert" and "SVN Update" actions from plugin popup menu.
2) Try "SVN Revert" action from "SVN Commit" dialog.

Reviewers: #dolphin, #vdg, elvisangelaccio, meven

Reviewed By: #dolphin, elvisangelaccio, meven

Differential Revision: https://phabricator.kde.org/D29788

Summary:
{F8293246}
Added SVN Checkout dialog with basic and most commonly used SVN Checkout functionality:
- set repo URL;
- change working copy path;
- omit externals.
Additional features:
- automatically pasting repo URL on dialog creation (if its valid);
- automatically forming working copy path based on repo URL (trying to predict repository name);
- user can pick an output folder instead of typing in;
- few error-controls to prevent running 'svn co' with invalid params (disabling 'OK' button).
SVN Checkout can be time consuming.

Reviewers: #vdg, #dolphin, meven, elvisangelaccio, ngraham

Reviewed By: #dolphin, meven, elvisangelaccio

Subscribers: anthonyfieroni

Differential Revision: https://phabricator.kde.org/D29489

Summary:
Updates VCS-plugins for the new KVersionControlPlugin interface. Updates available in the separate commit D29041.
Plugins unversionedActions() functions now do nothing so it doesn't change any current plugin behaviour.

Reviewers: #dolphin, meven, elvisangelaccio

Reviewed By: #dolphin, meven, elvisangelaccio

Differential Revision: https://phabricator.kde.org/D29042

Fix 'SVN Log...' crash while watching history in the unversioned directory. Added checks m_log variable contains anything.

Summary:
This commits adds checks of m_log variable contains anything before using it.
More appropriate is not showing 'SVN Log...' as available action at all, this should go in a further commits.
Anyway checks for a m_log variable is a must.

Test Plan: Run 'SVN Log...' in unversioned directory make sure it doesn't crash any more and showes empty history.

Reviewers: #dolphin, meven, elvisangelaccio

Reviewed By: #dolphin, meven, elvisangelaccio

Differential Revision: https://phabricator.kde.org/D29043

Summary:
Added special checks for items inside unversioned dirs.
Previously those items was indicated as normal revision with a capability to launch SVN commands on it (SVN Delete, for example). Those commands ends up with an error.

Unversioned item is a special case because in any other cases 'svn status' will mark every file or dir as added, removed, conflicted and so on.

Test Plan:
Inside a repo create dir with a following structure:
{F8225757}

1) Check any SVN actions available only for "dir", selecting other dirs and files causes no actions available.
2) Check items status showing correct.
3) Do 'SVN Add' for dir, 'SVN Revert' for dir2.
4) Check dir (with dir1.txt, file1.txt) and dir/dir1 (with file2.txt) and dir/dir1/dir2 has SVN Actions while dir/dir1/dir2/dir3 don't.
5) Check items status showing correct.

Reviewers: meven, elvisangelaccio, #dolphin

Reviewed By: meven, elvisangelaccio, #dolphin

Differential Revision: https://phabricator.kde.org/D28681

Differential Revision: https://phabricator.kde.org/D28459Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>

Summary:
1) Pointers initialized with 'nullptr' instead of '0'.
2) Moved to a modern Qt-way of connecting signals and slots without SIGNAL() and SLOT() macros.
3) Class SVNCommands renamed to SvnCommands for consistency with other class names.

Test Plan: Ensure everything is correct, try some basic actions.

Reviewers: meven, elvisangelaccio

Differential Revision: https://phabricator.kde.org/D28170

Summary:
Added SVN Log dialog. Dialog looks and behaves similar to a TortoiseSVN one.
Dialog supports:
- update repo to specified revision;
- revert repo to specified revision;
- revert file to a specified revision;
- show changes against previois commit;
- show changes against working copy.
Everything is done by the context menu.

{F8181378}

Test Plan: Run SVN Log dialog and check update works, revert works, revert file works, show changes and show changes against working copy works.

Reviewers: #vdg, meven, elvisangelaccio

Reviewed By: elvisangelaccio

Subscribers: yurchor, anthonyfieroni

Differential Revision: https://phabricator.kde.org/D28102

Summary:
Added "SVN Add" on directory addition with appropriate "SVN Revert" action.
Also for directories already under VCS control added "SVN Delete" action.

Test Plan:
1. Create empty directory.
2. Try "SVN Add" on it: it should be added.
3. Try "SVN Revert" on it: it should be reverted.
4. Try "SVN Add", then "SVN Commit". It should be commited fine.
5. Try "SVN Delete", then "SVN Commit". It should be deleted from CVS and commited fine.
6. Try the same with a dir with an empty file in it right-clicking on the directory name and inside directory.

Reviewers: meven, elvisangelaccio

Reviewed By: meven

Differential Revision: https://phabricator.kde.org/D27652

Summary:
Added SVN commit dialog actions for diff file, add file and revert file.
This is done by commit dialog context menu actions.
SVN commit dialog is now a separate class and moved to a separate file.
Also added SVNCommands class with static methods to access basic SVN actions like geting revision or geting remote URL path for a file.
Also added ItemVersion::MissingVersion control for SVN plugin.

{F8134979}

Test Plan: Run SVN commit dialog and check diff file works, revert works and add works.

Reviewers: #vdg, elvisangelaccio, meven, ngraham

Reviewed By: #vdg, meven, ngraham

Subscribers: ngraham

Differential Revision: https://phabricator.kde.org/D27641

Summary:
SVN commit dialog box contains no list of changes that will be commited. This is often confusing.
This commit adds basic changes list for SVN commit action.
Also contains workaround for QTBUG-40584 to preserve dialog sizes, see KWindowConfig::restoreWindowSize() docs.
{F7948018}

Reviewers: #dolphin, elvisangelaccio, meven, #vdg, ngraham

Reviewed By: #dolphin, meven, #vdg, ngraham

Subscribers: ngraham

Differential Revision: https://phabricator.kde.org/D26921

Summary:
BUG: 319546
Non-blocking portable solution without any shell use.

Reviewers: #dolphin, elvisangelaccio, meven, ngraham

Reviewed By: #dolphin, elvisangelaccio, meven

Subscribers: anthonyfieroni

Differential Revision: https://phabricator.kde.org/D26259