Copy a file to the same directory

[greenido]

1. Added the logic to change the new file name to 'xxxx_1' (or 2,3,4, when there are already copies of the file).
2. After the copy there was a need to reload the list of files in order to show the user the changes.

Fixes #9931

[MorrisJobke]

@skjnldsv Let's make it 15 and then backport to stable14 😉

[greenido]

The changes @skjnldsv suggested are in the last commit: 83bd2f5
Thx.

[MorrisJobke]

@skjnldsv @jancborchardt @juliushaertl Mind to review this one?

[MorrisJobke]

@dairaine @sunjam @lightweight Could you try this change for the feature you requested?

[jancborchardt]

@greenido nice! Could you adjust the naming to the spec at #9931 (comment) ?

• filename (copy).txt
• filename (another copy).txt
• filename (3rd copy).txt
• filename (4th copy).txt
• etc

This is more obvious than just appending the number, which could also be a conflict or having uploaded the original file again.

[greenido]

Sure! I hope to find time tonight ;)

…

On Tue, Oct 2, 2018 at 10:17 AM Jan-Christoph Borchardt < ***@***.***> wrote: ***@***.**** requested changes on this pull request. @greenido <https://github.com/greenido> nice! Could you adjust the naming to the spec at #9931 (comment) <#9931 (comment)> ? - filename (copy).txt - filename (another copy).txt - filename (3rd copy).txt - filename (4th copy).txt - etc This is more obvious than just appending the number, which could also be a conflict or having uploaded the original file again. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#10825 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AADwIC1SM02XTolvwzw6gRTVmAWcJ6dKks5ug5_DgaJpZM4WJ9Z1> .

[greenido]

Done. Please check and let me know. Thank you.

…

On Tue, Oct 2, 2018 at 10:42 AM Ido Green ***@***.***> wrote: Sure! I hope to find time tonight ;) On Tue, Oct 2, 2018 at 10:17 AM Jan-Christoph Borchardt < ***@***.***> wrote: > ***@***.**** requested changes on this pull request. > > @greenido <https://github.com/greenido> nice! Could you adjust the > naming to the spec at #9931 (comment) > <#9931 (comment)> > ? > > > - filename (copy).txt > - filename (another copy).txt > - filename (3rd copy).txt > - filename (4th copy).txt > - etc > > This is more obvious than just appending the number, which could also be > a conflict or having uploaded the original file again. > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <#10825 (review)>, > or mute the thread > <https://github.com/notifications/unsubscribe-auth/AADwIC1SM02XTolvwzw6gRTVmAWcJ6dKks5ug5_DgaJpZM4WJ9Z1> > . >

[skjnldsv]

Need some small changes!! Did not tested it yet, the code looks good 👍✨

[jancborchardt]

The first copy does not need a number, just Filename (copy).txt :) Otherwise it seems good. 👍

[MorrisJobke]

@jancborchardt @skjnldsv Mind to re-review?

[MorrisJobke]

@greenido As we are planning to release 15.0.0 Beta 2 today: I guess there is very little chance that you could sign-off the commits, right? It's fairly easy:

Let's do this for 16 and look into back porting this maybe later.

[greenido]

I'll do my best to do it today - Thank you for the heads up.

…

On Thu, Nov 15, 2018 at 7:42 AM Morris Jobke ***@***.***> wrote: @greenido <https://github.com/greenido> As we are planning to release 15.0.0 Beta 2 today: I guess there is very little chance that you could sign-off the commits, right? It's fairly easy: Let's do this for 16 and look into back porting this maybe later. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#10825 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AADwICDxQMf3MdqphIfbi8sgs9-6PmJ2ks5uvYtvgaJpZM4WJ9Z1> .

[MorrisJobke]

@greenido No need to hurry on this one. Beta 2 is out 🚀 but we will get it into the next release maybe ;)

[greenido]

Signed-off-by: Ido Green greenido@gmail.com

[kesselb]

@greenido https://github.com/nextcloud/server/runs/32106619 follow the instructions there to fix the sign off

[greenido]

I got into a small mess due to an update I did to my fork... So the two git commands aren’t working as expected.

…

