# HG changeset patch # User Rishabh Madan # Date 1488022041 -19800 # Node ID 4431add9aef95aa37b44af89c773e194050d15c5 # Parent 18fb3cf572b49ad25a0f0e62ce1f737c7cef4ec1 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. diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -57,9 +57,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. @@ -72,10 +72,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 --git a/tests/test-hgrc.t b/tests/test-hgrc.t --- a/tests/test-hgrc.t +++ b/tests/test-hgrc.t @@ -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 --git a/tests/test-pull-http.t b/tests/test-pull-http.t --- a/tests/test-pull-http.t +++ b/tests/test-pull-http.t @@ -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 --git a/tests/test-revset-outgoing.t b/tests/test-revset-outgoing.t --- a/tests/test-revset-outgoing.t +++ b/tests/test-revset-outgoing.t @@ -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 --git a/tests/test-subrepo-deep-nested-change.t b/tests/test-subrepo-deep-nested-change.t --- a/tests/test-subrepo-deep-nested-change.t +++ b/tests/test-subrepo-deep-nested-change.t @@ -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 --git a/tests/test-url-rev.t b/tests/test-url-rev.t --- a/tests/test-url-rev.t +++ b/tests/test-url-rev.t @@ -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.