- **status**: review --> in-progress - **Reviewer**: Dave Brondsema - **Comment**:
This is going to be very nice :) I did find some things to improve though: `clone_url` isn't good to use since it may be overridden with a `external_checkout_url` setting. Moreover, we should clone from the filesystem rather than through a full checkout url (unnecessary overhead). Development configuration has a filesystem path for the checkout url, but on a real site they will be git:// and http:// urls. I think `full_fs_path` is what we need probably. We could cache if hash->hash is merge-able, probably right on the merge request document. If source or destination is updated, the cache would not be valid of course. That might be useful for big repos where `can_merge` takes a while, but not sure how necessary it is yet. Merge conflict was not detected in the case of a MR deleting a file and upstream modifying the file. Same for the reverse (MR modifies file, upstream removes it) and different renames. The merge error handling worked, but it'd be better if `can_merge` detected this properly. Can we change the commit author from the default `Author: Allura user <[email protected]>`? I think using the current user's full name and no email `<>` would be good. Changing the commit message might be really nice too, the current `Merge commit 'LONG-COMMIT-HASH' [into BRANCH]` is ok, but the commit hash is pretty long and not too useful. Ideally we'd want the message to specify the downstream repo and branch, or maybe the merge request URL? (Too bad we don't have an artifact shortlink for merge requests yet). It seems the way to do set those fields on a merge is to run it with `--no-commit` and then commit manually with a specified author and message. Have not tested hg yet. --- ** [tickets:#7830] One-click merge** **Status:** in-progress **Milestone:** unreleased **Labels:** sf-current sf-4 42cc **Created:** Mon Feb 09, 2015 04:17 PM UTC by Dave Brondsema **Last Updated:** Fri Feb 27, 2015 01:02 PM UTC **Owner:** Igor Bondarenko Add a button to merge requests to merge the branch on the server-side. Of course, don't do it if there are conflicts. Also need to consider server-side filesystem permissions and make sure install docs are updated if needed, etc. --- Sent from forge-allura.apache.org because [email protected] is subscribed to https://forge-allura.apache.org/p/allura/tickets/ To unsubscribe from further messages, a project admin can change settings at https://forge-allura.apache.org/p/allura/admin/tickets/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.
