| pulkit |
| hg-reviewers |
This is clearer, remove the needs for the repo._subtoppath hack and will make
our live easier when making outgoing accept multiple destinations.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| mercurial/subrepoutil.py | ||
|---|---|---|
| 386 ↗ | (On Diff #26846) | No, this is the function we need to achieve the goal o this patch. I can extract it in its own patch if you prefer. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (6 lines) | |||
| M | mercurial/hg.py (15 lines) | |||
| M | mercurial/subrepo.py (3 lines) |
| 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() | ||||
| repo._subtoppath = path.pushloc or path.loc | |||||
| try: | |||||
| return hg.outgoing(ui, repo, dest, opts) | return hg.outgoing(ui, repo, dest, opts) | ||||
| finally: | |||||
| del repo._subtoppath | |||||
| @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): | def _outgoing(ui, repo, dest, opts, subpath=None): | ||||
| path = ui.getpath(dest, default=(b'default-push', b'default')) | path = ui.getpath(dest, default=(b'default-push', b'default')) | ||||
| if not path: | if not path: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'default repository not configured!'), | _(b'default repository not configured!'), | ||||
| hint=_(b"see 'hg help config.paths'"), | hint=_(b"see 'hg help config.paths'"), | ||||
| ) | ) | ||||
| dest = path.pushloc or path.loc | dest = path.pushloc or path.loc | ||||
| if subpath is not None: | |||||
| subpath = urlutil.url(subpath) | |||||
| if subpath.isabs(): | |||||
| dest = bytes(subpath) | |||||
| else: | |||||
| p = urlutil.url(dest) | |||||
| p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | |||||
| 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) | ||||
| 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): | def outgoing(ui, repo, dest, 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) | o, other = _outgoing(ui, repo, dest, 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') | ||||
| return res.cgresult | return res.cgresult | ||||
| @annotatesubrepoerror | @annotatesubrepoerror | ||||
| def outgoing(self, ui, dest, opts): | def outgoing(self, ui, dest, opts): | ||||
| if b'rev' in opts or b'branch' in opts: | if b'rev' in opts or b'branch' in opts: | ||||
| opts = copy.copy(opts) | opts = copy.copy(opts) | ||||
| opts.pop(b'rev', None) | opts.pop(b'rev', None) | ||||
| opts.pop(b'branch', None) | opts.pop(b'branch', None) | ||||
| return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) | subpath = subrepoutil.repo_rel_or_abs_source(self._repo) | ||||
| return hg.outgoing(ui, self._repo, dest, opts, subpath=subpath) | |||||
| @annotatesubrepoerror | @annotatesubrepoerror | ||||
| def incoming(self, ui, source, opts): | def incoming(self, ui, source, opts): | ||||
| if b'rev' in opts or b'branch' in opts: | if b'rev' in opts or b'branch' in opts: | ||||
| opts = copy.copy(opts) | opts = copy.copy(opts) | ||||
| opts.pop(b'rev', None) | opts.pop(b'rev', None) | ||||
| opts.pop(b'branch', None) | opts.pop(b'branch', None) | ||||
| return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) | return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) | ||||