This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9513

phab-refresh: do not error out when the stack is empty
ClosedPublic

Authored by marmoute on Dec 3 2020, 2:11 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG372409eb5cd1: phab-refresh: do not error out when the stack is empty

Summary

Actually, empty stack is easier to get than I expected (and harmless). When a
stack is publish, heptapod will detect the even, empty the stack (triggering CI)
and "forgetting" the branch afterward.

So we stop returning as error in this case.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 3 2020, 2:11 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 3 2020, 2:11 AM

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

pulkit accepted this revision.Dec 3 2020, 3:15 AM

This revision is now accepted and ready to land.Dec 3 2020, 3:15 AM

marmoute added a commit: rHG372409eb5cd1: phab-refresh: do not error out when the stack is empty.Dec 3 2020, 4:38 AM

Closed by commit rHG372409eb5cd1: phab-refresh: do not error out when the stack is empty (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

baymax added a parent revision: D9507: run-tests: allow some slack about 'waiting on lock' message.Dec 3 2020, 6:16 AM

baymax added a child revision: D9510: statprof: fix off-by-one-line error in output.

baymax updated this revision to Diff 24001.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23985		Dec 3 2020, 2:11 AM	★	★
Diff 2	23993	rHG372409eb5cd1069942fa84ef3bec9dcaf2e71da7	Dec 3 2020, 2:09 AM	★	★
Diff 3	24001		Dec 3 2020, 6:16 AM	★	★

Status	Author	Revision
Closed	spectral	D9511 statprof: separate functions and "line", assume 4 digit line numbers
Closed	spectral	D9510 statprof: fix off-by-one-line error in output
Closed	marmoute	D9513 phab-refresh: do not error out when the stack is empty
Closed	marmoute	D9507 run-tests: allow some slack about 'waiting on lock' message
Closed	marmoute	D9506 pull: flush stdin after the `pull from` message
Closed	marmoute	D9505 tests: explicitly skip the lock warning in some remotefilelog tests
Closed	marmoute	D9504 tests: use the right python when running dummyssh for narrow
Closed	spectral	D9503 copies: avoid materializing a full directory map during copy tracing
Closed	martinvonz	D9509 rebase: clear merge state when aborting in-memory merge on dirty working copy
Closed	martinvonz	D9508 tests: show that in-memory rebase leaves state when working copy is dirty

Diff 23993

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 --rev '.#stack and ::.' -T '\nONE-REV\n' \| grep 'ONE-REV' \| wc -l`
	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`			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`

	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 1			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
	exit 0			exit 0
	fi			fi

	if [[ $revision_on_phab -lt $revision_in_stack ]]; then			if [[ $revision_on_phab -lt $revision_in_stack ]]; then