Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revset.py @ 35442:0ebd94ac56d1
outgoing: respect ":pushurl" paths (issue5365)
Make 'hg outgoing' respect "paths.default:pushurl" in addition to
"paths.default-push".
'hg outgoing' has always meant "what will happen if I run 'hg push'?" and it's
still documented that way:
Show changesets not found in the specified destination repository or the
default push location. These are the changesets that would be pushed if a
push was requested.
If the user uses the now-deprecated "paths.default-push" path, it continues to
work that way. However, as described at
https://bz.mercurial-scm.org/show_bug.cgi?id=5365, it doesn't behave the same
with "paths.default:pushurl".
Why does it matter? Similar to the bugzilla reporter, I have a read-only mirror
of a non-Mercurial repository:
upstream -> imported mirror -> user clone
^-----------------------/
Users push directly to upstream, and that content is then imported into the
mirror. However, those repositories are not the same; it's possible that the
mirroring has either broken completely, or an import process is running and not
yet complete. In those cases, 'hg outgoing' will list changesets that have
already been pushed.
Mozilla's desired behavior described in bug 5365 can be accomplished through
other means (e.g. 'hg outgoing default'), preserving the consistency and
meaning of 'hg outgoing'.
| author | Hollis Blanchard <hollis_blanchard@mentor.com> |
|---|---|
| date | Thu, 14 Dec 2017 15:03:55 -0800 |
| parents | 6eee2bcc57c4 |
| children | 134ef400cb11 |
comparison
equal
deleted
inserted
replaced
| 35441:cf532a62e337 | 35442:0ebd94ac56d1 |
|---|---|
| 1416 ) | 1416 ) |
| 1417 # i18n: "outgoing" is a keyword | 1417 # i18n: "outgoing" is a keyword |
| 1418 l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) | 1418 l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) |
| 1419 # i18n: "outgoing" is a keyword | 1419 # i18n: "outgoing" is a keyword |
| 1420 dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' | 1420 dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' |
| 1421 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | 1421 if not dest: |
| 1422 dest, branches = hg.parseurl(dest) | 1422 # ui.paths.getpath() explicitly tests for None, not just a boolean |
| 1423 dest = None | |
| 1424 path = repo.ui.paths.getpath(dest, default=('default-push', 'default')) | |
| 1425 if not path: | |
| 1426 raise error.Abort(_('default repository not configured!'), | |
| 1427 hint=_("see 'hg help config.paths'")) | |
| 1428 dest = path.pushloc or path.loc | |
| 1429 branches = path.branch, [] | |
| 1430 | |
| 1423 revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | 1431 revs, checkout = hg.addbranchrevs(repo, repo, branches, []) |
| 1424 if revs: | 1432 if revs: |
| 1425 revs = [repo.lookup(rev) for rev in revs] | 1433 revs = [repo.lookup(rev) for rev in revs] |
| 1426 other = hg.peer(repo, {}, dest) | 1434 other = hg.peer(repo, {}, dest) |
| 1427 repo.ui.pushbuffer() | 1435 repo.ui.pushbuffer() |