This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9522

phab-refresh: do not pick draft changeset from the bare "default" branch
ClosedPublic

Authored by marmoute on Dec 5 2020, 6:13 AM.

Download Raw Diff

Details

Reviewers

mharbison72

Group Reviewers

hg-reviewers

Commits

rHG024f90fc01b5: phab-refresh: do not pick draft changeset from the bare "default" branch

Summary

My initial test overlooked a common case: draft changeset on the default branch.
So right now, heptapod is doing a final refresh of the patch with the landed
version. This is not a bit problem except for the extra noise. However we would
be better without the noise.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Dec 5 2020, 6:13 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 5 2020, 6:13 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

initial sent before test run (refresh post test run imminent)

marmoute added a child revision: D9526: phab-refresh: allow passing additional argument to the phabsend.Dec 5 2020, 6:08 PM

mharbison72 accepted this revision.Dec 5 2020, 8:40 PM

This revision is now accepted and ready to land.Dec 5 2020, 8:40 PM

marmoute added a commit: rHG024f90fc01b5: phab-refresh: do not pick draft changeset from the bare "default" branch.Dec 5 2020, 8:48 PM

Closed by commit rHG024f90fc01b5: phab-refresh: do not pick draft changeset from the bare "default" branch (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/phab-refresh-stack.sh (10 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	24041		Dec 5 2020, 6:13 AM	★	★
Diff 2	24047		Dec 5 2020, 6:08 PM	★	★
Diff 3	24053	rHG024f90fc01b55f3c76f43e17ae3f9fa0fda5a85c	Dec 5 2020, 5:27 PM	★	★

Commit	Parents	Author	Summary	Date
a7ff633a2482	8dca9051a859	Pierre-Yves David		Dec 5 2020, 6:03 AM

Status	Author	Revision
Closed	marmoute	D9527 phab-refresh: add an explanatory message
Closed	marmoute	D9526 phab-refresh: allow passing additional argument to the phabsend
Closed	marmoute	D9522 phab-refresh: do not pick draft changeset from the bare "default" branch

Diff 24041

contrib/phab-refresh-stack.sh

	#!/bin/bash			#!/bin/bash
	set -eu			set -eu

	revision_in_stack=`hg log --rev '.#stack and ::.' -T '\nONE-REV\n' \| grep 'ONE-REV' \| wc -l`			revision_in_stack=`hg log \
	revision_on_phab=`hg log --rev '.#stack and ::. and desc("re:\nDifferential Revision: [^\n]+D\d+$")' -T '\nONE-REV\n' \| grep 'ONE-REV' \| wc -l`			--rev '.#stack and ::. and topic()' \
				-T '\nONE-REV\n' \
				\| grep 'ONE-REV' \| wc -l`
				revision_on_phab=`hg log \
				--rev '.#stack and ::. and topic() and desc("re:\nDifferential Revision: [^\n]+D\d+$")'\
				-T '\nONE-REV\n' \
				\| grep 'ONE-REV' \| wc -l`

	if [[ $revision_in_stack -eq 0 ]]; then			if [[ $revision_in_stack -eq 0 ]]; then
	echo "stack is empty" >&2			echo "stack is empty" >&2
	exit 0			exit 0
	fi			fi

	if [[ $revision_on_phab -eq 0 ]]; then			if [[ $revision_on_phab -eq 0 ]]; then
	echo "no tracked diff in this stack" >&2			echo "no tracked diff in this stack" >&2