Re: Version control support call for help

[Louis des Landes <louis obsidian com au>]

On 29 May 2013 06:12, Kai Willadsen <kai willadsen gmail com> wrote:

On 28 May 2013 18:30, Louis des Landes <louis obsidian com au> wrote:
> Having a browse through at the moment.
>
> Some quick questions:
> * get_commit_message_prefill - you use a file (.git/MERGE_MSG) which only
> exists when git has just done a merge? Bazaar doesn't have an equivalent
> here, although I guess we could check if there's a pending merge and put
> some text in manually, but I feel this is the wrong choice.

I don't know what the right choice is here, but it's going to be a
VC-by-VC thing. This was added so that *if* there is a pre-filled
commit message, then we pick it up. In other words, if, when you went
to git commit from the command line, there would have already been a
commit message waiting for you to edit, then we try to use that. For
reference, this was added to fix
https://bugzilla.gnome.org/show_bug.cgi?id=699400.

OK, that's git specific, and won't be implemented for bzr. 

> * Should the various commit/diff/update/add/remove/revert methods use the
> existing <method>_command (diff_command etc) methods? There seems to be some
> duplication here, but I'm guessing it's a WIP.

Yeah, there's duplication because until a couple of weekends ago we
needed the blah_command functions for sensitivity setting. Any
duplicates of those can now be removed as long as the module
implements update_actions_for_paths().

OK, but it does seem a few of them are still used outside of the sensitivity stuff, so these at least have to stay for now?

commit_command()

diff_command()

add_command()

remove_command()

resolved_command()

The inconsistency here seems a little confusing.

Are you planning on there eventually being commit() diff() add() remove() and resolved() methods?

Related - what happens with the return code from the runner with push / pull etc?

After adding them to bzr, if it fails, it fails silently.

First draft of bzr changes here:

https://github.com/Psykar/meld/compare/master...bzr-changes

Some testing still required - I'll submit a bugzilla patch when I'm happy with it.