control: tag -1 + pending

Hello,

I've now fixed this upstream by installing the attached.

-- 
Sean Whitton
From fb7ed4a3f96a6524f4623e306e100df6dc2f1088 Mon Sep 17 00:00:00 2001
From: Sean Whitton <[email protected]>
Date: Sat, 7 Jun 2025 15:57:21 +0100
Subject: [PATCH] mr: hg_status: New command to find unpushed branches

The purpose of this invocation of 'hg summary' is to display unpushed branches
(cf. Debian bug#693021).  It doesn't work anymore; it would seem that the
output of 'hg summary' has changed significantly.  In particular, looking at
the source for the summary command in hg.hg/mercurial/commands.py, we see that
all 'parent: ' lines are unconditionally printed.  That is, they are printed
regardless of whether --quiet is passed (because ui.print() is used instead of
ui.status()), and regardless of whether or not there are unpushed branches.

Replace the use of 'hg summary' with an invocation of 'hg log' which uses
Mercurial's concept of phases to identify commits that haven't been pushed.
---
 debian/changelog | 1 +
 mr               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3469888..a1d879f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ myrepos (1.20180727) UNRELEASED; urgency=medium
   * dgit plugin: pass -p to 'dgit fetch'.
     Ensures that 'dgit fetch' will work if the currently checked out
     branch does not include debian/control.
+  * hg_status: New command to find unpushed branches (Closes: #1105038).
 
  -- Joey Hess <[email protected]>  Tue, 21 Jan 2020 15:12:43 -0400
 
diff --git a/mr b/mr
index 056e749..0233e17 100755
--- a/mr
+++ b/mr
@@ -2584,7 +2584,7 @@ svn_status = svn status "$@"
 git_status = git status -s "$@" || true; git --no-pager log --branches --not --remotes --simplify-by-decoration --decorate --oneline || true; git --no-pager stash list
 bzr_status = bzr status --short "$@"; bzr missing || true
 cvs_status = cvs -n -q update "$@"
-hg_status  = hg status --pager never "$@"; hg summary --pager never --quiet | grep -v 'parent: 0:'
+hg_status  = hg status --pager=never "$@"; hg log --pager=never --rev='heads(not public())' --template='{label("log.changeset", "{rev}:{node|short}")} {desc|firstline}\n'
 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"
 vcsh_status = vcsh status "$MR_REPO" "$@" || true
-- 
2.47.2

Attachment: signature.asc
Description: PGP signature

Reply via email to