Commitfdb1dc7

authored and

committed

Parse rejected deletes.

1 parent359a7e0 commitfdb1dc7Copy full SHA for fdb1dc7

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,10 @@ def _from_line(cls, remote, line):`
`156`	`156`	`ifflags&cls.DELETED:`
`157`	`157`	`from_ref=None`
`158`	`158`	`else:`
`159`		`-from_ref=Reference.from_path(remote.repo,from_ref_string)`
	`159`	`+iffrom_ref_string=="(delete)":`
	`160`	`+from_ref=None`
	`161`	`+else:`
	`162`	`+from_ref=Reference.from_path(remote.repo,from_ref_string)`
`160`	`163`
`161`	`164`	`# commit handling, could be message or commit info`
`162`	`165`	`old_commit=None`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,14 @@ def _assert_push_and_pull(self, remote, rw_repo, remote_repo):`
`385`	`385`	`progress.make_assertion()`
`386`	`386`	`self._do_test_push_result(res,remote)`
`387`	`387`
	`388`	`+# rejected stale delete`
	`389`	`+force_with_lease="%s:0000000000000000000000000000000000000000"%new_head.path`
	`390`	`+res=remote.push(":%s"%new_head.path,force_with_lease=force_with_lease)`
	`391`	`+self.assertTrue(res[0].flags&PushInfo.ERROR)`
	`392`	`+self.assertTrue(res[0].flags&PushInfo.REJECTED)`
	`393`	`+self.assertIsNone(res[0].local_ref)`
	`394`	`+self._do_test_push_result(res,remote)`
	`395`	`+`
`388`	`396`	`# delete new branch on the remote end and locally`
`389`	`397`	`res=remote.push(":%s"%new_head.path)`
`390`	`398`	`self._do_test_push_result(res,remote)`

Comments

(0)