| pulkit |
| hg-reviewers |
This align the behavior of hg outgoing with the one of hg incoming. In addition this prepare the introduction of having simple path resolve to multiple destination in practice (eg: default)
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (42 lines) | |||
| M | mercurial/hg.py (86 lines) | |||
| M | tests/test-exchange-multi-source.t (80 lines) |
| [], | [], | ||||
| _(b'a specific branch you would like to push'), | _(b'a specific branch you would like to push'), | ||||
| _(b'BRANCH'), | _(b'BRANCH'), | ||||
| ), | ), | ||||
| ] | ] | ||||
| + logopts | + logopts | ||||
| + remoteopts | + remoteopts | ||||
| + subrepoopts, | + subrepoopts, | ||||
| _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'), | _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'), | ||||
| helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, | ||||
| ) | ) | ||||
| def outgoing(ui, repo, dest=None, **opts): | def outgoing(ui, repo, *dests, **opts): | ||||
| """show changesets not found in the destination | """show changesets not found in the destination | ||||
| Show changesets not found in the specified destination repository | Show changesets not found in the specified destination repository | ||||
| or the default push location. These are the changesets that would | or the default push location. These are the changesets that would | ||||
| be pushed if a push was requested. | be pushed if a push was requested. | ||||
| See pull for details of valid destination formats. | See pull for details of valid destination formats. | ||||
| :``changed``: push with ``-B`` will update it | :``changed``: push with ``-B`` will update it | ||||
| From the point of view of pushing behavior, bookmarks | From the point of view of pushing behavior, bookmarks | ||||
| existing only in the remote repository are treated as | existing only in the remote repository are treated as | ||||
| ``deleted``, even if it is in fact added remotely. | ``deleted``, even if it is in fact added remotely. | ||||
| Returns 0 if there are outgoing changes, 1 otherwise. | Returns 0 if there are outgoing changes, 1 otherwise. | ||||
| """ | """ | ||||
| # hg._outgoing() needs to re-resolve the path in order to handle #branch | |||||
| # style URLs, so don't overwrite dest. | |||||
| path = ui.getpath(dest, default=(b'default-push', b'default')) | |||||
| if not path: | |||||
| raise error.ConfigError( | |||||
| _(b'default repository not configured!'), | |||||
| hint=_(b"see 'hg help config.paths'"), | |||||
| ) | |||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if opts.get(b'bookmarks'): | if opts.get(b'bookmarks'): | ||||
| for path in urlutil.get_push_paths(repo, ui, dests): | |||||
| dest = path.pushloc or path.loc | dest = path.pushloc or path.loc | ||||
| other = hg.peer(repo, opts, dest) | other = hg.peer(repo, opts, dest) | ||||
| try: | try: | ||||
| if b'bookmarks' not in other.listkeys(b'namespaces'): | if b'bookmarks' not in other.listkeys(b'namespaces'): | ||||
| ui.warn(_(b"remote doesn't support bookmarks\n")) | ui.warn(_(b"remote doesn't support bookmarks\n")) | ||||
| return 0 | return 0 | ||||
| ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest)) | ui.status( | ||||
| _(b'comparing with %s\n') % urlutil.hidepassword(dest) | |||||
| ) | |||||
| ui.pager(b'outgoing') | ui.pager(b'outgoing') | ||||
| return bookmarks.outgoing(ui, repo, other) | return bookmarks.outgoing(ui, repo, other) | ||||
| finally: | finally: | ||||
| other.close() | other.close() | ||||
| return hg.outgoing(ui, repo, dest, opts) | return hg.outgoing(ui, repo, dests, opts) | ||||
| @command( | @command( | ||||
| b'parents', | b'parents', | ||||
| [ | [ | ||||
| ( | ( | ||||
| b'r', | b'r', | ||||
| b'rev', | b'rev', | ||||
| if opts.get(b'no_merges') and len(parents) == 2: | if opts.get(b'no_merges') and len(parents) == 2: | ||||
| continue | continue | ||||
| count += 1 | count += 1 | ||||
| displayer.show(other[n]) | displayer.show(other[n]) | ||||
| return _incoming(display, subreporecurse, ui, repo, source, opts) | return _incoming(display, subreporecurse, ui, repo, source, opts) | ||||
| def _outgoing(ui, repo, dest, opts, subpath=None): | def _outgoing(ui, repo, dests, opts, subpath=None): | ||||
| path = ui.getpath(dest, default=(b'default-push', b'default')) | out = set() | ||||
| if not path: | others = [] | ||||
| raise error.Abort( | for path in urlutil.get_push_paths(repo, ui, dests): | ||||
| _(b'default repository not configured!'), | |||||
| hint=_(b"see 'hg help config.paths'"), | |||||
| ) | |||||
| dest = path.pushloc or path.loc | dest = path.pushloc or path.loc | ||||
| if subpath is not None: | if subpath is not None: | ||||
| subpath = urlutil.url(subpath) | subpath = urlutil.url(subpath) | ||||
| if subpath.isabs(): | if subpath.isabs(): | ||||
| dest = bytes(subpath) | dest = bytes(subpath) | ||||
| else: | else: | ||||
| p = urlutil.url(dest) | p = urlutil.url(dest) | ||||
| p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | ||||
| dest = bytes(p) | dest = bytes(p) | ||||
| branches = path.branch, opts.get(b'branch') or [] | branches = path.branch, opts.get(b'branch') or [] | ||||
| ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest)) | ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest)) | ||||
| revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev')) | revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev')) | ||||
| if revs: | if revs: | ||||
| revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)] | revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)] | ||||
| other = peer(repo, opts, dest) | other = peer(repo, opts, dest) | ||||
| try: | try: | ||||
| outgoing = discovery.findcommonoutgoing( | outgoing = discovery.findcommonoutgoing( | ||||
| repo, other, revs, force=opts.get(b'force') | repo, other, revs, force=opts.get(b'force') | ||||
| ) | ) | ||||
| o = outgoing.missing | o = outgoing.missing | ||||
| out.update(o) | |||||
| if not o: | if not o: | ||||
| scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) | ||||
| return o, other | others.append(other) | ||||
| except: # re-raises | except: # re-raises | ||||
| other.close() | other.close() | ||||
| raise | raise | ||||
| # make sure this is ordered by revision number | |||||
| outgoing_revs = list(out) | |||||
| cl = repo.changelog | |||||
| outgoing_revs.sort(key=cl.rev) | |||||
| return outgoing_revs, others | |||||
| def _outgoing_recurse(ui, repo, dest, opts): | def _outgoing_recurse(ui, repo, dests, opts): | ||||
| ret = 1 | ret = 1 | ||||
| if opts.get(b'subrepos'): | if opts.get(b'subrepos'): | ||||
| ctx = repo[None] | ctx = repo[None] | ||||
| for subpath in sorted(ctx.substate): | for subpath in sorted(ctx.substate): | ||||
| sub = ctx.sub(subpath) | sub = ctx.sub(subpath) | ||||
| ret = min(ret, sub.outgoing(ui, dest, opts)) | ret = min(ret, sub.outgoing(ui, dests, opts)) | ||||
| return ret | return ret | ||||
| def _outgoing_filter(repo, revs, opts): | def _outgoing_filter(repo, revs, opts): | ||||
| """apply revision filtering/ordering option for outgoing""" | """apply revision filtering/ordering option for outgoing""" | ||||
| limit = logcmdutil.getlimit(opts) | limit = logcmdutil.getlimit(opts) | ||||
| no_merges = opts.get(b'no_merges') | no_merges = opts.get(b'no_merges') | ||||
| if opts.get(b'newest_first'): | if opts.get(b'newest_first'): | ||||
| break | break | ||||
| parents = [p for p in cl.parents(n) if p != nullid] | parents = [p for p in cl.parents(n) if p != nullid] | ||||
| if no_merges and len(parents) == 2: | if no_merges and len(parents) == 2: | ||||
| continue | continue | ||||
| count += 1 | count += 1 | ||||
| yield n | yield n | ||||
| def outgoing(ui, repo, dest, opts, subpath=None): | def outgoing(ui, repo, dests, opts, subpath=None): | ||||
| if opts.get(b'graph'): | if opts.get(b'graph'): | ||||
| logcmdutil.checkunsupportedgraphflags([], opts) | logcmdutil.checkunsupportedgraphflags([], opts) | ||||
| o, other = _outgoing(ui, repo, dest, opts, subpath=subpath) | o, others = _outgoing(ui, repo, dests, opts, subpath=subpath) | ||||
| ret = 1 | ret = 1 | ||||
| try: | try: | ||||
| if o: | if o: | ||||
| ret = 0 | ret = 0 | ||||
| if opts.get(b'graph'): | if opts.get(b'graph'): | ||||
| revdag = logcmdutil.graphrevs(repo, o, opts) | revdag = logcmdutil.graphrevs(repo, o, opts) | ||||
| ui.pager(b'outgoing') | ui.pager(b'outgoing') | ||||
| displayer = logcmdutil.changesetdisplayer( | displayer = logcmdutil.changesetdisplayer( | ||||
| ui, repo, opts, buffered=True | ui, repo, opts, buffered=True | ||||
| ) | ) | ||||
| logcmdutil.displaygraph( | logcmdutil.displaygraph( | ||||
| ui, repo, revdag, displayer, graphmod.asciiedges | ui, repo, revdag, displayer, graphmod.asciiedges | ||||
| ) | ) | ||||
| else: | else: | ||||
| ui.pager(b'outgoing') | ui.pager(b'outgoing') | ||||
| displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | ||||
| for n in _outgoing_filter(repo, o, opts): | for n in _outgoing_filter(repo, o, opts): | ||||
| displayer.show(repo[n]) | displayer.show(repo[n]) | ||||
| displayer.close() | displayer.close() | ||||
| cmdutil.outgoinghooks(ui, repo, other, opts, o) | for oth in others: | ||||
| ret = min(ret, _outgoing_recurse(ui, repo, dest, opts)) | cmdutil.outgoinghooks(ui, repo, oth, opts, o) | ||||
| ret = min(ret, _outgoing_recurse(ui, repo, dests, opts)) | |||||
| return ret # exit code is zero since we found outgoing changes | return ret # exit code is zero since we found outgoing changes | ||||
| finally: | finally: | ||||
| other.close() | for oth in others: | ||||
| oth.close() | |||||
| def verify(repo, level=None): | def verify(repo, level=None): | ||||
| """verify the consistency of a repository""" | """verify the consistency of a repository""" | ||||
| ret = verifymod.verify(repo, level=level) | ret = verifymod.verify(repo, level=level) | ||||
| # Broken subrepo references in hidden csets don't seem worth worrying about, | # Broken subrepo references in hidden csets don't seem worth worrying about, | ||||
| # since they can't be pushed/pulled, and --hidden can be used if they are a | # since they can't be pushed/pulled, and --hidden can be used if they are a | ||||
| push | push | ||||
| ---- | ---- | ||||
| $ cp -R ./branch-E ./branch-E-push | $ cp -R ./branch-E ./branch-E-push | ||||
| $ cp -R ./branch-G ./branch-G-push | $ cp -R ./branch-G ./branch-G-push | ||||
| $ cp -R ./branch-H ./branch-H-push | $ cp -R ./branch-H ./branch-H-push | ||||
| $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push | |||||
| comparing with ./branch-E-push | |||||
| searching for changes | |||||
| comparing with ./branch-G-push | |||||
| searching for changes | |||||
| comparing with ./branch-H-push | |||||
| searching for changes | |||||
| o changeset: 7:40faebb2ec45 | |||||
| | tag: tip | |||||
| | parent: 2:f838bfaca5c7 | |||||
| | user: test | |||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | summary: H | |||||
| | | |||||
| | o changeset: 6:c521a06b234b | |||||
| | | user: test | |||||
| | | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | | summary: G | |||||
| | | | |||||
| | o changeset: 5:2f3a4c5c1417 | |||||
| | parent: 1:27547f69f254 | |||||
| | user: test | |||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | summary: F | |||||
| | | |||||
| | o changeset: 4:a603bfb5a83e | |||||
| | | user: test | |||||
| | | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | | summary: E | |||||
| | | | |||||
| | o changeset: 3:b3325c91a4d9 | |||||
| |/ user: test | |||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | summary: D | |||||
| | | |||||
| o changeset: 2:f838bfaca5c7 | |||||
| user: test | |||||
| date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| summary: C | |||||
| $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push | $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push | ||||
| pushing to ./branch-E-push | pushing to ./branch-E-push | ||||
| searching for changes | searching for changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 3 changesets with 3 changes to 3 files (+2 heads) | added 3 changesets with 3 changes to 3 files (+2 heads) | ||||
| pushing to ./branch-G-push | pushing to ./branch-G-push | ||||
| push | push | ||||
| ---- | ---- | ||||
| We only push a specific branch with --rev | We only push a specific branch with --rev | ||||
| $ cp -R ./branch-E ./branch-E-push | $ cp -R ./branch-E ./branch-E-push | ||||
| $ cp -R ./branch-G ./branch-G-push | $ cp -R ./branch-G ./branch-G-push | ||||
| $ cp -R ./branch-H ./branch-H-push | $ cp -R ./branch-H ./branch-H-push | ||||
| $ hg out -G -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default | |||||
| comparing with ./branch-E-push | |||||
| searching for changes | |||||
| comparing with ./branch-G-push | |||||
| searching for changes | |||||
| comparing with ./branch-H-push | |||||
| searching for changes | |||||
| no changes found | |||||
| o changeset: 7:40faebb2ec45 | |||||
| | tag: tip | |||||
| | parent: 2:f838bfaca5c7 | |||||
| | user: test | |||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | summary: H | |||||
| | | |||||
| o changeset: 2:f838bfaca5c7 | |||||
| user: test | |||||
| date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| summary: C | |||||
| $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default | $ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default | ||||
| pushing to ./branch-E-push | pushing to ./branch-E-push | ||||
| searching for changes | searching for changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| pushing to ./branch-G-push | pushing to ./branch-G-push | ||||
| $ rm -rf ./*-push | $ rm -rf ./*-push | ||||
| Same push, but the first one is a no-op | Same push, but the first one is a no-op | ||||
| $ cp -R ./branch-E ./branch-E-push | $ cp -R ./branch-E ./branch-E-push | ||||
| $ cp -R ./branch-G ./branch-G-push | $ cp -R ./branch-G ./branch-G-push | ||||
| $ cp -R ./branch-H ./branch-H-push | $ cp -R ./branch-H ./branch-H-push | ||||
| $ hg out -G -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default | |||||
| comparing with ./branch-G-push | |||||
| searching for changes | |||||
| comparing with ./branch-H-push | |||||
| searching for changes | |||||
| no changes found | |||||
| comparing with ./branch-E-push | |||||
| searching for changes | |||||
| o changeset: 7:40faebb2ec45 | |||||
| | tag: tip | |||||
| | parent: 2:f838bfaca5c7 | |||||
| | user: test | |||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| | summary: H | |||||
| | | |||||
| o changeset: 2:f838bfaca5c7 | |||||
| user: test | |||||
| date: Thu Jan 01 00:00:00 1970 +0000 | |||||
| summary: C | |||||
| $ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default | $ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default | ||||
| pushing to ./branch-G-push | pushing to ./branch-G-push | ||||
| searching for changes | searching for changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 2 changesets with 2 changes to 2 files (+1 heads) | added 2 changesets with 2 changes to 2 files (+1 heads) | ||||
| pushing to ./branch-H-push | pushing to ./branch-H-push | ||||