| Alphare | |
| durin42 |
| hg-reviewers |
That code will be put in a loop in the next changeset, pre-indenting make the
next change clearer.
| No Linters Available |
| No Unit Test Coverage |
In D10160#155576, @durin42 wrote:I'm sorry to report this needs rebased
Indeed, this is conflicting with my other series. Conflict was simple, update incoming.
| b = repo._bookmarks.expandname(b) | b = repo._bookmarks.expandname(b) | ||||
| if b in repo._bookmarks: | if b in repo._bookmarks: | ||||
| opts.setdefault(b'rev', []).append(b) | opts.setdefault(b'rev', []).append(b) | ||||
| else: | else: | ||||
| # if we try to push a deleted bookmark, translate it to null | # if we try to push a deleted bookmark, translate it to null | ||||
| # this lets simultaneous -r, -b options continue working | # this lets simultaneous -r, -b options continue working | ||||
| opts.setdefault(b'rev', []).append(b"null") | opts.setdefault(b'rev', []).append(b"null") | ||||
| if True: | |||||
| path = ui.paths.getpath(dest, default=(b'default-push', b'default')) | path = ui.paths.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'"), | ||||
| ) | ) | ||||
| dest = path.pushloc or path.loc | dest = path.pushloc or path.loc | ||||
| branches = (path.branch, opts.get(b'branch') or []) | branches = (path.branch, opts.get(b'branch') or []) | ||||
| ui.status(_(b'pushing to %s\n') % util.hidepassword(dest)) | ui.status(_(b'pushing to %s\n') % util.hidepassword(dest)) | ||||
| revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev')) | revs, checkout = hg.addbranchrevs( | ||||
| repo, repo, branches, opts.get(b'rev') | |||||
| ) | |||||
| other = hg.peer(repo, opts, dest) | other = hg.peer(repo, opts, dest) | ||||
| try: | try: | ||||
| if revs: | if revs: | ||||
| revs = [repo[r].node() for r in scmutil.revrange(repo, revs)] | revs = [repo[r].node() for r in scmutil.revrange(repo, revs)] | ||||
| if not revs: | if not revs: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b"specified revisions evaluate to an empty set"), | _(b"specified revisions evaluate to an empty set"), | ||||
| hint=_(b"use different revision arguments"), | hint=_(b"use different revision arguments"), | ||||
| ) | ) | ||||
| elif path.pushrev: | elif path.pushrev: | ||||
| # It doesn't make any sense to specify ancestor revisions. So limit | # It doesn't make any sense to specify ancestor revisions. So limit | ||||
| # to DAG heads to make discovery simpler. | # to DAG heads to make discovery simpler. | ||||
| expr = revsetlang.formatspec(b'heads(%r)', path.pushrev) | expr = revsetlang.formatspec(b'heads(%r)', path.pushrev) | ||||
| revs = scmutil.revrange(repo, [expr]) | revs = scmutil.revrange(repo, [expr]) | ||||
| revs = [repo[rev].node() for rev in revs] | revs = [repo[rev].node() for rev in revs] | ||||
| if not revs: | if not revs: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b'default push revset for path evaluates to an empty set') | _( | ||||
| b'default push revset for path evaluates to an empty set' | |||||
| ) | |||||
| ) | ) | ||||
| elif ui.configbool(b'commands', b'push.require-revs'): | elif ui.configbool(b'commands', b'push.require-revs'): | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b'no revisions specified to push'), | _(b'no revisions specified to push'), | ||||
| hint=_(b'did you mean "hg push -r ."?'), | hint=_(b'did you mean "hg push -r ."?'), | ||||
| ) | ) | ||||
| repo._subtoppath = dest | repo._subtoppath = dest | ||||
| try: | try: | ||||
| # push subrepos depth-first for coherent ordering | # push subrepos depth-first for coherent ordering | ||||
| c = repo[b'.'] | c = repo[b'.'] | ||||
| 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 | ||||
| opargs = dict( | opargs = dict( | ||||
| opts.get(b'opargs', {}) | opts.get(b'opargs', {}) | ||||
| ) # copy opargs since we may mutate it | ) # copy opargs since we may mutate it | ||||
| opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', [])) | opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', [])) | ||||
| pushop = exchange.push( | pushop = exchange.push( | ||||
| repo, | repo, | ||||
| other, | other, | ||||
| opts.get(b'force'), | opts.get(b'force'), | ||||
| revs=revs, | revs=revs, | ||||
| newbranch=opts.get(b'new_branch'), | newbranch=opts.get(b'new_branch'), | ||||
| bookmarks=opts.get(b'bookmark', ()), | bookmarks=opts.get(b'bookmark', ()), | ||||
| publish=opts.get(b'publish'), | publish=opts.get(b'publish'), | ||||
| opargs=opargs, | opargs=opargs, | ||||
| ) | ) | ||||
| result = not pushop.cgresult | result = not pushop.cgresult | ||||
| if pushop.bkresult is not None: | if pushop.bkresult is not None: | ||||
| if pushop.bkresult == 2: | if pushop.bkresult == 2: | ||||
| result = 2 | result = 2 | ||||
| elif not result and pushop.bkresult: | elif not result and pushop.bkresult: | ||||
| result = 2 | result = 2 | ||||
| finally: | finally: | ||||
| other.close() | other.close() | ||||
| return result | return result | ||||
| @command( | @command( | ||||
| b'recover', | b'recover', | ||||
| [ | [ | ||||
| (b'', b'verify', False, b"run `hg verify` after successful recover"), | (b'', b'verify', False, b"run `hg verify` after successful recover"), | ||||
| ], | ], | ||||