Offline work when bugfixing

[marcperrin]

Hello,

Let's imagine a component is 0% translated and we have translator T1 working online and translator T2 working offline (using translation download & upload). It works fine I guess.
But now let's say the component is 100% translated and T1 and T2 are both bugfixing: in that case I think the workflow is broken, because when T2 chooses whether to check the "Overwrite" checkbox at upload, he actually chooses between discarding his work (upload does nothing) or discarding T1's work.

I think it would be useful to have a third choice which would yield a kind of auto-diff at upload, to upload only what's changed.
This could probably be achieved by conveying a git hash in the translation header at download (@samhocevar's suggestion) (not sure how that would work for other vcs, but hopefully similarly) (it would force a commit during download I guess)
Thanks!

[marcperrin]

I've done something about this issue, my code is still very sketchy / incomplete (e.g. about vcs flavour or downloaded file format), but basically the outline is:

• convey the last_revision vcs property in the downloaded file header (NB: download must trigger a commit_pending, or that won't reflect the true state at download time)
• [vcs] write a retrieve_revision method (e.g. for git: git show some_hash:my_file.txt)
• add an option at upload to activate or not the feature
• if said option is on, and last_revision is found in header, then during upload, what I've done is to load an old_store based on retrieve_revision, and look into it within iterate_merge to skip when translation is unchanged w/r/t old_store

[nijel]

This pretty much makes sense, the commit will be needed anyway in this case to be sure you have revision to retrieve on upload.