On Nov 15, 2018, at 09:36, Daniel Kesselberg ***@***.***> wrote: @greenido https://github.com/nextcloud/server/runs/32106619 follow the instructions there to fix the sign off — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

[kesselb]

Yes. I'm not sure but greenido/server is missing a lof ot changes form nextcloud/server. I would try to update my fork first (https://help.github.com/articles/syncing-a-fork/) and than try to rebase again (https://github.com/nextcloud/server/pull/10825/checks?check_run_id=32202446).

[greenido]

Just did... thank you for the heads up.

…

--

On Nov 15, 2018, at 10:49, Daniel Kesselberg ***@***.***> wrote: Yes. I'm not sure but greenido/server is missing a lof ot changes form nextcloud/server. I would try to update my fork first (https://help.github.com/articles/syncing-a-fork/) and than try to rebase again. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

[MorrisJobke]

Just did... thank you for the heads up.

This looks like it went wrong 🙈 Sorry for the mess here. I pushed to your branch a new commit as well and this seems to not have relaxed the situation.

I guess here a heavy "git rebase --interactive" is needed with "edit" as option instead of "pick" to be able to modify the commit message (adding basically the sign-off message). See https://morrisjobke.de/2015/12/03/How-to-do-a-git-rebase/ for details about a rebase.

In your case it's best to checkout master. Do a pull from our master. Then you can do the above mentioned rebase and push again. In case of problems: I have the old version of the branch still locally and we can go for that if something bad happens.

[MorrisJobke]

And this is how the sign-off looks like:

80f4c40

It's basically this line inside the commit message:

Signed-off-by: Morris Jobke <morris@example.org>

[greenido]

Hey @MorrisJobke

I followed the steps you mention but I don't know what to pick in the interactive merge...
Please see:

Using index info to reconstruct a base tree...
M	core/js/setupchecks.js
M	settings/Controller/CheckSetupController.php
Falling back to patching base and 3-way merge...
Auto-merging settings/Controller/CheckSetupController.php
CONFLICT (content): Merge conflict in settings/Controller/CheckSetupController.php
Auto-merging core/js/setupchecks.js
CONFLICT (content): Merge conflict in core/js/setupchecks.js
error: Failed to merge in the changes.
Patch failed at 0043 Adds a setup check for the memory limit

Can you fix these two in 'my' local master (or branch)?
Thanks!

[MorrisJobke]

I just used the local commits from my side, rebased them and pushed them. They do not yet contain the sign-off message, but I can walk you through this.

git rebase --interactive def8af3e7e

This will open an editor with following content:

pick 0dad9c1397 fixing issue 9931 - copy a file to the same directory
pick 1d827da7e2 cleaning after comments on issue 10825
pick 8eab3e8cb1 Use the new naming per the comments on #9931
pick d025c92108 Per the last comment on having only (copy) for the first one
pick bdf3019e4e Translate name for "(copy)"

# Rebase def8af3e7e..bdf3019e4e onto def8af3e7e (5 commands)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

The first 4 lines in there are your commits, the fifth one is my commit. So you only need to edit the first 4 lines. Change there the pick into edit. This basically does a pick and gives you a prompt after each of those commits. Then you can run git commit --amend -s to add the sign-off message. Continue then to the next commit with git rebase --continue. Do there the same. Repeat this until it says:

Successfully rebased and updated refs/heads/fixing-issue-9931.

Force push your commits and you should be done. 👍

[greenido]

I followed your steps - but for some reason that DCO still asking me to sign more commits.
Help! :)

[MorrisJobke]

Uuuuhhh ... the git history looks a bit broken. It seems that there were non-fast-forward merges on your master branch and thus git thinks that there needs to be more merged into this one here. Also your commits do not contain the message. :/ I could add the message for you and fix this PR. In the future you could use git commit -s to let git add the message right while creating the commit and this then does not require this huge rebasing here anymore.

[MorrisJobke]

stable15 is branched off -> merge

[welcome]

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
Most developers hang out on IRC. So join #nextcloud-dev on Freenode for a chat!

[greenido]

Will do! Thank you 🙏

…

--

On Nov 22, 2018, at 11:37, welcome[bot] ***@***.***> wrote: Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22 Most developers hang out on IRC. So join #nextcloud-dev on Freenode for a chat! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.