( )⚙ D10390 outgoing: pass subrepo path using function argument instead of abssource hack

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10390

outgoing: pass subrepo path using function argument instead of abssource hack
ClosedPublic

Authored by marmoute on Apr 13 2021, 8:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0afe96e374a7: outgoing: pass subrepo path using function argument instead of abssource hack
Summary

This is clearer, remove the needs for the repo._subtoppath hack and will make
our live easier when making outgoing accept multiple destinations.

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, 8:36 PM
baymax updated this revision to Diff 26846.Apr 13 2021, 9:10 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit added a subscriber: pulkit.Apr 14 2021, 7:47 PM
pulkit added inline comments.
mercurial/subrepoutil.py
386

Hm, this looks like an unrelated change in this patch.

marmoute added inline comments.Apr 15 2021, 3:00 AM
mercurial/subrepoutil.py
386

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.

pulkit accepted this revision.Apr 15 2021, 7:43 AM
This revision is now accepted and ready to land.Apr 15 2021, 7:43 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)
Mmercurial/hg.py (15 lines)
Mmercurial/subrepo.py (3 lines)
Mmercurial/subrepoutil.py (18 lines)

Diff 26846

mercurial/commands.py

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',

mercurial/hg.py

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')

mercurial/subrepo.py

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)

mercurial/subrepoutil.py

if b'.hgsubstate' in wctx and b'.hgsubstate' not in ( if b'.hgsubstate' in wctx and b'.hgsubstate' not in (
status.modified + status.added + status.removed status.modified + status.added + status.removed
): ):
status.removed.insert(0, b'.hgsubstate') status.removed.insert(0, b'.hgsubstate')
return subs, commitsubs, newstate return subs, commitsubs, newstate
def repo_rel_or_abs_source(repo):
pulkitUnsubmitted
Not Done

Hm, this looks like an unrelated change in this patch.

pulkit: Hm, this looks like an unrelated change in this patch.
marmouteAuthorUnsubmitted
Done

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.

marmoute: No, this is the function we need to achieve the goal o this patch. I can extract it in its own…
"""return the source of this repo
Either absolute or relative the outermost repo"""
parent = repo
chunks = []
while util.safehasattr(parent, b'_subparent'):
source = urlutil.url(parent._subsource)
chunks.append(bytes(source))
if source.isabs():
break
parent = parent._subparent
chunks.reverse()
path = posixpath.join(*chunks)
return posixpath.normpath(path)
def reporelpath(repo): def reporelpath(repo):
# type: (localrepo.localrepository) -> bytes # type: (localrepo.localrepository) -> bytes
"""return path to this (sub)repo as seen from outermost repo""" """return path to this (sub)repo as seen from outermost repo"""
parent = repo parent = repo
while util.safehasattr(parent, b'_subparent'): while util.safehasattr(parent, b'_subparent'):
parent = parent._subparent parent = parent._subparent
return repo.root[len(pathutil.normasprefix(parent.root)) :] return repo.root[len(pathutil.normasprefix(parent.root)) :]