| pulkit |
| hg-reviewers |
| 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 (3 lines) | |||
| M | tests/test-subrepo-recursion.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| revdag = logcmdutil.graphrevs(other, chlist, opts) | revdag = logcmdutil.graphrevs(other, chlist, opts) | ||||
| logcmdutil.displaygraph( | logcmdutil.displaygraph( | ||||
| ui, repo, revdag, displayer, graphmod.asciiedges | ui, repo, revdag, displayer, graphmod.asciiedges | ||||
| ) | ) | ||||
| hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | ||||
| return 0 | return 0 | ||||
| if opts.get(b'bundle') and opts.get(b'subrepos'): | cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle']) | ||||
| raise error.Abort(_(b'cannot combine --bundle and --subrepos')) | |||||
| if opts.get(b'bookmarks'): | if opts.get(b'bookmarks'): | ||||
| source, branches = hg.parseurl( | source, branches = hg.parseurl( | ||||
| ui.expandpath(source), opts.get(b'branch') | ui.expandpath(source), opts.get(b'branch') | ||||
| ) | ) | ||||
| other = hg.peer(repo, opts, source) | other = hg.peer(repo, opts, source) | ||||
| 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")) | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: 3-4-2 | summary: 3-4-2 | ||||
| comparing with $TESTTMP/repo2/foo/bar | comparing with $TESTTMP/repo2/foo/bar | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| $ hg incoming -S --bundle incoming.hg | $ hg incoming -S --bundle incoming.hg | ||||
| abort: cannot combine --bundle and --subrepos | abort: cannot specify both --subrepos and --bundle | ||||
| [255] | [255] | ||||
| Test missing subrepo: | Test missing subrepo: | ||||
| $ rm -r foo | $ rm -r foo | ||||
| $ hg status -S | $ hg status -S | ||||
| warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo" | warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo" | ||||