GitBundleRepository._ship: fix behaviour after history rewriting

[elikoga]

bundle everything and ignore remote head if current head is not in local branch

Tried writing a test_git_remote_bundle_can_handle_removed_head_commit similiar to test_git_remote_init_pull but due to deficiencies in the remote test suite this presented too difficult.

This change cleanly appllies the local state to the remote repository in case of a rewrite. Due to host.rpc.git_update_working_copy running git reset --hard

batou/src/batou/repository.py

Lines 318 to 326 in 1e0d7a2

	def update(self, host):
	self._ship(host)
	remote_id = host.rpc.git_update_working_copy(self.branch)
	# This can theoretically fail if we have a fresh repository, but
	# that doesn't make sense at this point anyway.
	local_id, _ = cmd("git rev-parse HEAD")
	local_id = local_id.strip()
	if remote_id != local_id:
	raise RepositoryDifferentError.from_context(local_id, remote_id)

batou/src/batou/remote_core.py

Lines 348 to 355 in 1e0d7a2

	def git_update_working_copy(branch):
	cmd(
	"git reset --hard {origin}/{branch}".format(
	origin=git_origin, branch=branch
	)
	)
	id, _ = cmd("git rev-parse HEAD")
	return id.strip().decode("ascii")

[elikoga]

This PR also removes the test_git_remote_bundle_fails_if_needed, which was previously added because of the misconception that #290 was caused by corrupted repostories.

[elikoga]

Rebased on top of #479 and moved the changelog to a scriv changelog file in order to avoid Merge conflicts

The merge-base changed after approval.

The merge-base changed after approval.