mercurial-scm/hg: mercurial/commands.py comparison

branching: merge stable into default

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Thu, 11 Jan 2024 17:52:13 +0100
parents	d6e5bec550f1 c17cf2d51ff4
children	508fd40dc86a

comparison

equal deleted inserted replaced

-:87bfd1703597
+:7e6aae033d8d
 if cgversion == b's1':
 raise error.InputError(
 _(b'packed bundles cannot be produced by "hg bundle"'),
 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
 )
+base_opt = opts.get('base')
 if opts.get('all'):
 if dests:
 raise error.InputError(
 _(b"--all is incompatible with specifying destinations")
 )
-if opts.get('base'):
+if base_opt:
 ui.warn(_(b"ignoring --base because --all was specified\n"))
 if opts.get('exact'):
 ui.warn(_(b"ignoring --exact because --all was specified\n"))
 base = [nullrev]
 elif opts.get('exact'):
 if dests:
 raise error.InputError(
 _(b"--exact is incompatible with specifying destinations")
 )
-if opts.get('base'):
+if base_opt:
 ui.warn(_(b"ignoring --base because --exact was specified\n"))
 base = repo.revs(b'parents(%ld) - %ld', revs, revs)
 if not base:
 base = [nullrev]
+elif base_opt:
+base = logcmdutil.revrange(repo, base_opt)
+if not base:
+# base specified, but nothing was selected
+base = [nullrev]
 else:
-base = logcmdutil.revrange(repo, opts.get('base'))
+base = None
 if cgversion not in changegroup.supportedoutgoingversions(repo):
 raise error.Abort(
 _(b"repository does not support bundle version %s") % cgversion
 )
-if base:
+if base is not None:
 if dests:
 raise error.InputError(
 _(b"--base is incompatible with specifying destinations")
 )
 cl = repo.changelog

Mercurial > public > mercurial-scm > hg