delta/git.git/transport-helper.c, branch ss/userdiff-update-csharp-java

Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"

2014-05-20T21:48:11+00:00

Instead of showing a warning and working as before, fail and show
the message and force immediate upgrade from their upstream
repositories when these tools are run, per request from their
primary author.

Signed-off-by: Junio C Hamano

Revert "Merge branch 'fc/transport-helper-sync-error-fix'"

2014-05-20T00:09:57+00:00

This reverts commit d508e4a8e2391ae2596403b6478d01cf3d5f928f,
reversing changes made to e42552135a2a396f37053a89f44952ea907870b2.

The author of the original topic says he broke the upcoming 2.0
release with something that relates to "synchronization crash
regression" while refusing to give further specifics, so this would
unfortunately be the safest option for the upcoming release.

Signed-off-by: Junio C Hamano

transport-helper: fix sync issue on crashes

2014-04-14T21:03:33+00:00

When a remote helper crashes while pushing we should revert back to the
state before the push, however, it's possible that `git fast-export`
already finished its job, and therefore has exported the marks already.

This creates a synchronization problem because from that moment on
`git fast-{import,export}` will have marks that the remote helper is not
aware of and all further commands fail (if those marks are referenced).

The fix is to tell `git fast-export` to export to a temporary file, and
only after the remote helper has finishes successfully, move to the
final destination.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

transport-helper: trivial cleanup

2014-04-14T21:03:33+00:00

It's simpler to store the file names directly, and form the fast-export
arguments only when needed, and re-use the same strbuf with a format.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

transport-helper: propagate recvline() error pushing

2014-04-14T20:51:37+00:00

It's cleaner, and will allow us to do something sensible on errors
later.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

remote-helpers: make recvline return an error

2014-04-14T20:48:33+00:00

Instead of exiting directly, make it the duty of the caller to do so.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

transport-helper: remove barely used xchgline()

2014-04-14T20:48:17+00:00

It's only used once, we can just call the two functions inside directly.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

Merge branch 'fc/transport-helper-fixes'

2014-03-18T20:49:33+00:00

Updates transport-helper, fast-import and fast-export to allow the
ref mapping and ref deletion in a way similar to the natively
supported transports.

* fc/transport-helper-fixes:
  remote-bzr: support the new 'force' option
  test-hg.sh: tests are now expected to pass
  transport-helper.c: do not overwrite forced bit
  transport-helper: check for 'forced update' message
  transport-helper: add 'force' to 'export' helpers
  transport-helper: don't update refs in dry-run
  transport-helper: mismerge fix

transport-helper.c: do not overwrite forced bit

2014-02-24T17:04:17+00:00

If the the transport helper says it was a forced update, then it is
a forced update.  It is however possible that an update is forced
without the transport-helper knowing about it, namely because some
higher up code had objections to the update and needed forcing in
order to let it through to the transport helper.  In other words, it
does not necessarily mean the update was *not* forced, when the
helper did not say "forced update".

Signed-off-by: Max Horn 
Signed-off-by: Junio C Hamano

Merge branch 'ef/mingw-write'

2014-01-27T18:44:59+00:00

* ef/mingw-write:
  mingw: remove mingw_write
  prefer xwrite instead of write