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

comparison mercurial/commands.py @ 49365:288de6f5d724 stable 6.2rc0

branching: merge default into stable

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Thu, 16 Jun 2022 15:28:54 +0200
parents	5bc3e76f919d 3d3d7fc6035a
children	2bbd7bc7d6c4

comparison

equal deleted inserted replaced

-:e8ea403b1c46
+:288de6f5d724
 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
-from __future__ import absolute_import
-import errno
 import os
 import re
 import sys
 from .i18n import _
 except error.UnsupportedBundleSpecification as e:
 raise error.InputError(
 pycompat.bytestr(e),
 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
 )
-cgversion = bundlespec.contentopts[b"cg.version"]
+cgversion = bundlespec.params[b"cg.version"]
 # Packed bundles are a pseudo bundle format for now.
 if cgversion == b's1':
 raise error.InputError(
 _(b'packed bundles cannot be produced by "hg bundle"'),
 if base:
 if dests:
 raise error.InputError(
 _(b"--base is incompatible with specifying destinations")
 )
-common = [repo[rev].node() for rev in base]
+cl = repo.changelog
-heads = [repo[r].node() for r in revs] if revs else None
+common = [cl.node(rev) for rev in base]
+heads = [cl.node(r) for r in revs] if revs else None
 outgoing = discovery.outgoing(repo, common, heads)
 missing = outgoing.missing
 excluded = outgoing.excluded
 else:
 missing = set()
 compopts[b'threads'] = compthreads
 # Bundling of obsmarker and phases is optional as not all clients
 # support the necessary features.
 cfg = ui.configbool
-contentopts = {
+obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker')
-b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
+bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False)
-b'obsolescence-mandatory': cfg(
+obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory')
-b'experimental', b'evolution.bundle-obsmarker:mandatory'
+bundlespec.set_param(
-),
+b'obsolescence-mandatory', obs_mand_cfg, overwrite=False
-b'phases': cfg(b'experimental', b'bundle-phases'),
+)
-}
+phases_cfg = cfg(b'experimental', b'bundle-phases')
-bundlespec.contentopts.update(contentopts)
+bundlespec.set_param(b'phases', phases_cfg, overwrite=False)
 bundle2.writenewbundle(
 ui,
 repo,
 b'bundle',
 fname,
 bversion,
 outgoing,
-bundlespec.contentopts,
+bundlespec.params,
 compression=bcompression,
 compopts=compopts,
 )
 helpcategory=command.CATEGORY_HELP,
 norepo=True,
 )
 def debugcommands(ui, cmd=b'', *args):
 """list all available commands and options"""
-for cmd, vals in sorted(pycompat.iteritems(table)):
+for cmd, vals in sorted(table.items()):
 cmd = cmd.split(b'|')[0]
 opts = b', '.join([i[1] for i in vals[1]])
 ui.write(b'%s: %s\n' % (cmd, opts))
 .. note::
 :hg:`diff` may generate unexpected results for merges, as it will
 default to comparing against the working directory's first
-parent changeset if no revisions are specified.
+parent changeset if no revisions are specified.  To diff against the
+conflict regions, you can use `--config diff.merge=yes`.
 By default, the working directory files are compared to its first parent. To
 see the differences from another revision, use --from. To see the difference
 to another revision, use --to. For example, :hg:`diff --from .^` will show
 the differences from the working copy's grandparent to the working copy,
 if b'bookmarks' in peer.listkeys(b'namespaces'):
 hexremoterev = hex(remoterev)
 bms = [
 bm
-for bm, bmr in pycompat.iteritems(
+for bm, bmr in peer.listkeys(b'bookmarks').items()
-peer.listkeys(b'bookmarks')
-)
 if bmr == hexremoterev
 ]
 return sorted(bms)
 else:
 # backup pre-resolve (merge uses .orig for its own purposes)
 a = repo.wjoin(f)
 try:
 util.copyfile(a, a + b".resolve")
-except (IOError, OSError) as inst:
+except FileNotFoundError:
-if inst.errno != errno.ENOENT:
+pass
-raise
 try:
 # preresolve file
 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
 with ui.configoverride(overrides, b'resolve'):
 # replace filemerge's .orig file with our resolve file
 try:
 util.rename(
 a + b".resolve", scmutil.backuppath(ui, repo, f)
 )
-except OSError as inst:
+except FileNotFoundError:
-if inst.errno != errno.ENOENT:
+pass
-raise
 if hasconflictmarkers:
 ui.warn(
 _(
 b'warning: the following files still have conflict '
 status = repo.status(unknown=True)
 c = repo.dirstate.copies()
 copied, renamed = [], []
-for d, s in pycompat.iteritems(c):
+for d, s in c.items():
 if s in status.removed:
 status.removed.remove(s)
 renamed.append(d)
 else:
 copied.append(d)

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 49365:288de6f5d724 stable 6.2rc0