Work's merge_gate is gone: nothing called it once showing a pull request took the gate with what it already knows (merge_gate_seen, 6e24edf2), and the compiler said so on every build. Merging and the queue use merge_gate_by and queue_landing_gate as before; the comments that named merge_gate name those now. Checked: cargo test -p g1t-work (193 passing). · 9dc8b9e · flagon-io/g1t

69	69
70	70		/// Whether a merge that was brought up to date lands now, by its new
71	71		/// commit's checks. The same checks hold it as hold any merge
72		−	/// (`merge_gate`): landing it before they report would only be refused.
	72	+	/// (`merge_gate_by`): landing it before they report would only be refused.
73	73		pub(crate) fn landing_step(facts: &WorkflowFacts) -> Landing {
74	74		let failed = facts.required_failed();
75	75		if !failed.is_empty() {

788	788		}
789	789
790	790		/// Everything a merge of `pull` is judged on, and the judgement, for
791		−	/// `actor`, or for nobody in particular. A bypass counts only with
792		−	/// `honor_bypass`: a person merging asks for it (`bypass_rules`).
793		−	pub(crate) async fn merge_gate(
794		−	&self,
795		−	repo: &Repo,
796		−	pull: &Pull,
797		−	actor: Option<&User>,
798		−	ignore_checks: bool,
799		−	honor_bypass: bool,
800		−	) -> Result<Gate> {
801		−	self.merge_gate_at(repo, pull, actor, ignore_checks, honor_bypass, None, None, None).await
802		−	}
803		−
804		−	/// `merge_gate` with whether it is behind already worked out (from
805		−	/// what was stored with its mergeability, or asked once for this
806		−	/// request), so that showing a pull request does not ask repos again.
	791	+	/// `actor`, or for nobody in particular, as a pull request is shown:
	792	+	/// bypasses count, and whether it is behind is what was already worked
	793	+	/// out (stored with its mergeability, or asked once for this request),
	794	+	/// so showing it does not ask repos again.
807	795		pub(crate) async fn merge_gate_seen(&self, repo: &Repo, pull: &Pull, actor: Option<&User>, behind: bool) -> Result<Gate> {
808	796		self.merge_gate_at(repo, pull, actor, false, true, None, None, Some(behind)).await
809	797		}
810	798
811		−	/// `merge_gate` for a merge by `method`: rules that allow only some
	799	+	/// The gate for a merge by `method`, asking repos whether it is behind: rules that allow only some
812	800		/// methods, and linear history, judge it too. Without a method they do
813	801		/// not, as for showing what a pull request still needs.
814	802		pub(crate) async fn merge_gate_by(

3	3		//! protection" ruleset (rulesets.rs).
4	4		//!
5	5		//! What a merge needs is decided by the rules of the branch it merges into
6		−	//! (`Work::merge_gate`); `approvals_gap` asks them for what people must
	6	+	//! (`Work::merge_gate_by`, `Work::merge_gate_seen`); `approvals_gap` asks them for what people must
7	7		//! still do, as g1t sees it when it merges by itself.
8	8
9	9		use g1t_contracts::time::rfc3339;

flagon-io/g1t

Comments