( )⚙ D10383 outgoing: merge the code handling --graph with the main one

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10383

outgoing: merge the code handling --graph with the main one
ClosedPublic

Authored by marmoute on Apr 13 2021, 10:52 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGefc6f6a794bd: outgoing: merge the code handling --graph with the main one
Summary

The --graph code had its own copy of the logic. With the previous reorganisation
of the code, we can now merge it with the main code, reducing fragile
complication.

As a side effect, hg out --graph now use the right return code when they are
nothing outgoing. This explain the change to output in
tests/test-largefiles-misc.t.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Apr 13 2021, 10:52 AM
pulkit accepted this revision.Apr 14 2021, 7:43 PM
pulkit added a subscriber: pulkit.

Uh, didn't even know such a thing exists. I wanted it many times.

This revision is now accepted and ready to land.Apr 14 2021, 7:43 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (16 lines)
Mmercurial/hg.py (24 lines)
Mtests/test-largefiles-misc.t (1 line)

Diff 26837

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
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.ConfigError( raise error.ConfigError(
_(b'default repository not configured!'), _(b'default repository not configured!'),
hint=_(b"see 'hg help config.paths'"), hint=_(b"see 'hg help config.paths'"),
) )
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get(b'graph'):
logcmdutil.checkunsupportedgraphflags([], opts)
o, other = hg._outgoing(ui, repo, dest, opts)
if not o:
cmdutil.outgoinghooks(ui, repo, other, opts, o)
return
revdag = logcmdutil.graphrevs(repo, o, opts)
ui.pager(b'outgoing')
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
logcmdutil.displaygraph(
ui, repo, revdag, displayer, graphmod.asciiedges
)
cmdutil.outgoinghooks(ui, repo, other, opts, o)
return 0
if opts.get(b'bookmarks'): if opts.get(b'bookmarks'):
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))

mercurial/hg.py

bundlerepo, bundlerepo,
cacheutil, cacheutil,
cmdutil, cmdutil,
destutil, destutil,
discovery, discovery,
error, error,
exchange, exchange,
extensions, extensions,
graphmod,
httppeer, httppeer,
localrepo, localrepo,
lock, lock,
logcmdutil, logcmdutil,
logexchange, logexchange,
merge as mergemod, merge as mergemod,
mergestate as mergestatemod, mergestate as mergestatemod,
narrowspec, narrowspec,
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):
if opts.get(b'graph'):
logcmdutil.checkunsupportedgraphflags([], opts)
o, other = _outgoing(ui, repo, dest, opts) o, other = _outgoing(ui, repo, dest, opts)
ret = 1 ret = 1
try: try:
if o: if o:
ret = 0 ret = 0
if opts.get(b'graph'):
revdag = logcmdutil.graphrevs(repo, o, opts)
ui.pager(b'outgoing')
displayer = logcmdutil.changesetdisplayer(
ui, repo, opts, buffered=True
)
logcmdutil.displaygraph(
ui, repo, revdag, displayer, graphmod.asciiedges
)
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) cmdutil.outgoinghooks(ui, repo, other, opts, o)
ret = min(ret, _outgoing_recurse(ui, repo, dest, opts)) ret = min(ret, _outgoing_recurse(ui, repo, dest, 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() other.close()
def verify(repo, level=None): def verify(repo, level=None):

tests/test-largefiles-misc.t

largefiles: no files to upload largefiles: no files to upload
[1] [1]
$ hg -R clone2 outgoing --large --graph --template "{rev}" $ hg -R clone2 outgoing --large --graph --template "{rev}"
comparing with $TESTTMP/issue3651/src comparing with $TESTTMP/issue3651/src
searching for changes searching for changes
no changes found no changes found
largefiles: no files to upload largefiles: no files to upload
[1]
check messages when there are files to upload: check messages when there are files to upload:
$ echo b > clone2/b $ echo b > clone2/b
$ hg -R clone2 add --large clone2/b $ hg -R clone2 add --large clone2/b
$ hg -R clone2 commit -m '#1' $ hg -R clone2 commit -m '#1'
Invoking status precommit hook Invoking status precommit hook
A b A b