changeset 48029:f82c4e8afe5c

merge: with stable

--- a/hgext/patchbomb.py	Thu Sep 23 16:52:35 2021 +0900
+++ b/hgext/patchbomb.py	Thu Sep 23 17:05:37 2021 -0400
@@ -533,7 +533,7 @@
 def _getoutgoing(repo, dest, revs):
     '''Return the revisions present locally but not in dest'''
     ui = repo.ui
-    paths = urlutil.get_push_paths(repo, ui, [dest])
+    paths = urlutil.get_push_paths(repo, ui, [dest] if dest else None)
     safe_paths = [urlutil.hidepassword(p.rawloc) for p in paths]
     ui.status(_(b'comparing with %s\n') % b','.join(safe_paths))
 

--- a/pyproject.toml	Thu Sep 23 16:52:35 2021 +0900
+++ b/pyproject.toml	Thu Sep 23 17:05:37 2021 -0400
@@ -1,6 +1,5 @@
 [build-system]
 requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 80

--- a/relnotes/next	Thu Sep 23 16:52:35 2021 +0900
+++ b/relnotes/next	Thu Sep 23 17:05:37 2021 -0400
@@ -18,6 +18,7 @@
  * `hg fix --working-dir` now correctly works when in an uncommitted merge state
  * `rhg` (Rust fast-path for `hg`) now supports the full config list syntax
  * `rhg` now parses some corner-cases for revsets correctly
+ * `hg email -o` now works again when not mentioning a revision
  * Lots of Windows fixes
  * Lots of miscellaneous other fixes
 

--- a/tests/test-patchbomb.t	Thu Sep 23 16:52:35 2021 +0900
+++ b/tests/test-patchbomb.t	Thu Sep 23 17:05:37 2021 -0400
@@ -2626,6 +2626,45 @@
   o  0:8580ff50825a a
   
   $ hg phase --force --secret -r 10
+
+Test without revisions specified
+  $ hg email --date '1980-1-1 0:1' -n -o -t foo
+  comparing with $TESTTMP/t
+  From [test]: test
+  this patch series consists of 1 patches.
+  
+  Cc: 
+  
+  displaying [PATCH] d ...
+  MIME-Version: 1.0
+  Content-Type: text/plain; charset="us-ascii"
+  Content-Transfer-Encoding: 7bit
+  Subject: [PATCH] d
+  X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
+  X-Mercurial-Series-Index: 1
+  X-Mercurial-Series-Total: 1
+  Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@test-hostname>
+  X-Mercurial-Series-Id: <2f9fa9b998c5fe3ac2bd.315532860@test-hostname>
+  User-Agent: Mercurial-patchbomb/* (glob)
+  Date: Tue, 01 Jan 1980 00:01:00 +0000
+  From: test
+  To: foo
+  
+  # HG changeset patch
+  # User test
+  # Date 4 0
+  #      Thu Jan 01 00:00:04 1970 +0000
+  # Branch test
+  # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
+  # Parent  97d72e5f12c7e84f85064aa72e5a297142c36ed9
+  d
+  
+  diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/d	Thu Jan 01 00:00:04 1970 +0000
+  @@ -0,0 +1,1 @@
+  +d
+  
   $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t -r 'rev(10) or rev(6)'
   comparing with ../t
   From [test]: test