Patchwork ui: replace obsolete default-push with default:pushurl (issue5485)

login
register
mail settings
Submitter Rishabh Madan
Date Feb. 26, 2017, 4:59 a.m.
Message ID <d2c41681512393835dd8.1488085159@bunty>
Download mbox | patch
Permalink /patch/18797/
State Accepted
Headers show

Comments

Rishabh Madan - Feb. 26, 2017, 4:59 a.m.
# HG changeset patch
# User Rishabh Madan <rishabhmadan96@gmail.com>
# Date 1488022041 -19800
#      Sat Feb 25 16:57:21 2017 +0530
# Node ID d2c41681512393835dd8fc3249eb45147e22549d
# Parent  88203f26ea57627cabd7cf9c4f7843661d6c43ae
ui: replace obsolete default-push with default:pushurl (issue5485)

Default-push has been deprecated in favour of default:pushurl. But "hg clone" still
inserts this in every hgrc file it creates. This patch updates the message by replacing
default-push with default:pushurl and also makes the necessary changes to test files.
Yuya Nishihara - Feb. 27, 2017, 1:09 p.m.
On Sun, 26 Feb 2017 10:29:19 +0530, Rishabh Madan wrote:
> # HG changeset patch
> # User Rishabh Madan <rishabhmadan96@gmail.com>
> # Date 1488022041 -19800
> #      Sat Feb 25 16:57:21 2017 +0530
> # Node ID d2c41681512393835dd8fc3249eb45147e22549d
> # Parent  88203f26ea57627cabd7cf9c4f7843661d6c43ae
> ui: replace obsolete default-push with default:pushurl (issue5485)

This is considered a documentation fix, so queued for stable. Thanks.

Patch

diff -r 88203f26ea57 -r d2c416815123 mercurial/ui.py
--- a/mercurial/ui.py	Tue Feb 07 17:13:25 2017 -0500
+++ b/mercurial/ui.py	Sat Feb 25 16:57:21 2017 +0530
@@ -69,9 +69,9 @@ 
 # path aliases to other clones of this repo in URLs or filesystem paths
 # (see 'hg help config.paths' for more info)
 #
-# default-push = ssh://jdoe@example.net/hg/jdoes-fork
-# my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-# my-clone     = /home/jdoe/jdoes-clone
+# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+# my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+# my-clone        = /home/jdoe/jdoes-clone
 
 [ui]
 # name and email (local to this repository, optional), e.g.
@@ -84,10 +84,10 @@ 
 # path aliases to other clones of this repo in URLs or filesystem paths
 # (see 'hg help config.paths' for more info)
 #
-# default      = http://example.com/hg/example-repo
-# default-push = ssh://jdoe@example.net/hg/jdoes-fork
-# my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-# my-clone     = /home/jdoe/jdoes-clone
+# default         = http://example.com/hg/example-repo
+# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+# my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+# my-clone        = /home/jdoe/jdoes-clone
 
 [ui]
 # name and email (local to this repository, optional), e.g.
diff -r 88203f26ea57 -r d2c416815123 tests/test-hgrc.t
--- a/tests/test-hgrc.t	Tue Feb 07 17:13:25 2017 -0500
+++ b/tests/test-hgrc.t	Sat Feb 25 16:57:21 2017 +0530
@@ -35,9 +35,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.
diff -r 88203f26ea57 -r d2c416815123 tests/test-pull-http.t
--- a/tests/test-pull-http.t	Tue Feb 07 17:13:25 2017 -0500
+++ b/tests/test-pull-http.t	Sat Feb 25 16:57:21 2017 +0530
@@ -33,9 +33,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.
diff -r 88203f26ea57 -r d2c416815123 tests/test-revset-outgoing.t
--- a/tests/test-revset-outgoing.t	Tue Feb 07 17:13:25 2017 -0500
+++ b/tests/test-revset-outgoing.t	Sat Feb 25 16:57:21 2017 +0530
@@ -43,9 +43,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.
@@ -95,9 +95,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.
diff -r 88203f26ea57 -r d2c416815123 tests/test-subrepo-deep-nested-change.t
--- a/tests/test-subrepo-deep-nested-change.t	Tue Feb 07 17:13:25 2017 -0500
+++ b/tests/test-subrepo-deep-nested-change.t	Sat Feb 25 16:57:21 2017 +0530
@@ -134,9 +134,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.
@@ -695,9 +695,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.
diff -r 88203f26ea57 -r d2c416815123 tests/test-url-rev.t
--- a/tests/test-url-rev.t	Tue Feb 07 17:13:25 2017 -0500
+++ b/tests/test-url-rev.t	Sat Feb 25 16:57:21 2017 +0530
@@ -48,9 +48,9 @@ 
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
-  # my-clone     = /home/jdoe/jdoes-clone
+  # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-fork         = ssh://jdoe@example.net/hg/jdoes-fork
+  # my-clone        = /home/jdoe/jdoes-clone
   
   [ui]
   # name and email (local to this repository, optional), e.g.