mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
f69357a4da
This effectively backs out 163c899d1e46 and f44b0edaab90.
We can't handle "default-push" just like "default:pushurl" because it is a
stand-alone named path. Instead, I have two ideas to work around the issue:
a. two defaults: getpath(dest, default=('default-push', 'default'))
b. virtual path: getpath(dest, default=':default')
(a) is conservative approach and will have less trouble, but callers have
to specify they need "default-push" or "default". (b) generates hidden
":default" path from "default" and "default-push", and callers request
":default". This will require some tricks and won't work if there are
conflicting sub-options valid for both "pull" and "push".
I'll take (a) for default branch. This patch should NOT BE MERGED to default
except for tests because it would break handling of "pushurl" sub-option.
109 lines
2.5 KiB
Perl
109 lines
2.5 KiB
Perl
$ hg init a
|
|
|
|
$ echo a > a/a
|
|
$ hg --cwd a ci -Ama
|
|
adding a
|
|
|
|
$ hg clone a c
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg clone a b
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo b >> b/a
|
|
$ hg --cwd b ci -mb
|
|
|
|
Push should provide a hint when both 'default' and 'default-push' not set:
|
|
$ cd c
|
|
$ hg push --config paths.default=
|
|
abort: default repository not configured!
|
|
(see the "path" section in "hg help config")
|
|
[255]
|
|
|
|
$ cd ..
|
|
|
|
Push should push to 'default' when 'default-push' not set:
|
|
|
|
$ hg --cwd b push
|
|
pushing to $TESTTMP/a (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
Push should push to 'default-push' when set:
|
|
|
|
$ echo '[paths]' >> b/.hg/hgrc
|
|
$ echo 'default-push = ../c' >> b/.hg/hgrc
|
|
$ hg --cwd b push
|
|
pushing to $TESTTMP/c (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
But push should push to 'default' if explicitly specified (issue5000):
|
|
|
|
$ hg --cwd b push default
|
|
pushing to $TESTTMP/a (glob)
|
|
searching for changes
|
|
no changes found
|
|
[1]
|
|
|
|
Push should push to 'default-push' when 'default' is not set
|
|
|
|
$ hg -q clone a push-default-only
|
|
$ cd push-default-only
|
|
$ rm .hg/hgrc
|
|
|
|
$ touch foo
|
|
$ hg -q commit -A -m 'add foo'
|
|
$ hg --config paths.default-push=../a push
|
|
pushing to $TESTTMP/a (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
$ cd ..
|
|
|
|
Pushing to a path that isn't defined should not fall back to default
|
|
|
|
$ hg --cwd b push doesnotexist
|
|
abort: repository doesnotexist does not exist!
|
|
[255]
|
|
|
|
:pushurl is used when defined
|
|
|
|
$ hg -q clone a pushurlsource
|
|
$ hg -q clone a pushurldest
|
|
$ cd pushurlsource
|
|
|
|
Windows needs a leading slash to make a URL that passes all of the checks
|
|
$ WD=`pwd`
|
|
#if windows
|
|
$ WD="/$WD"
|
|
#endif
|
|
$ cat > .hg/hgrc << EOF
|
|
> [paths]
|
|
> default = https://example.com/not/relevant
|
|
> default:pushurl = file://$WD/../pushurldest
|
|
> EOF
|
|
|
|
$ touch pushurl
|
|
$ hg -q commit -A -m 'add pushurl'
|
|
$ hg push
|
|
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
$ cd ..
|