##// END OF EJS Templates
merge: with stable
Augie Fackler -
r48843:f82c4e8a merge default
parent child Browse files
Show More
@@ -533,7 +533,7 b' def _getpatchmsgs(repo, sender, revs, pa'
533 def _getoutgoing(repo, dest, revs):
533 def _getoutgoing(repo, dest, revs):
534 '''Return the revisions present locally but not in dest'''
534 '''Return the revisions present locally but not in dest'''
535 ui = repo.ui
535 ui = repo.ui
536 paths = urlutil.get_push_paths(repo, ui, [dest])
536 paths = urlutil.get_push_paths(repo, ui, [dest] if dest else None)
537 safe_paths = [urlutil.hidepassword(p.rawloc) for p in paths]
537 safe_paths = [urlutil.hidepassword(p.rawloc) for p in paths]
538 ui.status(_(b'comparing with %s\n') % b','.join(safe_paths))
538 ui.status(_(b'comparing with %s\n') % b','.join(safe_paths))
539
539
@@ -1,6 +1,5 b''
1 [build-system]
1 [build-system]
2 requires = ["setuptools", "wheel"]
2 requires = ["setuptools", "wheel"]
3 build-backend = "setuptools.build_meta"
4
3
5 [tool.black]
4 [tool.black]
6 line-length = 80
5 line-length = 80
@@ -18,6 +18,7 b' Mercurial 6.0.'
18 * `hg fix --working-dir` now correctly works when in an uncommitted merge state
18 * `hg fix --working-dir` now correctly works when in an uncommitted merge state
19 * `rhg` (Rust fast-path for `hg`) now supports the full config list syntax
19 * `rhg` (Rust fast-path for `hg`) now supports the full config list syntax
20 * `rhg` now parses some corner-cases for revsets correctly
20 * `rhg` now parses some corner-cases for revsets correctly
21 * `hg email -o` now works again when not mentioning a revision
21 * Lots of Windows fixes
22 * Lots of Windows fixes
22 * Lots of miscellaneous other fixes
23 * Lots of miscellaneous other fixes
23
24
@@ -2626,6 +2626,45 b' test outgoing:'
2626 o 0:8580ff50825a a
2626 o 0:8580ff50825a a
2627
2627
2628 $ hg phase --force --secret -r 10
2628 $ hg phase --force --secret -r 10
2629
2630 Test without revisions specified
2631 $ hg email --date '1980-1-1 0:1' -n -o -t foo
2632 comparing with $TESTTMP/t
2633 From [test]: test
2634 this patch series consists of 1 patches.
2635
2636 Cc:
2637
2638 displaying [PATCH] d ...
2639 MIME-Version: 1.0
2640 Content-Type: text/plain; charset="us-ascii"
2641 Content-Transfer-Encoding: 7bit
2642 Subject: [PATCH] d
2643 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2644 X-Mercurial-Series-Index: 1
2645 X-Mercurial-Series-Total: 1
2646 Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@test-hostname>
2647 X-Mercurial-Series-Id: <2f9fa9b998c5fe3ac2bd.315532860@test-hostname>
2648 User-Agent: Mercurial-patchbomb/* (glob)
2649 Date: Tue, 01 Jan 1980 00:01:00 +0000
2650 From: test
2651 To: foo
2652
2653 # HG changeset patch
2654 # User test
2655 # Date 4 0
2656 # Thu Jan 01 00:00:04 1970 +0000
2657 # Branch test
2658 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2659 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2660 d
2661
2662 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
2663 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2664 +++ b/d Thu Jan 01 00:00:04 1970 +0000
2665 @@ -0,0 +1,1 @@
2666 +d
2667
2629 $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t -r 'rev(10) or rev(6)'
2668 $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t -r 'rev(10) or rev(6)'
2630 comparing with ../t
2669 comparing with ../t
2631 From [test]: test
2670 From [test]: test
General Comments 0
You need to be logged in to leave comments. Login now