This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2965

push: use "repo['.']" instead of old form "repo['']"
ClosedPublic

Authored by martinvonz on Mar 29 2018, 12:46 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0348c778bf70: push: use "repo['.']" instead of old form "repo['']"
Summary

Note that this does not conflict with the commit message of my
previous patch: I found this after writing the previous patch
(besides, I very easily forget things).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 29 2018, 12:46 PM
pulkit accepted this revision.Mar 29 2018, 1:51 PM
Closed by commit rHG0348c778bf70: push: use "repo['.']" instead of old form "repo['']" (authored by martinvonz). · Explain WhyMar 29 2018, 2:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mmercurial/subrepo.py (2 lines)

Diff 7365

mercurial/commands.py

revs = [repo[rev].node() for rev in revs] revs = [repo[rev].node() for rev in revs]
if not revs: if not revs:
raise error.Abort(_('default push revset for path evaluates to an ' raise error.Abort(_('default push revset for path evaluates to an '
'empty set')) 'empty set'))
repo._subtoppath = dest repo._subtoppath = dest
try: try:
# push subrepos depth-first for coherent ordering # push subrepos depth-first for coherent ordering
c = repo[''] c = repo['.']
subs = c.substate # only repos that are committed subs = c.substate # only repos that are committed
for s in sorted(subs): for s in sorted(subs):
result = c.sub(s).push(opts) result = c.sub(s).push(opts)
if result == 0: if result == 0:
return not result return not result
finally: finally:
del repo._subtoppath del repo._subtoppath

mercurial/subrepo.py

@annotatesubrepoerror @annotatesubrepoerror
def push(self, opts): def push(self, opts):
force = opts.get('force') force = opts.get('force')
newbranch = opts.get('new_branch') newbranch = opts.get('new_branch')
ssh = opts.get('ssh') ssh = opts.get('ssh')
# push subrepos depth-first for coherent ordering # push subrepos depth-first for coherent ordering
c = self._repo[''] c = self._repo['.']
subs = c.substate # only repos that are committed subs = c.substate # only repos that are committed
for s in sorted(subs): for s in sorted(subs):
if c.sub(s).push(opts) == 0: if c.sub(s).push(opts) == 0:
return False return False
dsturl = _abssource(self._repo, True) dsturl = _abssource(self._repo, True)
if not force: if not force:
if self.storeclean(dsturl): if self.storeclean(dsturl):