Mercurial > hg-stable
changeset 45323:fa18b02df8dd
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 05 Aug 2020 13:36:50 -0400 |
| parents | dc283bc7e033 (diff) 3d414dce2d40 (current diff) |
| children | f55c47f41b8e |
| files | mercurial/mergestate.py |
| diffstat | 40 files changed, 1235 insertions(+), 834 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-py3-compat.py Mon Aug 03 23:13:58 2020 +0530 +++ b/contrib/check-py3-compat.py Wed Aug 05 13:36:50 2020 -0400 @@ -97,6 +97,15 @@ if sys.version_info[0] == 2: fn = check_compat_py2 else: + # check_compat_py3 will import every filename we specify as long as it + # starts with one of a few prefixes. It does this by converting + # specified filenames like 'mercurial/foo.py' to 'mercurial.foo' and + # importing that. When running standalone (not as part of a test), this + # means we actually import the installed versions, not the files we just + # specified. When running as test-check-py3-compat.t, we technically + # would import the correct paths, but it's cleaner to have both cases + # use the same import logic. + sys.path.insert(0, '.') fn = check_compat_py3 for f in sys.argv[1:]:
--- a/hgext/convert/hg.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/convert/hg.py Wed Aug 05 13:36:50 2020 -0400 @@ -217,7 +217,8 @@ """ anc = [p1ctx.ancestor(p2ctx)] # Calculate what files are coming from p2 - actions, diverge, rename = mergemod.calculateupdates( + # TODO: mresult.commitinfo might be able to get that info + mresult = mergemod.calculateupdates( self.repo, p1ctx, p2ctx, @@ -228,7 +229,7 @@ followcopies=False, ) - for file, (action, info, msg) in pycompat.iteritems(actions): + for file, (action, info, msg) in pycompat.iteritems(mresult.actions): if source.targetfilebelongstosource(file): # If the file belongs to the source repo, ignore the p2 # since it will be covered by the existing fileset.
--- a/hgext/fix.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/fix.py Wed Aug 05 13:36:50 2020 -0400 @@ -241,15 +241,15 @@ of files, unless the --whole flag is used. Some tools may always affect the whole file regardless of --whole. - If revisions are specified with --rev, those revisions will be checked, and - they may be replaced with new revisions that have fixed file content. It is - desirable to specify all descendants of each specified revision, so that the - fixes propagate to the descendants. If all descendants are fixed at the same - time, no merging, rebasing, or evolution will be required. + If --working-dir is used, files with uncommitted changes in the working copy + will be fixed. Note that no backup are made. - If --working-dir is used, files with uncommitted changes in the working copy - will be fixed. If the checked-out revision is also fixed, the working - directory will update to the replacement revision. + If revisions are specified with --source, those revisions and their + descendants will be checked, and they may be replaced with new revisions + that have fixed file content. By automatically including the descendants, + no merging, rebasing, or evolution will be required. If an ancestor of the + working copy is included, then the working copy itself will also be fixed, + and the working copy will be updated to the fixed parent. When determining what lines of each file to fix at each revision, the whole set of revisions being fixed is considered, so that fixes to earlier
--- a/hgext/hooklib/changeset_obsoleted.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/hooklib/changeset_obsoleted.py Wed Aug 05 13:36:50 2020 -0400 @@ -26,6 +26,7 @@ from mercurial import ( encoding, error, + formatter, logcmdutil, mail, obsutil, @@ -62,7 +63,7 @@ b'notify_obsoleted', b'messageidseed' ) or ui.config(b'notify', b'messageidseed') template = ui.config(b'notify_obsoleted', b'template') - spec = logcmdutil.templatespec(template, None) + spec = formatter.literal_templatespec(template) templater = logcmdutil.changesettemplater(ui, repo, spec) ui.pushbuffer() n = notify.notifier(ui, repo, b'incoming')
--- a/hgext/hooklib/changeset_published.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/hooklib/changeset_published.py Wed Aug 05 13:36:50 2020 -0400 @@ -26,6 +26,7 @@ from mercurial import ( encoding, error, + formatter, logcmdutil, mail, pycompat, @@ -61,7 +62,7 @@ b'notify_published', b'messageidseed' ) or ui.config(b'notify', b'messageidseed') template = ui.config(b'notify_published', b'template') - spec = logcmdutil.templatespec(template, None) + spec = formatter.literal_templatespec(template) templater = logcmdutil.changesettemplater(ui, repo, spec) ui.pushbuffer() n = notify.notifier(ui, repo, b'incoming')
--- a/hgext/largefiles/overrides.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/largefiles/overrides.py Wed Aug 05 13:36:50 2020 -0400 @@ -52,6 +52,8 @@ lfstatus = lfutil.lfstatus +MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr' + # -- Utility functions: commonly/repeatedly needed functionality --------------- @@ -495,6 +497,14 @@ orig(ui, repo, *pats, **opts) +# Register the MERGE_ACTION_LARGEFILE_MARK_REMOVED in emptyactions() return type +@eh.wrapfunction(merge, b'emptyactions') +def overrideemptyactions(origfn): + ret = origfn() + ret[MERGE_ACTION_LARGEFILE_MARK_REMOVED] = [] + return ret + + # Before starting the manifest merge, merge.updates will call # _checkunknownfile to check if there are any files in the merged-in # changeset that collide with unknown files in the working copy. @@ -543,16 +553,16 @@ origfn, repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs ): overwrite = force and not branchmerge - actions, diverge, renamedelete = origfn( + mresult = origfn( repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs ) if overwrite: - return actions, diverge, renamedelete + return mresult # Convert to dictionary with filename as key and action as value. lfiles = set() - for f in actions: + for f in mresult.actions: splitstandin = lfutil.splitstandin(f) if splitstandin is not None and splitstandin in p1: lfiles.add(splitstandin) @@ -561,8 +571,8 @@ for lfile in sorted(lfiles): standin = lfutil.standin(lfile) - (lm, largs, lmsg) = actions.get(lfile, (None, None, None)) - (sm, sargs, smsg) = actions.get(standin, (None, None, None)) + (lm, largs, lmsg) = mresult.actions.get(lfile, (None, None, None)) + (sm, sargs, smsg) = mresult.actions.get(standin, (None, None, None)) if sm in (b'g', b'dc') and lm != b'r': if sm == b'dc': f1, f2, fa, move, anc = sargs @@ -578,14 +588,18 @@ % lfile ) if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile - actions[lfile] = (b'r', None, b'replaced by standin') - actions[standin] = (b'g', sargs, b'replaces standin') + mresult.addfile(lfile, b'r', None, b'replaced by standin') + mresult.addfile(standin, b'g', sargs, b'replaces standin') else: # keep local normal file - actions[lfile] = (b'k', None, b'replaces standin') + mresult.addfile(lfile, b'k', None, b'replaces standin') if branchmerge: - actions[standin] = (b'k', None, b'replaced by non-standin') + mresult.addfile( + standin, b'k', None, b'replaced by non-standin', + ) else: - actions[standin] = (b'r', None, b'replaced by non-standin') + mresult.addfile( + standin, b'r', None, b'replaced by non-standin', + ) elif lm in (b'g', b'dc') and sm != b'r': if lm == b'dc': f1, f2, fa, move, anc = largs @@ -603,31 +617,36 @@ if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile if branchmerge: # largefile can be restored from standin safely - actions[lfile] = (b'k', None, b'replaced by standin') - actions[standin] = (b'k', None, b'replaces standin') + mresult.addfile( + lfile, b'k', None, b'replaced by standin', + ) + mresult.addfile(standin, b'k', None, b'replaces standin') else: # "lfile" should be marked as "removed" without # removal of itself - actions[lfile] = ( - b'lfmr', + mresult.addfile( + lfile, + MERGE_ACTION_LARGEFILE_MARK_REMOVED, None, b'forget non-standin largefile', ) # linear-merge should treat this largefile as 're-added' - actions[standin] = (b'a', None, b'keep standin') + mresult.addfile(standin, b'a', None, b'keep standin') else: # pick remote normal file - actions[lfile] = (b'g', largs, b'replaces standin') - actions[standin] = (b'r', None, b'replaced by non-standin') + mresult.addfile(lfile, b'g', largs, b'replaces standin') + mresult.addfile( + standin, b'r', None, b'replaced by non-standin', + ) - return actions, diverge, renamedelete + return mresult @eh.wrapfunction(mergestatemod, b'recordupdates') def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): - if b'lfmr' in actions: + if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions: lfdirstate = lfutil.openlfdirstate(repo.ui, repo) - for lfile, args, msg in actions[b'lfmr']: + for lfile, args, msg in actions[MERGE_ACTION_LARGEFILE_MARK_REMOVED]: # this should be executed before 'orig', to execute 'remove' # before all other actions repo.dirstate.remove(lfile)
--- a/hgext/patchbomb.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/patchbomb.py Wed Aug 05 13:36:50 2020 -0400 @@ -207,7 +207,7 @@ if not tmpl: return b' '.join(flags) out = util.stringio() - spec = formatter.templatespec(b'', templater.unquotestring(tmpl), None) + spec = formatter.literal_templatespec(templater.unquotestring(tmpl)) with formatter.templateformatter(ui, out, b'patchbombflag', {}, spec) as fm: fm.startitem() fm.context(ctx=repo[rev])
--- a/hgext/phabricator.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/phabricator.py Wed Aug 05 13:36:50 2020 -0400 @@ -238,8 +238,9 @@ def decorate(fn): def inner(*args, **kwargs): - if kwargs.get('test_vcr'): - cassette = pycompat.fsdecode(kwargs.pop('test_vcr')) + vcr = kwargs.pop('test_vcr') + if vcr: + cassette = pycompat.fsdecode(vcr) import hgdemandimport with hgdemandimport.deactivated():
--- a/hgext/remotefilelog/__init__.py Mon Aug 03 23:13:58 2020 +0530 +++ b/hgext/remotefilelog/__init__.py Wed Aug 05 13:36:50 2020 -0400 @@ -150,6 +150,7 @@ localrepo, match as matchmod, merge, + mergestate as mergestatemod, node as nodemod, patch, pycompat, @@ -479,36 +480,38 @@ # prefetch files before update def applyupdates( - orig, repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None + orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts ): if isenabled(repo): manifest = mctx.manifest() files = [] - for f, args, msg in actions[b'g']: + for f, args, msg in actions[mergestatemod.ACTION_GET]: files.append((f, hex(manifest[f]))) # batch fetch the needed files from the server repo.fileservice.prefetch(files) - return orig( - repo, actions, wctx, mctx, overwrite, wantfiledata, labels=labels - ) + return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts) # Prefetch merge checkunknownfiles -def checkunknownfiles(orig, repo, wctx, mctx, force, actions, *args, **kwargs): +def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs): if isenabled(repo): files = [] sparsematch = repo.maybesparsematch(mctx.rev()) - for f, (m, actionargs, msg) in pycompat.iteritems(actions): + for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions): if sparsematch and not sparsematch(f): continue - if m in (b'c', b'dc', b'cm'): + if m in ( + mergestatemod.ACTION_CREATED, + mergestatemod.ACTION_DELETED_CHANGED, + mergestatemod.ACTION_CREATED_MERGE, + ): files.append((f, hex(mctx.filenode(f)))) - elif m == b'dg': + elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET: f2 = actionargs[0] files.append((f2, hex(mctx.filenode(f2)))) # batch fetch the needed files from the server repo.fileservice.prefetch(files) - return orig(repo, wctx, mctx, force, actions, *args, **kwargs) + return orig(repo, wctx, mctx, force, mresult, *args, **kwargs) # Prefetch files before status attempts to look at their size and contents
--- a/mercurial/changelog.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/changelog.py Wed Aug 05 13:36:50 2020 -0400 @@ -561,43 +561,21 @@ ) sortedfiles = sorted(files) sidedata = None - if extra is not None: - for name in ( - b'p1copies', - b'p2copies', - b'filesadded', - b'filesremoved', - ): - extra.pop(name, None) - if p1copies is not None: - p1copies = metadata.encodecopies(sortedfiles, p1copies) - if p2copies is not None: - p2copies = metadata.encodecopies(sortedfiles, p2copies) - if filesadded is not None: - filesadded = metadata.encodefileindices(sortedfiles, filesadded) - if filesremoved is not None: - filesremoved = metadata.encodefileindices(sortedfiles, filesremoved) - if self._copiesstorage == b'extra': - extrasentries = p1copies, p2copies, filesadded, filesremoved - if extra is None and any(x is not None for x in extrasentries): - extra = {} - if p1copies is not None: - extra[b'p1copies'] = p1copies - if p2copies is not None: - extra[b'p2copies'] = p2copies - if filesadded is not None: - extra[b'filesadded'] = filesadded - if filesremoved is not None: - extra[b'filesremoved'] = filesremoved - elif self._copiesstorage == b'changeset-sidedata': + if self._copiesstorage == b'changeset-sidedata': sidedata = {} if p1copies: + p1copies = metadata.encodecopies(sortedfiles, p1copies) sidedata[sidedatamod.SD_P1COPIES] = p1copies if p2copies: + p2copies = metadata.encodecopies(sortedfiles, p2copies) sidedata[sidedatamod.SD_P2COPIES] = p2copies if filesadded: + filesadded = metadata.encodefileindices(sortedfiles, filesadded) sidedata[sidedatamod.SD_FILESADDED] = filesadded if filesremoved: + filesremoved = metadata.encodefileindices( + sortedfiles, filesremoved + ) sidedata[sidedatamod.SD_FILESREMOVED] = filesremoved if not sidedata: sidedata = None
--- a/mercurial/cmdutil.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/cmdutil.py Wed Aug 05 13:36:50 2020 -0400 @@ -3375,7 +3375,7 @@ def buildcommittemplate(repo, ctx, subs, extramsg, ref): ui = repo.ui - spec = formatter.templatespec(ref, None, None) + spec = formatter.reference_templatespec(ref) t = logcmdutil.changesettemplater(ui, repo, spec) t.t.cache.update( (k, templater.unquotestring(v))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/commit.py Wed Aug 05 13:36:50 2020 -0400 @@ -0,0 +1,445 @@ +# commit.py - fonction to perform commit +# +# 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 + +from .i18n import _ +from .node import ( + hex, + nullid, + nullrev, +) + +from . import ( + context, + mergestate, + metadata, + phases, + scmutil, + subrepoutil, +) + + +def _write_copy_meta(repo): + """return a (changelog, filelog) boolean tuple + + changelog: copy related information should be stored in the changeset + filelof: copy related information should be written in the file revision + """ + if repo.filecopiesmode == b'changeset-sidedata': + writechangesetcopy = True + writefilecopymeta = True + else: + writecopiesto = repo.ui.config(b'experimental', b'copies.write-to') + writefilecopymeta = writecopiesto != b'changeset-only' + writechangesetcopy = writecopiesto in ( + b'changeset-only', + b'compatibility', + ) + return writechangesetcopy, writefilecopymeta + + +def commitctx(repo, ctx, error=False, origctx=None): + """Add a new revision to the target repository. + Revision information is passed via the context argument. + + ctx.files() should list all files involved in this commit, i.e. + modified/added/removed files. On merge, it may be wider than the + ctx.files() to be committed, since any file nodes derived directly + from p1 or p2 are excluded from the committed ctx.files(). + + origctx is for convert to work around the problem that bug + fixes to the files list in changesets change hashes. For + convert to be the identity, it can pass an origctx and this + function will use the same files list when it makes sense to + do so. + """ + repo = repo.unfiltered() + + p1, p2 = ctx.p1(), ctx.p2() + user = ctx.user() + + with repo.lock(), repo.transaction(b"commit") as tr: + r = _prepare_files(tr, ctx, error=error, origctx=origctx) + mn, files, p1copies, p2copies, filesadded, filesremoved = r + + extra = ctx.extra().copy() + + files = sorted(files) + if extra is not None: + for name in ( + b'p1copies', + b'p2copies', + b'filesadded', + b'filesremoved', + ): + extra.pop(name, None) + if repo.changelog._copiesstorage == b'extra': + extra = _extra_with_copies( + repo, extra, files, p1copies, p2copies, filesadded, filesremoved + ) + + # update changelog + repo.ui.note(_(b"committing changelog\n")) + repo.changelog.delayupdate(tr) + n = repo.changelog.add( + mn, + files, + ctx.description(), + tr, + p1.node(), + p2.node(), + user, + ctx.date(), + extra, + p1copies, + p2copies, + filesadded, + filesremoved, + ) + xp1, xp2 = p1.hex(), p2 and p2.hex() or b'' + repo.hook( + b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2, + ) + # set the new commit is proper phase + targetphase = subrepoutil.newcommitphase(repo.ui, ctx) + if targetphase: + # retract boundary do not alter parent changeset. + # if a parent have higher the resulting phase will + # be compliant anyway + # + # if minimal phase was 0 we don't need to retract anything + phases.registernew(repo, tr, targetphase, [n]) + return n + + +def _prepare_files(tr, ctx, error=False, origctx=None): + repo = ctx.repo() + p1 = ctx.p1() + + writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) + + p1copies, p2copies = None, None + if writechangesetcopy: + p1copies = ctx.p1copies() + p2copies = ctx.p2copies() + filesadded, filesremoved = None, None + if ctx.manifestnode(): + # reuse an existing manifest revision + repo.ui.debug(b'reusing known manifest\n') + mn = ctx.manifestnode() + touched = ctx.files() + if writechangesetcopy: + filesadded = ctx.filesadded() + filesremoved = ctx.filesremoved() + elif not ctx.files(): + repo.ui.debug(b'reusing manifest from p1 (no file change)\n') + mn = p1.manifestnode() + touched = [] + else: + mn, touched, added, removed = _process_files(tr, ctx, error=error) + if writechangesetcopy: + filesremoved = removed + filesadded = added + + if origctx and origctx.manifestnode() == mn: + touched = origctx.files() + + return mn, touched, p1copies, p2copies, filesadded, filesremoved + + +def _process_files(tr, ctx, error=False): + repo = ctx.repo() + p1 = ctx.p1() + p2 = ctx.p2() + + writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) + + m1ctx = p1.manifestctx() + m2ctx = p2.manifestctx() + mctx = m1ctx.copy() + + m = mctx.read() + m1 = m1ctx.read() + m2 = m2ctx.read() + + # check in files + added = [] + filesadded = [] + removed = list(ctx.removed()) + touched = [] + linkrev = len(repo) + repo.ui.note(_(b"committing files:\n")) + uipathfn = scmutil.getuipathfn(repo) + for f in sorted(ctx.modified() + ctx.added()): + repo.ui.note(uipathfn(f) + b"\n") + try: + fctx = ctx[f] + if fctx is None: + removed.append(f) + else: + added.append(f) + m[f], is_touched = _filecommit( + repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, + ) + if is_touched: + touched.append(f) + if is_touched == 'added': + filesadded.append(f) + m.setflag(f, fctx.flags()) + except OSError: + repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f)) + raise + except IOError as inst: + errcode = getattr(inst, 'errno', errno.ENOENT) + if error or errcode and errcode != errno.ENOENT: + repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f)) + raise + + # update manifest + removed = [f for f in removed if f in m1 or f in m2] + drop = sorted([f for f in removed if f in m]) + for f in drop: + del m[f] + if p2.rev() != nullrev: + rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2)) + removed = [f for f in removed if not rf(f)] + + touched.extend(removed) + + files = touched + mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files, added, drop) + + return mn, files, filesadded, removed + + +def _filecommit( + repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta, +): + """ + commit an individual file as part of a larger transaction + + input: + + fctx: a file context with the content we are trying to commit + manifest1: manifest of changeset first parent + manifest2: manifest of changeset second parent + linkrev: revision number of the changeset being created + tr: current transation + individual: boolean, set to False to skip storing the copy data + (only used by the Google specific feature of using + changeset extra as copy source of truth). + + output: (filenode, touched) + + filenode: the filenode that should be used by this changeset + touched: one of: None (mean untouched), 'added' or 'modified' + """ + + fname = fctx.path() + fparent1 = manifest1.get(fname, nullid) + fparent2 = manifest2.get(fname, nullid) + touched = None + if fparent1 == fparent2 == nullid: + touched = 'added' + + if isinstance(fctx, context.filectx): + # This block fast path most comparisons which are usually done. It + # assumes that bare filectx is used and no merge happened, hence no + # need to create a new file revision in this case. + node = fctx.filenode() + if node in [fparent1, fparent2]: + repo.ui.debug(b'reusing %s filelog entry\n' % fname) + if ( + fparent1 != nullid and manifest1.flags(fname) != fctx.flags() + ) or ( + fparent2 != nullid and manifest2.flags(fname) != fctx.flags() + ): + touched = 'modified' + return node, touched + + flog = repo.file(fname) + meta = {} + cfname = fctx.copysource() + fnode = None + + if cfname and cfname != fname: + # Mark the new revision of this file as a copy of another + # file. This copy data will effectively act as a parent + # of this new revision. If this is a merge, the first + # parent will be the nullid (meaning "look up the copy data") + # and the second one will be the other parent. For example: + # + # 0 --- 1 --- 3 rev1 changes file foo + # \ / rev2 renames foo to bar and changes it + # \- 2 -/ rev3 should have bar with all changes and + # should record that bar descends from + # bar in rev2 and foo in rev1 + # + # this allows this merge to succeed: + # + # 0 --- 1 --- 3 rev4 reverts the content change from rev2 + # \ / merging rev3 and rev4 should use bar@rev2 + # \- 2 --- 4 as the merge base + # + + cnode = manifest1.get(cfname) + newfparent = fparent2 + + if manifest2: # branch merge + if fparent2 == nullid or cnode is None: # copied on remote side + if cfname in manifest2: + cnode = manifest2[cfname] + newfparent = fparent1 + + # Here, we used to search backwards through history to try to find + # where the file copy came from if the source of a copy was not in + # the parent directory. However, this doesn't actually make sense to + # do (what does a copy from something not in your working copy even + # mean?) and it causes bugs (eg, issue4476). Instead, we will warn + # the user that copy information was dropped, so if they didn't + # expect this outcome it can be fixed, but this is the correct + # behavior in this circumstance. + + if cnode: + repo.ui.debug(b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode))) + if includecopymeta: + meta[b"copy"] = cfname + meta[b"copyrev"] = hex(cnode) + fparent1, fparent2 = nullid, newfparent + else: + repo.ui.warn( + _( + b"warning: can't find ancestor for '%s' " + b"copied from '%s'!\n" + ) + % (fname, cfname) + ) + + elif fparent1 == nullid: + fparent1, fparent2 = fparent2, nullid + elif fparent2 != nullid: + # is one parent an ancestor of the other? + fparentancestors = flog.commonancestorsheads(fparent1, fparent2) + if fparent1 in fparentancestors: + fparent1, fparent2 = fparent2, nullid + elif fparent2 in fparentancestors: + fparent2 = nullid + elif not fparentancestors: + # TODO: this whole if-else might be simplified much more + ms = mergestate.mergestate.read(repo) + if ( + fname in ms + and ms[fname] == mergestate.MERGE_RECORD_MERGED_OTHER + ): + fparent1, fparent2 = fparent2, nullid + + # is the file changed? + text = fctx.data() + if fparent2 != nullid or meta or flog.cmp(fparent1, text): + if touched is None: # do not overwrite added + touched = 'modified' + fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2) + # are just the flags changed during merge? + elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): + touched = 'modified' + fnode = fparent1 + else: + fnode = fparent1 + return fnode, touched + + +def _commit_manifest(tr, linkrev, ctx, mctx, manifest, files, added, drop): + """make a new manifest entry (or reuse a new one) + + given an initialised manifest context and precomputed list of + - files: files affected by the commit + - added: new entries in the manifest + - drop: entries present in parents but absent of this one + + Create a new manifest revision, reuse existing ones if possible. + + Return the nodeid of the manifest revision. + """ + repo = ctx.repo() + + md = None + + # all this is cached, so it is find to get them all from the ctx. + p1 = ctx.p1() + p2 = ctx.p2() + m1ctx = p1.manifestctx() + + m1 = m1ctx.read() + + if not files: + # if no "files" actually changed in terms of the changelog, + # try hard to detect unmodified manifest entry so that the + # exact same commit can be reproduced later on convert. + md = m1.diff(manifest, scmutil.matchfiles(repo, ctx.files())) + if not files and md: + repo.ui.debug( + b'not reusing manifest (no file change in ' + b'changelog, but manifest differs)\n' + ) + if files or md: + repo.ui.note(_(b"committing manifest\n")) + # we're using narrowmatch here since it's already applied at + # other stages (such as dirstate.walk), so we're already + # ignoring things outside of narrowspec in most cases. The + # one case where we might have files outside the narrowspec + # at this point is merges, and we already error out in the + # case where the merge has files outside of the narrowspec, + # so this is safe. + mn = mctx.write( + tr, + linkrev, + p1.manifestnode(), + p2.manifestnode(), + added, + drop, + match=repo.narrowmatch(), + ) + else: + repo.ui.debug( + b'reusing manifest from p1 (listed files ' b'actually unchanged)\n' + ) + mn = p1.manifestnode() + + return mn + + +def _extra_with_copies( + repo, extra, files, p1copies, p2copies, filesadded, filesremoved +): + """encode copy information into a `extra` dictionnary""" + if not _write_copy_meta(repo)[1]: + # If writing only to changeset extras, use None to indicate that + # no entry should be written. If writing to both, write an empty + # entry to prevent the reader from falling back to reading + # filelogs. + p1copies = p1copies or None + p2copies = p2copies or None + filesadded = filesadded or None + filesremoved = filesremoved or None + + extrasentries = p1copies, p2copies, filesadded, filesremoved + if extra is None and any(x is not None for x in extrasentries): + extra = {} + if p1copies is not None: + p1copies = metadata.encodecopies(files, p1copies) + extra[b'p1copies'] = p1copies + if p2copies is not None: + p2copies = metadata.encodecopies(files, p2copies) + extra[b'p2copies'] = p2copies + if filesadded is not None: + filesadded = metadata.encodefileindices(files, filesadded) + extra[b'filesadded'] = filesadded + if filesremoved is not None: + filesremoved = metadata.encodefileindices(files, filesremoved) + extra[b'filesremoved'] = filesremoved + return extra
--- a/mercurial/config.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/config.py Wed Aug 05 13:36:50 2020 -0400 @@ -21,10 +21,9 @@ class config(object): - def __init__(self, data=None, includepaths=None): + def __init__(self, data=None): self._data = {} self._unset = [] - self._includepaths = includepaths or [] if data: for k in data._data: self._data[k] = data[k].copy() @@ -162,21 +161,15 @@ if m and include: expanded = util.expandpath(m.group(1)) - includepaths = [os.path.dirname(src)] + self._includepaths - - for base in includepaths: - inc = os.path.normpath(os.path.join(base, expanded)) - - try: - include(inc, remap=remap, sections=sections) - break - except IOError as inst: - if inst.errno != errno.ENOENT: - raise error.ParseError( - _(b"cannot include %s (%s)") - % (inc, encoding.strtolocal(inst.strerror)), - b"%s:%d" % (src, line), - ) + try: + include(expanded, remap=remap, sections=sections) + except IOError as inst: + if inst.errno != errno.ENOENT: + raise error.ParseError( + _(b"cannot include %s (%s)") + % (expanded, encoding.strtolocal(inst.strerror)), + b"%s:%d" % (src, line), + ) continue if emptyre.match(l): continue @@ -216,8 +209,15 @@ b'config files must be opened in binary mode, got fp=%r mode=%r' % (fp, fp.mode,) ) + + dir = os.path.dirname(path) + + def include(rel, remap, sections): + abs = os.path.normpath(os.path.join(dir, rel)) + self.read(abs, remap=remap, sections=sections) + self.parse( - path, fp.read(), sections=sections, remap=remap, include=self.read + path, fp.read(), sections=sections, remap=remap, include=include )
--- a/mercurial/debugcommands.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/debugcommands.py Wed Aug 05 13:36:50 2020 -0400 @@ -1668,8 +1668,8 @@ fm.data(re2=bool(util._re2)) # templates - p = templater.templatepaths() - fm.write(b'templatedirs', b'checking templates (%s)...\n', b' '.join(p)) + p = templater.templatedir() + fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'') fm.condwrite(not p, b'', _(b" no template directories found\n")) if p: m = templater.templatepath(b"map-cmdline.default")
--- a/mercurial/dirstate.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/dirstate.py Wed Aug 05 13:36:50 2020 -0400 @@ -1425,6 +1425,7 @@ self._opener = opener self._root = root self._filename = b'dirstate' + self._nodelen = 20 self._parents = None self._dirtyparents = False @@ -1609,7 +1610,7 @@ if not self._parents: try: fp = self._opendirstatefile() - st = fp.read(40) + st = fp.read(2 * self._nodelen) fp.close() except IOError as err: if err.errno != errno.ENOENT: @@ -1618,8 +1619,11 @@ st = b'' l = len(st) - if l == 40: - self._parents = (st[:20], st[20:40]) + if l == self._nodelen * 2: + self._parents = ( + st[: self._nodelen], + st[self._nodelen : 2 * self._nodelen], + ) elif l == 0: self._parents = (nullid, nullid) else: @@ -1654,15 +1658,11 @@ if util.safehasattr(parsers, b'dict_new_presized'): # Make an estimate of the number of files in the dirstate based on - # its size. From a linear regression on a set of real-world repos, - # all over 10,000 files, the size of a dirstate entry is 85 - # bytes. The cost of resizing is significantly higher than the cost - # of filling in a larger presized dict, so subtract 20% from the - # size. - # - # This heuristic is imperfect in many ways, so in a future dirstate - # format update it makes sense to just record the number of entries - # on write. + # its size. This trades wasting some memory for avoiding costly + # resizes. Each entry have a prefix of 17 bytes followed by one or + # two path names. Studies on various large-scale real-world repositories + # found 54 bytes a reasonable upper limit for the average path names. + # Copy entries are ignored for the sake of this estimate. self._map = parsers.dict_new_presized(len(st) // 71) # Python's garbage collector triggers a GC each time a certain number
--- a/mercurial/formatter.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/formatter.py Wed Aug 05 13:36:50 2020 -0400 @@ -542,6 +542,24 @@ refargs = attr.ib(default=None) +def empty_templatespec(): + return templatespec(None, None, None) + + +def reference_templatespec(ref, refargs=None): + return templatespec(ref, None, None, refargs) + + +def literal_templatespec(tmpl): + if pycompat.ispy3: + assert not isinstance(tmpl, str), b'tmpl must not be a str' + return templatespec(b'', tmpl, None) + + +def mapfile_templatespec(topic, mapfile): + return templatespec(topic, None, mapfile) + + def lookuptemplate(ui, topic, tmpl): """Find the template matching the given -T/--template spec 'tmpl' @@ -563,33 +581,33 @@ """ if not tmpl: - return templatespec(None, None, None) + return empty_templatespec() # looks like a literal template? if b'{' in tmpl: - return templatespec(b'', tmpl, None) + return literal_templatespec(tmpl) # a reference to built-in (formatter) template if tmpl in {b'cbor', b'json', b'pickle', b'debug'}: - return templatespec(tmpl, None, None) + return reference_templatespec(tmpl) # a function-style reference to built-in template func, fsep, ftail = tmpl.partition(b'(') if func in {b'cbor', b'json'} and fsep and ftail.endswith(b')'): templater.parseexpr(tmpl) # make sure syntax errors are confined - return templatespec(func, None, None, refargs=ftail[:-1]) + return reference_templatespec(func, refargs=ftail[:-1]) # perhaps a stock style? if not os.path.split(tmpl)[0]: mapname = templater.templatepath( b'map-cmdline.' + tmpl ) or templater.templatepath(tmpl) - if mapname and os.path.isfile(mapname): - return templatespec(topic, None, mapname) + if mapname: + return mapfile_templatespec(topic, mapname) # perhaps it's a reference to [templates] if ui.config(b'templates', tmpl): - return templatespec(tmpl, None, None) + return reference_templatespec(tmpl) if tmpl == b'list': ui.write(_(b"available styles: %s\n") % templater.stylelist()) @@ -599,13 +617,13 @@ if (b'/' in tmpl or b'\\' in tmpl) and os.path.isfile(tmpl): # is it a mapfile for a style? if os.path.basename(tmpl).startswith(b"map-"): - return templatespec(topic, None, os.path.realpath(tmpl)) + return mapfile_templatespec(topic, os.path.realpath(tmpl)) with util.posixfile(tmpl, b'rb') as f: tmpl = f.read() - return templatespec(b'', tmpl, None) + return literal_templatespec(tmpl) # constant string? - return templatespec(b'', tmpl, None) + return literal_templatespec(tmpl) def templatepartsmap(spec, t, partnames): @@ -626,8 +644,7 @@ a map file""" assert not (spec.tmpl and spec.mapfile) if spec.mapfile: - frommapfile = templater.templater.frommapfile - return frommapfile( + return templater.templater.frommapfile( spec.mapfile, defaults=defaults, resources=resources, cache=cache ) return maketemplater(
--- a/mercurial/hgweb/hgwebdir_mod.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/hgweb/hgwebdir_mod.py Wed Aug 05 13:36:50 2020 -0400 @@ -414,10 +414,9 @@ fname = req.qsparams[b'static'] static = self.ui.config(b"web", b"static", untrusted=False) if not static: - tp = self.templatepath or templater.templatepaths() - if isinstance(tp, bytes): - tp = [tp] - static = [os.path.join(p, b'static') for p in tp] + tp = self.templatepath or templater.templatedir() + if tp is not None: + static = [os.path.join(tp, b'static')] staticfile(static, fname, res) return res.sendresponse()
--- a/mercurial/hgweb/webcommands.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/hgweb/webcommands.py Wed Aug 05 13:36:50 2020 -0400 @@ -1319,10 +1319,8 @@ # readable by the user running the CGI script static = web.config(b"web", b"static", untrusted=False) if not static: - tp = web.templatepath or templater.templatepaths() - if isinstance(tp, bytes): - tp = [tp] - static = [os.path.join(p, b'static') for p in tp] + tp = web.templatepath or templater.templatedir() + static = [os.path.join(tp, b'static')] staticfile(static, fname, web.res) return web.res.sendresponse()
--- a/mercurial/localrepo.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/localrepo.py Wed Aug 05 13:36:50 2020 -0400 @@ -32,6 +32,7 @@ bundle2, changegroup, color, + commit, context, dirstate, dirstateguard, @@ -46,7 +47,6 @@ match as matchmod, mergestate as mergestatemod, mergeutil, - metadata, namespaces, narrowspec, obsolete, @@ -2771,140 +2771,6 @@ """Returns the wlock if it's held, or None if it's not.""" return self._currentlock(self._wlockref) - def _filecommit( - self, - fctx, - manifest1, - manifest2, - linkrev, - tr, - changelist, - includecopymeta, - ): - """ - commit an individual file as part of a larger transaction - - input: - - fctx: a file context with the content we are trying to commit - manifest1: manifest of changeset first parent - manifest2: manifest of changeset second parent - linkrev: revision number of the changeset being created - tr: current transation - changelist: list of file being changed (modified inplace) - individual: boolean, set to False to skip storing the copy data - (only used by the Google specific feature of using - changeset extra as copy source of truth). - - output: - - The resulting filenode - """ - - fname = fctx.path() - fparent1 = manifest1.get(fname, nullid) - fparent2 = manifest2.get(fname, nullid) - if isinstance(fctx, context.filectx): - node = fctx.filenode() - if node in [fparent1, fparent2]: - self.ui.debug(b'reusing %s filelog entry\n' % fname) - if ( - fparent1 != nullid - and manifest1.flags(fname) != fctx.flags() - ) or ( - fparent2 != nullid - and manifest2.flags(fname) != fctx.flags() - ): - changelist.append(fname) - return node - - flog = self.file(fname) - meta = {} - cfname = fctx.copysource() - if cfname and cfname != fname: - # Mark the new revision of this file as a copy of another - # file. This copy data will effectively act as a parent - # of this new revision. If this is a merge, the first - # parent will be the nullid (meaning "look up the copy data") - # and the second one will be the other parent. For example: - # - # 0 --- 1 --- 3 rev1 changes file foo - # \ / rev2 renames foo to bar and changes it - # \- 2 -/ rev3 should have bar with all changes and - # should record that bar descends from - # bar in rev2 and foo in rev1 - # - # this allows this merge to succeed: - # - # 0 --- 1 --- 3 rev4 reverts the content change from rev2 - # \ / merging rev3 and rev4 should use bar@rev2 - # \- 2 --- 4 as the merge base - # - - cnode = manifest1.get(cfname) - newfparent = fparent2 - - if manifest2: # branch merge - if fparent2 == nullid or cnode is None: # copied on remote side - if cfname in manifest2: - cnode = manifest2[cfname] - newfparent = fparent1 - - # Here, we used to search backwards through history to try to find - # where the file copy came from if the source of a copy was not in - # the parent directory. However, this doesn't actually make sense to - # do (what does a copy from something not in your working copy even - # mean?) and it causes bugs (eg, issue4476). Instead, we will warn - # the user that copy information was dropped, so if they didn't - # expect this outcome it can be fixed, but this is the correct - # behavior in this circumstance. - - if cnode: - self.ui.debug( - b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode)) - ) - if includecopymeta: - meta[b"copy"] = cfname - meta[b"copyrev"] = hex(cnode) - fparent1, fparent2 = nullid, newfparent - else: - self.ui.warn( - _( - b"warning: can't find ancestor for '%s' " - b"copied from '%s'!\n" - ) - % (fname, cfname) - ) - - elif fparent1 == nullid: - fparent1, fparent2 = fparent2, nullid - elif fparent2 != nullid: - # is one parent an ancestor of the other? - fparentancestors = flog.commonancestorsheads(fparent1, fparent2) - if fparent1 in fparentancestors: - fparent1, fparent2 = fparent2, nullid - elif fparent2 in fparentancestors: - fparent2 = nullid - elif not fparentancestors: - # TODO: this whole if-else might be simplified much more - ms = mergestatemod.mergestate.read(self) - if ( - fname in ms - and ms[fname] == mergestatemod.MERGE_RECORD_MERGED_OTHER - ): - fparent1, fparent2 = fparent2, nullid - - # is the file changed? - text = fctx.data() - if fparent2 != nullid or meta or flog.cmp(fparent1, text): - changelist.append(fname) - return flog.add(text, meta, tr, linkrev, fparent1, fparent2) - # are just the flags changed during merge? - elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): - changelist.append(fname) - - return fparent1 - def checkcommitpatterns(self, wctx, match, status, fail): """check for commit arguments that aren't committable""" if match.isexact() or match.prefix(): @@ -3062,203 +2928,7 @@ @unfilteredmethod def commitctx(self, ctx, error=False, origctx=None): - """Add a new revision to current repository. - Revision information is passed via the context argument. - - ctx.files() should list all files involved in this commit, i.e. - modified/added/removed files. On merge, it may be wider than the - ctx.files() to be committed, since any file nodes derived directly - from p1 or p2 are excluded from the committed ctx.files(). - - origctx is for convert to work around the problem that bug - fixes to the files list in changesets change hashes. For - convert to be the identity, it can pass an origctx and this - function will use the same files list when it makes sense to - do so. - """ - - p1, p2 = ctx.p1(), ctx.p2() - user = ctx.user() - - if self.filecopiesmode == b'changeset-sidedata': - writechangesetcopy = True - writefilecopymeta = True - writecopiesto = None - else: - writecopiesto = self.ui.config(b'experimental', b'copies.write-to') - writefilecopymeta = writecopiesto != b'changeset-only' - writechangesetcopy = writecopiesto in ( - b'changeset-only', - b'compatibility', - ) - p1copies, p2copies = None, None - if writechangesetcopy: - p1copies = ctx.p1copies() - p2copies = ctx.p2copies() - filesadded, filesremoved = None, None - with self.lock(), self.transaction(b"commit") as tr: - trp = weakref.proxy(tr) - - if ctx.manifestnode(): - # reuse an existing manifest revision - self.ui.debug(b'reusing known manifest\n') - mn = ctx.manifestnode() - files = ctx.files() - if writechangesetcopy: - filesadded = ctx.filesadded() - filesremoved = ctx.filesremoved() - elif ctx.files(): - m1ctx = p1.manifestctx() - m2ctx = p2.manifestctx() - mctx = m1ctx.copy() - - m = mctx.read() - m1 = m1ctx.read() - m2 = m2ctx.read() - - # check in files - added = [] - changed = [] - removed = list(ctx.removed()) - linkrev = len(self) - self.ui.note(_(b"committing files:\n")) - uipathfn = scmutil.getuipathfn(self) - for f in sorted(ctx.modified() + ctx.added()): - self.ui.note(uipathfn(f) + b"\n") - try: - fctx = ctx[f] - if fctx is None: - removed.append(f) - else: - added.append(f) - m[f] = self._filecommit( - fctx, - m1, - m2, - linkrev, - trp, - changed, - writefilecopymeta, - ) - m.setflag(f, fctx.flags()) - except OSError: - self.ui.warn( - _(b"trouble committing %s!\n") % uipathfn(f) - ) - raise - except IOError as inst: - errcode = getattr(inst, 'errno', errno.ENOENT) - if error or errcode and errcode != errno.ENOENT: - self.ui.warn( - _(b"trouble committing %s!\n") % uipathfn(f) - ) - raise - - # update manifest - removed = [f for f in removed if f in m1 or f in m2] - drop = sorted([f for f in removed if f in m]) - for f in drop: - del m[f] - if p2.rev() != nullrev: - rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2)) - removed = [f for f in removed if not rf(f)] - - files = changed + removed - md = None - if not files: - # if no "files" actually changed in terms of the changelog, - # try hard to detect unmodified manifest entry so that the - # exact same commit can be reproduced later on convert. - md = m1.diff(m, scmutil.matchfiles(self, ctx.files())) - if not files and md: - self.ui.debug( - b'not reusing manifest (no file change in ' - b'changelog, but manifest differs)\n' - ) - if files or md: - self.ui.note(_(b"committing manifest\n")) - # we're using narrowmatch here since it's already applied at - # other stages (such as dirstate.walk), so we're already - # ignoring things outside of narrowspec in most cases. The - # one case where we might have files outside the narrowspec - # at this point is merges, and we already error out in the - # case where the merge has files outside of the narrowspec, - # so this is safe. - mn = mctx.write( - trp, - linkrev, - p1.manifestnode(), - p2.manifestnode(), - added, - drop, - match=self.narrowmatch(), - ) - - if writechangesetcopy: - filesadded = [ - f for f in changed if not (f in m1 or f in m2) - ] - filesremoved = removed - else: - self.ui.debug( - b'reusing manifest from p1 (listed files ' - b'actually unchanged)\n' - ) - mn = p1.manifestnode() - else: - self.ui.debug(b'reusing manifest from p1 (no file change)\n') - mn = p1.manifestnode() - files = [] - - if writecopiesto == b'changeset-only': - # If writing only to changeset extras, use None to indicate that - # no entry should be written. If writing to both, write an empty - # entry to prevent the reader from falling back to reading - # filelogs. - p1copies = p1copies or None - p2copies = p2copies or None - filesadded = filesadded or None - filesremoved = filesremoved or None - - if origctx and origctx.manifestnode() == mn: - files = origctx.files() - - # update changelog - self.ui.note(_(b"committing changelog\n")) - self.changelog.delayupdate(tr) - n = self.changelog.add( - mn, - files, - ctx.description(), - trp, - p1.node(), - p2.node(), - user, - ctx.date(), - ctx.extra().copy(), - p1copies, - p2copies, - filesadded, - filesremoved, - ) - xp1, xp2 = p1.hex(), p2 and p2.hex() or b'' - self.hook( - b'pretxncommit', - throw=True, - node=hex(n), - parent1=xp1, - parent2=xp2, - ) - # set the new commit is proper phase - targetphase = subrepoutil.newcommitphase(self.ui, ctx) - if targetphase: - # retract boundary do not alter parent changeset. - # if a parent have higher the resulting phase will - # be compliant anyway - # - # if minimal phase was 0 we don't need to retract anything - phases.registernew(self, tr, targetphase, [n]) - return n + return commit.commitctx(self, ctx, error=error, origctx=origctx) @unfilteredmethod def destroying(self): @@ -3645,6 +3315,36 @@ return requirements +def checkrequirementscompat(ui, requirements): + """ Checks compatibility of repository requirements enabled and disabled. + + Returns a set of requirements which needs to be dropped because dependend + requirements are not enabled. Also warns users about it """ + + dropped = set() + + if b'store' not in requirements: + if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: + ui.warn( + _( + b'ignoring enabled \'format.bookmarks-in-store\' config ' + b'beacuse it is incompatible with disabled ' + b'\'format.usestore\' config\n' + ) + ) + dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) + + if b'shared' in requirements or b'relshared' in requirements: + raise error.Abort( + _( + b"cannot create shared repository as source was created" + b" with 'format.usestore' config disabled" + ) + ) + + return dropped + + def filterknowncreateopts(ui, createopts): """Filters a dict of repo creation options against options that are known. @@ -3719,6 +3419,7 @@ ) requirements = newreporequirements(ui, createopts=createopts) + requirements -= checkrequirementscompat(ui, requirements) wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
--- a/mercurial/logcmdutil.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/logcmdutil.py Wed Aug 05 13:36:50 2020 -0400 @@ -603,12 +603,11 @@ def templatespec(tmpl, mapfile): - if pycompat.ispy3: - assert not isinstance(tmpl, str), b'tmpl must not be a str' + assert not (tmpl and mapfile) if mapfile: - return formatter.templatespec(b'changeset', tmpl, mapfile) + return formatter.mapfile_templatespec(b'changeset', mapfile) else: - return formatter.templatespec(b'', tmpl, None) + return formatter.literal_templatespec(tmpl) def _lookuptemplate(ui, tmpl, style): @@ -621,7 +620,7 @@ if not tmpl and not style: # template are stronger than style tmpl = ui.config(b'ui', b'logtemplate') if tmpl: - return templatespec(templater.unquotestring(tmpl), None) + return formatter.literal_templatespec(templater.unquotestring(tmpl)) else: style = util.expandpath(ui.config(b'ui', b'style')) @@ -633,7 +632,7 @@ ) or templater.templatepath(mapfile) if mapname: mapfile = mapname - return templatespec(None, mapfile) + return formatter.mapfile_templatespec(b'changeset', mapfile) return formatter.lookuptemplate(ui, b'changeset', tmpl) @@ -641,7 +640,7 @@ def maketemplater(ui, repo, tmpl, buffered=False): """Create a changesettemplater from a literal template 'tmpl' byte-string.""" - spec = templatespec(tmpl, None) + spec = formatter.literal_templatespec(tmpl) return changesettemplater(ui, repo, spec, buffered=buffered)
--- a/mercurial/manifest.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/manifest.py Wed Aug 05 13:36:50 2020 -0400 @@ -315,16 +315,9 @@ b"Manifest values must be a tuple of (node, flags)." ) hashval = value[0] - # hashes are either 20 or 32 bytes (sha1 or its replacement), - # and allow one extra byte taht won't be persisted to disk but - # is sometimes used in memory. - if not isinstance(hashval, bytes) or not ( - 20 <= len(hashval) <= 22 or 32 <= len(hashval) <= 34 - ): + if not isinstance(hashval, bytes) or len(hashval) not in (20, 32): raise TypeError(b"node must be a 20-byte or 32-byte byte string") flags = value[1] - if len(hashval) == 22: - hashval = hashval[:-1] if not isinstance(flags, bytes) or len(flags) > 1: raise TypeError(b"flags must a 0 or 1 byte string, got %r", flags) needle, found = self.bsearch2(key)
--- a/mercurial/merge.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/merge.py Wed Aug 05 13:36:50 2020 -0400 @@ -7,6 +7,7 @@ from __future__ import absolute_import +import collections import errno import stat import struct @@ -126,7 +127,7 @@ return None -def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): +def _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce): """ Considers any actions that care about the presence of conflicting unknown files. For some actions, the result is to abort; for others, it is to @@ -150,20 +151,23 @@ warnconflicts.update(conflicts) checkunknowndirs = _unknowndirschecker() - for f, (m, args, msg) in pycompat.iteritems(actions): - if m in ( + for f, args, msg in mresult.getactions( + [ mergestatemod.ACTION_CREATED, mergestatemod.ACTION_DELETED_CHANGED, - ): - if _checkunknownfile(repo, wctx, mctx, f): - fileconflicts.add(f) - elif pathconfig and f not in wctx: - path = checkunknowndirs(repo, wctx, f) - if path is not None: - pathconflicts.add(path) - elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET: - if _checkunknownfile(repo, wctx, mctx, f, args[0]): - fileconflicts.add(f) + ] + ): + if _checkunknownfile(repo, wctx, mctx, f): + fileconflicts.add(f) + elif pathconfig and f not in wctx: + path = checkunknowndirs(repo, wctx, f) + if path is not None: + pathconflicts.add(path) + for f, args, msg in mresult.getactions( + [mergestatemod.ACTION_LOCAL_DIR_RENAME_GET] + ): + if _checkunknownfile(repo, wctx, mctx, f, args[0]): + fileconflicts.add(f) allconflicts = fileconflicts | pathconflicts ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)} @@ -171,49 +175,50 @@ collectconflicts(ignoredconflicts, ignoredconfig) collectconflicts(unknownconflicts, unknownconfig) else: - for f, (m, args, msg) in pycompat.iteritems(actions): - if m == mergestatemod.ACTION_CREATED_MERGE: - fl2, anc = args - different = _checkunknownfile(repo, wctx, mctx, f) - if repo.dirstate._ignore(f): - config = ignoredconfig - else: - config = unknownconfig + for f, args, msg in mresult.getactions( + [mergestatemod.ACTION_CREATED_MERGE] + ): + fl2, anc = args + different = _checkunknownfile(repo, wctx, mctx, f) + if repo.dirstate._ignore(f): + config = ignoredconfig + else: + config = unknownconfig - # The behavior when force is True is described by this table: - # config different mergeforce | action backup - # * n * | get n - # * y y | merge - - # abort y n | merge - (1) - # warn y n | warn + get y - # ignore y n | get y - # - # (1) this is probably the wrong behavior here -- we should - # probably abort, but some actions like rebases currently - # don't like an abort happening in the middle of - # merge.update. - if not different: - actions[f] = ( - mergestatemod.ACTION_GET, - (fl2, False), - b'remote created', - ) - elif mergeforce or config == b'abort': - actions[f] = ( - mergestatemod.ACTION_MERGE, - (f, f, None, False, anc), - b'remote differs from untracked local', - ) - elif config == b'abort': - abortconflicts.add(f) - else: - if config == b'warn': - warnconflicts.add(f) - actions[f] = ( - mergestatemod.ACTION_GET, - (fl2, True), - b'remote created', - ) + # The behavior when force is True is described by this table: + # config different mergeforce | action backup + # * n * | get n + # * y y | merge - + # abort y n | merge - (1) + # warn y n | warn + get y + # ignore y n | get y + # + # (1) this is probably the wrong behavior here -- we should + # probably abort, but some actions like rebases currently + # don't like an abort happening in the middle of + # merge.update. + if not different: + mresult.addfile( + f, + mergestatemod.ACTION_GET, + (fl2, False), + b'remote created', + ) + elif mergeforce or config == b'abort': + mresult.addfile( + f, + mergestatemod.ACTION_MERGE, + (f, f, None, False, anc), + b'remote differs from untracked local', + ) + elif config == b'abort': + abortconflicts.add(f) + else: + if config == b'warn': + warnconflicts.add(f) + mresult.addfile( + f, mergestatemod.ACTION_GET, (fl2, True), b'remote created', + ) for f in sorted(abortconflicts): warn = repo.ui.warn @@ -238,15 +243,14 @@ else: repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f) - for f, (m, args, msg) in pycompat.iteritems(actions): - if m == mergestatemod.ACTION_CREATED: - backup = ( - f in fileconflicts - or f in pathconflicts - or any(p in pathconflicts for p in pathutil.finddirs(f)) - ) - (flags,) = args - actions[f] = (mergestatemod.ACTION_GET, (flags, backup), msg) + for f, args, msg in mresult.getactions([mergestatemod.ACTION_CREATED]): + backup = ( + f in fileconflicts + or f in pathconflicts + or any(p in pathconflicts for p in pathutil.finddirs(f)) + ) + (flags,) = args + mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg) def _forgetremoved(wctx, mctx, branchmerge): @@ -382,7 +386,7 @@ break -def checkpathconflicts(repo, wctx, mctx, actions): +def checkpathconflicts(repo, wctx, mctx, mresult): """ Check if any actions introduce path conflicts in the repository, updating actions to record or handle the path conflict accordingly. @@ -407,7 +411,7 @@ # The set of files deleted by all the actions. deletedfiles = set() - for f, (m, args, msg) in actions.items(): + for f, (m, args, msg) in mresult.actions.items(): if m in ( mergestatemod.ACTION_CREATED, mergestatemod.ACTION_DELETED_CHANGED, @@ -444,7 +448,7 @@ # A file is in a directory which aliases a local file. # We will need to rename the local file. localconflicts.add(p) - if p in actions and actions[p][0] in ( + if p in mresult.actions and mresult.actions[p][0] in ( mergestatemod.ACTION_CREATED, mergestatemod.ACTION_DELETED_CHANGED, mergestatemod.ACTION_MERGE, @@ -459,14 +463,16 @@ for p in localconflicts: if p not in deletedfiles: ctxname = bytes(wctx).rstrip(b'+') - pnew = util.safename(p, ctxname, wctx, set(actions.keys())) + pnew = util.safename(p, ctxname, wctx, set(mresult.actions.keys())) porig = wctx[p].copysource() or p - actions[pnew] = ( + mresult.addfile( + pnew, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, (p, porig), b'local path conflict', ) - actions[p] = ( + mresult.addfile( + p, mergestatemod.ACTION_PATH_CONFLICT, (pnew, b'l'), b'path conflict', @@ -477,23 +483,27 @@ ctxname = bytes(mctx).rstrip(b'+') for f, p in _filesindirs(repo, mf, remoteconflicts): if f not in deletedfiles: - m, args, msg = actions[p] - pnew = util.safename(p, ctxname, wctx, set(actions.keys())) + m, args, msg = mresult.actions[p] + pnew = util.safename( + p, ctxname, wctx, set(mresult.actions.keys()) + ) if m in ( mergestatemod.ACTION_DELETED_CHANGED, mergestatemod.ACTION_MERGE, ): # Action was merge, just update target. - actions[pnew] = (m, args, msg) + mresult.addfile(pnew, m, args, msg) else: # Action was create, change to renamed get action. fl = args[0] - actions[pnew] = ( + mresult.addfile( + pnew, mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, (p, fl), b'remote path conflict', ) - actions[p] = ( + mresult.addfile( + p, mergestatemod.ACTION_PATH_CONFLICT, (pnew, mergestatemod.ACTION_REMOVE), b'path conflict', @@ -507,7 +517,7 @@ raise error.Abort(_(b"destination manifest contains path conflicts")) -def _filternarrowactions(narrowmatch, branchmerge, actions): +def _filternarrowactions(narrowmatch, branchmerge, mresult): """ Filters out actions that can ignored because the repo is narrowed. @@ -518,13 +528,13 @@ nonconflicttypes = set(b'a am c cm f g gs r e'.split()) # We mutate the items in the dict during iteration, so iterate # over a copy. - for f, action in list(actions.items()): + for f, action in list(mresult.actions.items()): if narrowmatch(f): pass elif not branchmerge: - del actions[f] # just updating, ignore changes outside clone + mresult.removefile(f) # just updating, ignore changes outside clone elif action[0] in nooptypes: - del actions[f] # merge does not affect file + mresult.removefile(f) # merge does not affect file elif action[0] in nonconflicttypes: raise error.Abort( _( @@ -540,6 +550,126 @@ ) +class mergeresult(object): + ''''An object representing result of merging manifests. + + It has information about what actions need to be performed on dirstate + mapping of divergent renames and other such cases. ''' + + def __init__(self): + """ + filemapping: dict of filename as keys and action related info as values + diverge: mapping of source name -> list of dest name for + divergent renames + renamedelete: mapping of source name -> list of destinations for files + deleted on one side and renamed on other. + commitinfo: dict containing data which should be used on commit + contains a filename -> info mapping + actionmapping: dict of action names as keys and values are dict of + filename as key and related data as values + """ + self._filemapping = {} + self._diverge = {} + self._renamedelete = {} + self._commitinfo = {} + self._actionmapping = collections.defaultdict(dict) + + def updatevalues(self, diverge, renamedelete, commitinfo): + self._diverge = diverge + self._renamedelete = renamedelete + self._commitinfo = commitinfo + + def addfile(self, filename, action, data, message): + """ adds a new file to the mergeresult object + + filename: file which we are adding + action: one of mergestatemod.ACTION_* + data: a tuple of information like fctx and ctx related to this merge + message: a message about the merge + """ + # if the file already existed, we need to delete it's old + # entry form _actionmapping too + if filename in self._filemapping: + a, d, m = self._filemapping[filename] + del self._actionmapping[a][filename] + + self._filemapping[filename] = (action, data, message) + self._actionmapping[action][filename] = (data, message) + + def removefile(self, filename): + """ removes a file from the mergeresult object as the file might + not merging anymore """ + action, data, message = self._filemapping[filename] + del self._filemapping[filename] + del self._actionmapping[action][filename] + + def getactions(self, actions): + """ get list of files which are marked with these actions + + Returns a list of tuple of form (filename, data, message) + """ + res = [] + for a in actions: + for f, (args, msg) in pycompat.iteritems(self._actionmapping[a]): + res.append((f, args, msg)) + return res + + @property + def actions(self): + return self._filemapping + + @property + def diverge(self): + return self._diverge + + @property + def renamedelete(self): + return self._renamedelete + + @property + def commitinfo(self): + return self._commitinfo + + @property + def actionsdict(self): + """ returns a dictionary of actions to be perfomed with action as key + and a list of files and related arguments as values """ + res = emptyactions() + for a, d in pycompat.iteritems(self._actionmapping): + for f, (args, msg) in pycompat.iteritems(d): + res[a].append((f, args, msg)) + return res + + def setactions(self, actions): + self._filemapping = actions + self._actionmapping = collections.defaultdict(dict) + for f, (act, data, msg) in pycompat.iteritems(self._filemapping): + self._actionmapping[act][f] = data, msg + + def updateactions(self, updates): + for f, (a, data, msg) in pycompat.iteritems(updates): + self.addfile(f, a, data, msg) + + def hasconflicts(self): + """ tells whether this merge resulted in some actions which can + result in conflicts or not """ + for a in self._actionmapping.keys(): + if ( + a + not in ( + mergestatemod.ACTION_GET, + mergestatemod.ACTION_KEEP, + mergestatemod.ACTION_EXEC, + mergestatemod.ACTION_REMOVE, + mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, + ) + and self._actionmapping[a] + ): + return True + + return False + + def manifestmerge( repo, wctx, @@ -559,13 +689,9 @@ matcher = matcher to filter file lists acceptremote = accept the incoming changes without prompting - Returns: - - actions: dict of filename as keys and action related info as values - diverge: mapping of source name -> list of dest name for divergent renames - renamedelete: mapping of source name -> list of destinations for files - deleted on one side and renamed on other. + Returns an object of mergeresult class """ + mresult = mergeresult() if matcher is not None and matcher.always(): matcher = None @@ -578,6 +704,10 @@ branch_copies1 = copies.branch_copies() branch_copies2 = copies.branch_copies() diverge = {} + # information from merge which is needed at commit time + # for example choosing filelog of which parent to commit + # TODO: use specific constants in future for this mapping + commitinfo = {} if followcopies: branch_copies1, branch_copies2, diverge = copies.mergecopies( repo, wctx, p2, pa @@ -626,7 +756,6 @@ diff = m1.diff(m2, match=matcher) - actions = {} for f, ((n1, fl1), (n2, fl2)) in pycompat.iteritems(diff): if n1 and n2: # file exists on both local and remote side if f not in ma: @@ -634,59 +763,58 @@ fa = branch_copies1.copy.get( f, None ) or branch_copies2.copy.get(f, None) + args, msg = None, None if fa is not None: - actions[f] = ( - mergestatemod.ACTION_MERGE, - (f, f, fa, False, pa.node()), - b'both renamed from %s' % fa, - ) + args = (f, f, fa, False, pa.node()) + msg = b'both renamed from %s' % fa else: - actions[f] = ( - mergestatemod.ACTION_MERGE, - (f, f, None, False, pa.node()), - b'both created', - ) + args = (f, f, None, False, pa.node()) + msg = b'both created' + mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg) else: a = ma[f] fla = ma.flags(f) nol = b'l' not in fl1 + fl2 + fla if n2 == a and fl2 == fla: - actions[f] = ( - mergestatemod.ACTION_KEEP, - (), - b'remote unchanged', + mresult.addfile( + f, mergestatemod.ACTION_KEEP, (), b'remote unchanged', ) elif n1 == a and fl1 == fla: # local unchanged - use remote if n1 == n2: # optimization: keep local content - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_EXEC, (fl2,), b'update permissions', ) else: - actions[f] = ( - mergestatemod.ACTION_GET_OTHER_AND_STORE - if branchmerge - else mergestatemod.ACTION_GET, + mresult.addfile( + f, + mergestatemod.ACTION_GET, (fl2, False), b'remote is newer', ) + if branchmerge: + commitinfo[f] = b'other' elif nol and n2 == a: # remote only changed 'x' - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_EXEC, (fl2,), b'update permissions', ) elif nol and n1 == a: # local only changed 'x' - actions[f] = ( - mergestatemod.ACTION_GET_OTHER_AND_STORE - if branchmerge - else mergestatemod.ACTION_GET, + mresult.addfile( + f, + mergestatemod.ACTION_GET, (fl1, False), b'remote is newer', ) + if branchmerge: + commitinfo[f] = b'other' else: # both changed something - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_MERGE, (f, f, f, False, pa.node()), b'versions differ', @@ -699,20 +827,23 @@ ): # directory rename, move local f2 = branch_copies1.movewithdir[f] if f2 in m2: - actions[f2] = ( + mresult.addfile( + f2, mergestatemod.ACTION_MERGE, (f, f2, None, True, pa.node()), b'remote directory rename, both created', ) else: - actions[f2] = ( + mresult.addfile( + f2, mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL, (f, fl1), b'remote directory rename - move from %s' % f, ) elif f in branch_copies1.copy: f2 = branch_copies1.copy[f] - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_MERGE, (f, f2, f2, False, pa.node()), b'local copied/moved from %s' % f2, @@ -720,13 +851,15 @@ elif f in ma: # clean, a different, no remote if n1 != ma[f]: if acceptremote: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_REMOVE, None, b'remote delete', ) else: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_CHANGED_DELETED, (f, None, f, False, pa.node()), b'prompt changed/deleted', @@ -734,16 +867,12 @@ elif n1 == addednodeid: # This file was locally added. We should forget it instead of # deleting it. - actions[f] = ( - mergestatemod.ACTION_FORGET, - None, - b'remote deleted', + mresult.addfile( + f, mergestatemod.ACTION_FORGET, None, b'remote deleted', ) else: - actions[f] = ( - mergestatemod.ACTION_REMOVE, - None, - b'other deleted', + mresult.addfile( + f, mergestatemod.ACTION_REMOVE, None, b'other deleted', ) elif n2: # file exists only on remote side if f in copied1: @@ -751,31 +880,29 @@ elif f in branch_copies2.movewithdir: f2 = branch_copies2.movewithdir[f] if f2 in m1: - actions[f2] = ( + mresult.addfile( + f2, mergestatemod.ACTION_MERGE, (f2, f, None, False, pa.node()), b'local directory rename, both created', ) else: - actions[f2] = ( + mresult.addfile( + f2, mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, (f, fl2), b'local directory rename - get from %s' % f, ) elif f in branch_copies2.copy: f2 = branch_copies2.copy[f] + msg, args = None, None if f2 in m2: - actions[f] = ( - mergestatemod.ACTION_MERGE, - (f2, f, f2, False, pa.node()), - b'remote copied from %s' % f2, - ) + args = (f2, f, f2, False, pa.node()) + msg = b'remote copied from %s' % f2 else: - actions[f] = ( - mergestatemod.ACTION_MERGE, - (f2, f, f2, True, pa.node()), - b'remote moved from %s' % f2, - ) + args = (f2, f, f2, True, pa.node()) + msg = b'remote moved from %s' % f2 + mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg) elif f not in ma: # local unknown, remote created: the logic is described by the # following table: @@ -789,19 +916,22 @@ # Checking whether the files are different is expensive, so we # don't do that when we can avoid it. if not force: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_CREATED, (fl2,), b'remote created', ) elif not branchmerge: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_CREATED, (fl2,), b'remote created', ) else: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_CREATED_MERGE, (fl2, pa.node()), b'remote created, get or merge', @@ -814,20 +944,23 @@ df = branch_copies1.dirmove[d] + f[len(d) :] break if df is not None and df in m1: - actions[df] = ( + mresult.addfile( + df, mergestatemod.ACTION_MERGE, (df, f, f, False, pa.node()), b'local directory rename - respect move ' b'from %s' % f, ) elif acceptremote: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_CREATED, (fl2,), b'remote recreating', ) else: - actions[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_DELETED_CHANGED, (None, f, f, False, pa.node()), b'prompt deleted/changed', @@ -835,39 +968,40 @@ if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): # If we are merging, look for path conflicts. - checkpathconflicts(repo, wctx, p2, actions) + checkpathconflicts(repo, wctx, p2, mresult) narrowmatch = repo.narrowmatch() if not narrowmatch.always(): # Updates "actions" in place - _filternarrowactions(narrowmatch, branchmerge, actions) + _filternarrowactions(narrowmatch, branchmerge, mresult) renamedelete = branch_copies1.renamedelete renamedelete.update(branch_copies2.renamedelete) - return actions, diverge, renamedelete + mresult.updatevalues(diverge, renamedelete, commitinfo) + return mresult -def _resolvetrivial(repo, wctx, mctx, ancestor, actions): +def _resolvetrivial(repo, wctx, mctx, ancestor, mresult): """Resolves false conflicts where the nodeid changed but the content remained the same.""" # We force a copy of actions.items() because we're going to mutate # actions as we resolve trivial conflicts. - for f, (m, args, msg) in list(actions.items()): - if ( - m == mergestatemod.ACTION_CHANGED_DELETED - and f in ancestor - and not wctx[f].cmp(ancestor[f]) - ): + for f, args, msg in mresult.getactions( + [mergestatemod.ACTION_CHANGED_DELETED] + ): + if f in ancestor and not wctx[f].cmp(ancestor[f]): # local did change but ended up with same content - actions[f] = mergestatemod.ACTION_REMOVE, None, b'prompt same' - elif ( - m == mergestatemod.ACTION_DELETED_CHANGED - and f in ancestor - and not mctx[f].cmp(ancestor[f]) - ): + mresult.addfile( + f, mergestatemod.ACTION_REMOVE, None, b'prompt same' + ) + + for f, args, msg in list( + mresult.getactions([mergestatemod.ACTION_DELETED_CHANGED]) + ): + if f in ancestor and not mctx[f].cmp(ancestor[f]): # remote did change but ended up with same content - del actions[f] # don't get = keep local deleted + mresult.removefile(f) # don't get = keep local deleted def calculateupdates( @@ -891,13 +1025,14 @@ Also filters out actions which are unrequired if repository is sparse. - Returns same 3 element tuple as manifestmerge(). + Returns mergeresult object same as manifestmerge(). """ # Avoid cycle. from . import sparse + mresult = None if len(ancestors) == 1: # default - actions, diverge, renamedelete = manifestmerge( + mresult = manifestmerge( repo, wctx, mctx, @@ -908,7 +1043,7 @@ acceptremote, followcopies, ) - _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce) + _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce) else: # only when merge.preferancestor=* - the default repo.ui.note( @@ -920,14 +1055,16 @@ ) ) - # Call for bids - fbids = ( - {} - ) # mapping filename to bids (action method to list af actions) + # mapping filename to bids (action method to list af actions) + # {FILENAME1 : BID1, FILENAME2 : BID2} + # BID is another dictionary which contains + # mapping of following form: + # {ACTION_X : [info, ..], ACTION_Y : [info, ..]} + fbids = {} diverge, renamedelete = None, None for ancestor in ancestors: repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor) - actions, diverge1, renamedelete1 = manifestmerge( + mresult1 = manifestmerge( repo, wctx, mctx, @@ -939,19 +1076,19 @@ followcopies, forcefulldiff=True, ) - _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce) + _checkunknownfiles(repo, wctx, mctx, force, mresult1, mergeforce) # Track the shortest set of warning on the theory that bid # merge will correctly incorporate more information - if diverge is None or len(diverge1) < len(diverge): - diverge = diverge1 - if renamedelete is None or len(renamedelete) < len(renamedelete1): - renamedelete = renamedelete1 + if diverge is None or len(mresult1.diverge) < len(diverge): + diverge = mresult1.diverge + if renamedelete is None or len(renamedelete) < len( + mresult1.renamedelete + ): + renamedelete = mresult1.renamedelete - for f, a in sorted(pycompat.iteritems(actions)): + for f, a in sorted(pycompat.iteritems(mresult1.actions)): m, args, msg = a - if m == mergestatemod.ACTION_GET_OTHER_AND_STORE: - m = mergestatemod.ACTION_GET repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m)) if f in fbids: d = fbids[f] @@ -962,9 +1099,10 @@ else: fbids[f] = {m: [a]} + # Call for bids # Pick the best bid for each file repo.ui.note(_(b'\nauction for merging merge bids\n')) - actions = {} + mresult = mergeresult() for f, bids in sorted(fbids.items()): # bids is a mapping from action method to list af actions # Consensus? @@ -972,19 +1110,19 @@ m, l = list(bids.items())[0] if all(a == l[0] for a in l[1:]): # len(bids) is > 1 repo.ui.note(_(b" %s: consensus for %s\n") % (f, m)) - actions[f] = l[0] + mresult.addfile(f, *l[0]) continue # If keep is an option, just do it. if mergestatemod.ACTION_KEEP in bids: repo.ui.note(_(b" %s: picking 'keep' action\n") % f) - actions[f] = bids[mergestatemod.ACTION_KEEP][0] + mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP][0]) continue # If there are gets and they all agree [how could they not?], do it. if mergestatemod.ACTION_GET in bids: ga0 = bids[mergestatemod.ACTION_GET][0] if all(a == ga0 for a in bids[mergestatemod.ACTION_GET][1:]): repo.ui.note(_(b" %s: picking 'get' action\n") % f) - actions[f] = ga0 + mresult.addfile(f, *ga0) continue # TODO: Consider other simple actions such as mode changes # Handle inefficient democrazy. @@ -997,20 +1135,20 @@ repo.ui.warn( _(b' %s: ambiguous merge - picked %s action\n') % (f, m) ) - actions[f] = l[0] + mresult.addfile(f, *l[0]) continue repo.ui.note(_(b'end of auction\n\n')) + # TODO: think about commitinfo when bid merge is used + mresult.updatevalues(diverge, renamedelete, {}) if wctx.rev() is None: fractions = _forgetremoved(wctx, mctx, branchmerge) - actions.update(fractions) + mresult.updateactions(fractions) - prunedactions = sparse.filterupdatesactions( - repo, wctx, mctx, branchmerge, actions - ) - _resolvetrivial(repo, wctx, mctx, ancestors[0], actions) + sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult) + _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) - return prunedactions, diverge, renamedelete + return mresult def _getcwd(): @@ -1183,18 +1321,26 @@ mergestatemod.ACTION_KEEP, mergestatemod.ACTION_PATH_CONFLICT, mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, - mergestatemod.ACTION_GET_OTHER_AND_STORE, ) } def applyupdates( - repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None + repo, + actions, + wctx, + mctx, + overwrite, + wantfiledata, + labels=None, + commitinfo=None, ): """apply the merge action list to the working directory wctx is the working copy context mctx is the context to be merged into the working copy + commitinfo is a mapping of information which needs to be stored somewhere + (probably mergestate) so that it can be used at commit time. Return a tuple of (counts, filedata), where counts is a tuple (updated, merged, removed, unresolved) that describes how many @@ -1209,9 +1355,14 @@ repo, wctx.p1().node(), mctx.node(), labels ) - # add ACTION_GET_OTHER_AND_STORE to mergestate - for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]: - ms.addmergedother(e[0]) + if commitinfo is None: + commitinfo = {} + + for f, op in pycompat.iteritems(commitinfo): + # the other side of filenode was choosen while merging, store this in + # mergestate so that it can be reused on commit + if op == b'other': + ms.addmergedother(f) moves = [] for m, l in actions.items(): @@ -1734,7 +1885,7 @@ followcopies = False ### calculate phase - actionbyfile, diverge, renamedelete = calculateupdates( + mresult = calculateupdates( repo, wc, p2, @@ -1748,25 +1899,17 @@ ) if updatecheck == UPDATECHECK_NO_CONFLICT: - for f, (m, args, msg) in pycompat.iteritems(actionbyfile): - if m not in ( - mergestatemod.ACTION_GET, - mergestatemod.ACTION_KEEP, - mergestatemod.ACTION_EXEC, - mergestatemod.ACTION_REMOVE, - mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, - mergestatemod.ACTION_GET_OTHER_AND_STORE, - ): - msg = _(b"conflicting changes") - hint = _(b"commit or update --clean to discard changes") - raise error.Abort(msg, hint=hint) + if mresult.hasconflicts(): + msg = _(b"conflicting changes") + hint = _(b"commit or update --clean to discard changes") + raise error.Abort(msg, hint=hint) # Prompt and create actions. Most of this is in the resolve phase # already, but we can't handle .hgsubstate in filemerge or # subrepoutil.submerge yet so we have to keep prompting for it. - if b'.hgsubstate' in actionbyfile: + if b'.hgsubstate' in mresult.actions: f = b'.hgsubstate' - m, args, msg = actionbyfile[f] + m, args, msg = mresult.actions[f] prompts = filemerge.partextras(labels) prompts[b'f'] = f if m == mergestatemod.ACTION_CHANGED_DELETED: @@ -1779,22 +1922,19 @@ % prompts, 0, ): - actionbyfile[f] = ( - mergestatemod.ACTION_REMOVE, - None, - b'prompt delete', + mresult.addfile( + f, mergestatemod.ACTION_REMOVE, None, b'prompt delete', ) elif f in p1: - actionbyfile[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_ADD_MODIFIED, None, b'prompt keep', ) else: - actionbyfile[f] = ( - mergestatemod.ACTION_ADD, - None, - b'prompt keep', + mresult.addfile( + f, mergestatemod.ACTION_ADD, None, b'prompt keep', ) elif m == mergestatemod.ACTION_DELETED_CHANGED: f1, f2, fa, move, anc = args @@ -1811,24 +1951,17 @@ ) == 0 ): - actionbyfile[f] = ( + mresult.addfile( + f, mergestatemod.ACTION_GET, (flags, False), b'prompt recreating', ) else: - del actionbyfile[f] + mresult.removefile(f) # Convert to dictionary-of-lists format - actions = emptyactions() - for f, (m, args, msg) in pycompat.iteritems(actionbyfile): - if m not in actions: - actions[m] = [] - actions[m].append((f, args, msg)) - - # ACTION_GET_OTHER_AND_STORE is a mergestatemod.ACTION_GET + store in mergestate - for e in actions[mergestatemod.ACTION_GET_OTHER_AND_STORE]: - actions[mergestatemod.ACTION_GET].append(e) + actions = mresult.actionsdict if not util.fscasesensitive(repo.path): # check collision between files only in p2 for clean update @@ -1840,7 +1973,7 @@ _checkcollision(repo, wc.manifest(), actions) # divergent renames - for f, fl in sorted(pycompat.iteritems(diverge)): + for f, fl in sorted(pycompat.iteritems(mresult.diverge)): repo.ui.warn( _( b"note: possible conflict - %s was renamed " @@ -1852,7 +1985,7 @@ repo.ui.warn(b" %s\n" % nf) # rename and delete - for f, fl in sorted(pycompat.iteritems(renamedelete)): + for f, fl in sorted(pycompat.iteritems(mresult.renamedelete)): repo.ui.warn( _( b"note: possible conflict - %s was deleted " @@ -1881,7 +2014,14 @@ wantfiledata = updatedirstate and not branchmerge stats, getfiledata = applyupdates( - repo, actions, wc, p2, overwrite, wantfiledata, labels=labels + repo, + actions, + wc, + p2, + overwrite, + wantfiledata, + labels=labels, + commitinfo=mresult.commitinfo, ) if updatedirstate:
--- a/mercurial/mergestate.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/mergestate.py Wed Aug 05 13:36:50 2020 -0400 @@ -119,8 +119,6 @@ ACTION_KEEP = b'k' ACTION_EXEC = b'e' ACTION_CREATED_MERGE = b'cm' -# GET the other/remote side and store this info in mergestate -ACTION_GET_OTHER_AND_STORE = b'gs' class mergestate(object):
--- a/mercurial/sparse.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/sparse.py Wed Aug 05 13:36:50 2020 -0400 @@ -366,16 +366,16 @@ return result -def filterupdatesactions(repo, wctx, mctx, branchmerge, actions): +def filterupdatesactions(repo, wctx, mctx, branchmerge, mresult): """Filter updates to only lay out files that match the sparse rules.""" if not enabled: - return actions + return oldrevs = [pctx.rev() for pctx in wctx.parents()] oldsparsematch = matcher(repo, oldrevs) if oldsparsematch.always(): - return actions + return files = set() prunedactions = {} @@ -390,23 +390,29 @@ sparsematch = matcher(repo, [mctx.rev()]) temporaryfiles = [] - for file, action in pycompat.iteritems(actions): + for file, action in pycompat.iteritems(mresult.actions): type, args, msg = action files.add(file) if sparsematch(file): prunedactions[file] = action - elif type == b'm': + elif type == mergestatemod.ACTION_MERGE: temporaryfiles.append(file) prunedactions[file] = action elif branchmerge: - if type != b'k': + if type != mergestatemod.ACTION_KEEP: temporaryfiles.append(file) prunedactions[file] = action - elif type == b'f': + elif type == mergestatemod.ACTION_FORGET: prunedactions[file] = action elif file in wctx: - prunedactions[file] = (b'r', args, msg) + prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg) + # in case or rename on one side, it is possible that f1 might not + # be present in sparse checkout we should include it + # TODO: should we do the same for f2? + # exists as a separate check because file can be in sparse and hence + # if we try to club this condition in above `elif type == ACTION_MERGE` + # it won't be triggered if branchmerge and type == mergestatemod.ACTION_MERGE: f1, f2, fa, move, anc = args if not sparsematch(f1): @@ -432,7 +438,7 @@ actions.append((file, (fctx.flags(), False), message)) typeactions = mergemod.emptyactions() - typeactions[b'g'] = actions + typeactions[mergestatemod.ACTION_GET] = actions mergemod.applyupdates( repo, typeactions, repo[None], repo[b'.'], False, wantfiledata=False ) @@ -453,11 +459,15 @@ new = sparsematch(file) if not old and new: flags = mf.flags(file) - prunedactions[file] = (b'g', (flags, False), b'') + prunedactions[file] = ( + mergestatemod.ACTION_GET, + (flags, False), + b'', + ) elif old and not new: - prunedactions[file] = (b'r', [], b'') + prunedactions[file] = (mergestatemod.ACTION_REMOVE, [], b'') - return prunedactions + mresult.setactions(prunedactions) def refreshwdir(repo, origstatus, origsparsematch, force=False):
--- a/mercurial/state.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/state.py Wed Aug 05 13:36:50 2020 -0400 @@ -164,10 +164,17 @@ operation """ if not self._cmdhint: - return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( - self._opname, - self._opname, - ) + if not self._stopflag: + return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( + self._opname, + self._opname, + ) + else: + return _( + b"use 'hg %s --continue', 'hg %s --abort', " + b"or 'hg %s --stop'" + ) % (self._opname, self._opname, self._opname,) + return self._cmdhint def msg(self):
--- a/mercurial/templater.py Mon Aug 03 23:13:58 2020 +0530 +++ b/mercurial/templater.py Wed Aug 05 13:36:50 2020 -0400 @@ -800,10 +800,10 @@ def stylelist(): - paths = templatepaths() - if not paths: + path = templatedir() + if not path: return _(b'no templates found, try `hg debuginstall` for more info') - dirlist = os.listdir(paths[0]) + dirlist = os.listdir(path) stylelist = [] for file in dirlist: split = file.split(b".") @@ -823,8 +823,23 @@ ) base = os.path.dirname(mapfile) - conf = config.config(includepaths=templatepaths()) - conf.read(mapfile, remap={b'': b'templates'}) + conf = config.config() + + def include(rel, remap, sections): + templatedirs = [base, templatedir()] + for dir in templatedirs: + if dir is None: + continue + abs = os.path.normpath(os.path.join(dir, rel)) + if os.path.isfile(abs): + data = util.posixfile(abs, b'rb').read() + conf.parse( + abs, data, sections=sections, remap=remap, include=include + ) + break + + data = util.posixfile(mapfile, b'rb').read() + conf.parse(mapfile, data, remap={b'': b'templates'}, include=include) cache = {} tmap = {} @@ -833,19 +848,19 @@ val = conf.get(b'templates', b'__base__') if val and val[0] not in b"'\"": # treat as a pointer to a base class for this style - path = util.normpath(os.path.join(base, val)) + path = os.path.normpath(os.path.join(base, val)) # fallback check in template paths if not os.path.exists(path): - for p in templatepaths(): - p2 = util.normpath(os.path.join(p, val)) + dir = templatedir() + if dir is not None: + p2 = os.path.normpath(os.path.join(dir, val)) if os.path.isfile(p2): path = p2 - break - p3 = util.normpath(os.path.join(p2, b"map")) - if os.path.isfile(p3): - path = p3 - break + else: + p3 = os.path.normpath(os.path.join(p2, b"map")) + if os.path.isfile(p3): + path = p3 cache, tmap, aliases = _readmapfile(path) @@ -1045,26 +1060,24 @@ return stream -def templatepaths(): - '''return locations used for template files.''' - pathsrel = [b'templates'] - paths = [ - os.path.normpath(os.path.join(resourceutil.datapath, f)) - for f in pathsrel - ] - return [p for p in paths if os.path.isdir(p)] +def templatedir(): + '''return the directory used for template files, or None.''' + path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates')) + return path if os.path.isdir(path) else None def templatepath(name): '''return location of template file. returns None if not found.''' - for p in templatepaths(): - f = os.path.join(p, name) - if os.path.exists(f): - return f + dir = templatedir() + if dir is None: + return None + f = os.path.join(templatedir(), name) + if f and os.path.isfile(f): + return f return None -def stylemap(styles, paths=None): +def stylemap(styles, path=None): """Return path to mapfile for a given style. Searches mapfile in the following locations: @@ -1073,31 +1086,26 @@ 3. templatepath/map """ - if paths is None: - paths = templatepaths() - elif isinstance(paths, bytes): - paths = [paths] - - if isinstance(styles, bytes): - styles = [styles] + if path is None: + path = templatedir() - for style in styles: - # only plain name is allowed to honor template paths - if ( - not style - or style in (pycompat.oscurdir, pycompat.ospardir) - or pycompat.ossep in style - or pycompat.osaltsep - and pycompat.osaltsep in style - ): - continue - locations = [os.path.join(style, b'map'), b'map-' + style] - locations.append(b'map') + if path is not None: + for style in styles: + # only plain name is allowed to honor template paths + if ( + not style + or style in (pycompat.oscurdir, pycompat.ospardir) + or pycompat.ossep in style + or pycompat.osaltsep + and pycompat.osaltsep in style + ): + continue + locations = [os.path.join(style, b'map'), b'map-' + style] + locations.append(b'map') - for path in paths: for location in locations: mapfile = os.path.join(path, location) if os.path.isfile(mapfile): return style, mapfile - raise RuntimeError(b"No hgweb templates found in %r" % paths) + raise RuntimeError(b"No hgweb templates found in %r" % path)
--- a/setup.py Mon Aug 03 23:13:58 2020 +0530 +++ b/setup.py Wed Aug 05 13:36:50 2020 -0400 @@ -1614,11 +1614,8 @@ msvccompiler.MSVCCompiler = HackedMSVCCompiler packagedata = { - 'mercurial': [ - 'locale/*/LC_MESSAGES/hg.mo', - 'defaultrc/*.rc', - 'dummycert.pem', - ], + 'mercurial': ['locale/*/LC_MESSAGES/hg.mo', 'dummycert.pem',], + 'mercurial.defaultrc': ['*.rc',], 'mercurial.helptext': ['*.txt',], 'mercurial.helptext.internals': ['*.txt',], } @@ -1631,7 +1628,6 @@ for root in ('templates',): for curdir, dirs, files in os.walk(os.path.join('mercurial', root)): curdir = curdir.split(os.sep, 1)[1] - dirs[:] = filter(ordinarypath, dirs) for f in filter(ordinarypath, files): f = os.path.join(curdir, f) packagedata['mercurial'].append(f)
--- a/tests/hghave.py Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/hghave.py Wed Aug 05 13:36:50 2020 -0400 @@ -886,8 +886,11 @@ return False -@check("virtualenv", "Python virtualenv support") -def has_virtualenv(): +@check("py2virtualenv", "Python2 virtualenv support") +def has_py2virtualenv(): + if sys.version_info[0] != 2: + return False + try: import virtualenv
--- a/tests/test-absorb-unfinished.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-absorb-unfinished.t Wed Aug 05 13:36:50 2020 -0400 @@ -25,6 +25,6 @@ $ hg --config extensions.rebase= absorb abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255]
--- a/tests/test-annotate.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-annotate.t Wed Aug 05 13:36:50 2020 -0400 @@ -479,26 +479,24 @@ $ cat > ../legacyrepo.py <<EOF > from __future__ import absolute_import - > from mercurial import error, node - > def reposetup(ui, repo): - > class legacyrepo(repo.__class__): - > def _filecommit(self, fctx, manifest1, manifest2, - > linkrev, tr, changelist, includecopymeta): - > fname = fctx.path() - > text = fctx.data() - > flog = self.file(fname) - > fparent1 = manifest1.get(fname, node.nullid) - > fparent2 = manifest2.get(fname, node.nullid) - > meta = {} - > copy = fctx.copysource() - > if copy and copy != fname: - > raise error.Abort('copying is not supported') - > if fparent2 != node.nullid: - > changelist.append(fname) - > return flog.add(text, meta, tr, linkrev, - > fparent1, fparent2) - > raise error.Abort('only merging is supported') - > repo.__class__ = legacyrepo + > from mercurial import commit, error, extensions, node + > def _filecommit(orig, repo, fctx, manifest1, manifest2, + > linkrev, tr, includecopymeta): + > fname = fctx.path() + > text = fctx.data() + > flog = repo.file(fname) + > fparent1 = manifest1.get(fname, node.nullid) + > fparent2 = manifest2.get(fname, node.nullid) + > meta = {} + > copy = fctx.copysource() + > if copy and copy != fname: + > raise error.Abort('copying is not supported') + > if fparent2 != node.nullid: + > return flog.add(text, meta, tr, linkrev, + > fparent1, fparent2), 'modified' + > raise error.Abort('only merging is supported') + > def uisetup(ui): + > extensions.wrapfunction(commit, '_filecommit', _filecommit) > EOF $ cat > baz <<EOF
--- a/tests/test-fastannotate-hg.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-fastannotate-hg.t Wed Aug 05 13:36:50 2020 -0400 @@ -481,26 +481,25 @@ and its ancestor by overriding "repo._filecommit". $ cat > ../legacyrepo.py <<EOF - > from mercurial import error, node - > def reposetup(ui, repo): - > class legacyrepo(repo.__class__): - > def _filecommit(self, fctx, manifest1, manifest2, - > linkrev, tr, changelist, includecopymeta): - > fname = fctx.path() - > text = fctx.data() - > flog = self.file(fname) - > fparent1 = manifest1.get(fname, node.nullid) - > fparent2 = manifest2.get(fname, node.nullid) - > meta = {} - > copy = fctx.renamed() - > if copy and copy[0] != fname: - > raise error.Abort('copying is not supported') - > if fparent2 != node.nullid: - > changelist.append(fname) - > return flog.add(text, meta, tr, linkrev, - > fparent1, fparent2) - > raise error.Abort('only merging is supported') - > repo.__class__ = legacyrepo + > from __future__ import absolute_import + > from mercurial import commit, error, extensions, node + > def _filecommit(orig, repo, fctx, manifest1, manifest2, + > linkrev, tr, includecopymeta): + > fname = fctx.path() + > text = fctx.data() + > flog = repo.file(fname) + > fparent1 = manifest1.get(fname, node.nullid) + > fparent2 = manifest2.get(fname, node.nullid) + > meta = {} + > copy = fctx.copysource() + > if copy and copy != fname: + > raise error.Abort('copying is not supported') + > if fparent2 != node.nullid: + > return flog.add(text, meta, tr, linkrev, + > fparent1, fparent2), 'modified' + > raise error.Abort('only merging is supported') + > def uisetup(ui): + > extensions.wrapfunction(commit, '_filecommit', _filecommit) > EOF $ cat > baz <<EOF
--- a/tests/test-fix.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-fix.t Wed Aug 05 13:36:50 2020 -0400 @@ -84,15 +84,15 @@ lines of files, unless the --whole flag is used. Some tools may always affect the whole file regardless of --whole. - If revisions are specified with --rev, those revisions will be checked, - and they may be replaced with new revisions that have fixed file content. - It is desirable to specify all descendants of each specified revision, so - that the fixes propagate to the descendants. If all descendants are fixed - at the same time, no merging, rebasing, or evolution will be required. + If --working-dir is used, files with uncommitted changes in the working + copy will be fixed. Note that no backup are made. - If --working-dir is used, files with uncommitted changes in the working - copy will be fixed. If the checked-out revision is also fixed, the working - directory will update to the replacement revision. + If revisions are specified with --source, those revisions and their + descendants will be checked, and they may be replaced with new revisions + that have fixed file content. By automatically including the descendants, + no merging, rebasing, or evolution will be required. If an ancestor of the + working copy is included, then the working copy itself will also be fixed, + and the working copy will be updated to the fixed parent. When determining what lines of each file to fix at each revision, the whole set of revisions being fixed is considered, so that fixes to earlier @@ -878,7 +878,7 @@ $ hg --config extensions.rebase= fix -r . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ cd ..
--- a/tests/test-install.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-install.t Wed Aug 05 13:36:50 2020 -0400 @@ -214,7 +214,7 @@ no problems detected #endif -#if no-py3 virtualenv +#if py2virtualenv Note: --no-site-packages is deprecated, but some places have an ancient virtualenv from their linux distro or similar and it's not yet
--- a/tests/test-phabricator.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-phabricator.t Wed Aug 05 13:36:50 2020 -0400 @@ -24,6 +24,11 @@ > EOF $ VCR="$TESTDIR/phabricator" +debugcallconduit doesn't claim invalid arguments without --test-vcr: + $ echo '{}' | HGRCSKIPREPO= hg debugcallconduit 'conduit.ping' + abort: config phabricator.url is required + [255] + Error is handled reasonably. We override the phabtoken here so that when you're developing changes to phabricator.py you can edit the above config and have a real token in the test but not have to edit
--- a/tests/test-rebase-abort.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-rebase-abort.t Wed Aug 05 13:36:50 2020 -0400 @@ -327,7 +327,7 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ cat a @@ -397,20 +397,20 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg abort
--- a/tests/test-rebase-inmemory.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-rebase-inmemory.t Wed Aug 05 13:36:50 2020 -0400 @@ -901,7 +901,7 @@ [1] $ hg rebase -r 3 -d 1 -t:merge3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg resolve --list U foo
--- a/tests/test-rebase-obsolete.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-rebase-obsolete.t Wed Aug 05 13:36:50 2020 -0400 @@ -2055,7 +2055,7 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg rebase --stop --continue abort: cannot specify both --stop and --continue
--- a/tests/test-share-bookmarks.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-share-bookmarks.t Wed Aug 05 13:36:50 2020 -0400 @@ -279,3 +279,8 @@ bm3 4:62f4ded848e4 bm4 5:92793bfc8cad $ cd .. + +Test that if store is disabled, we drop the bookmarksinstore requirement + + $ hg init brokenrepo --config format.bookmarks-in-store=True --config format.usestore=false + ignoring enabled 'format.bookmarks-in-store' config beacuse it is incompatible with disabled 'format.usestore' config
--- a/tests/test-share.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-share.t Wed Aug 05 13:36:50 2020 -0400 @@ -252,3 +252,9 @@ $ killdaemons.py +Test sharing a repository which was created with store requirement disable + + $ hg init nostore --config format.usestore=false + $ hg share nostore sharednostore + abort: cannot create shared repository as source was created with 'format.usestore' config disabled + [255]
--- a/tests/test-template-map.t Mon Aug 03 23:13:58 2020 +0530 +++ b/tests/test-template-map.t Wed Aug 05 13:36:50 2020 -0400 @@ -125,6 +125,54 @@ date: Wed Jan 01 10:01:00 2020 +0000 summary: third +Test map inheritance with non-existent base + + $ echo "__base__ = non-existent" > map-base-nonexistent + $ hg log -l1 -T./map-base-nonexistent + abort: style '$TESTTMP/a/non-existent' not found + (available styles: bisect, changelog, compact, default, phases, show, status, xml) + [255] + +Test map inheritance with directory as base + + $ mkdir somedir + $ echo "__base__ = somedir" > map-base-dir + $ hg log -l1 -T./map-base-dir + abort: Is a directory: '$TESTTMP/a/somedir' + [255] + +Test including a built-in template map + + $ cat <<'EOF' > map-include-builtin + > %include map-cmdline.default + > [templates] + > changeset = "{changeset_quiet}\n" + > EOF + $ hg log -l1 -T./map-include-builtin + 8:95c24699272e + + +Test including a nonexistent template map +BROKEN: This should probably be an error just like the bad __base__ above + + $ cat <<'EOF' > map-include-nonexistent + > %include nonexistent + > [templates] + > changeset = "test\n" + > EOF + $ hg log -l1 -T./map-include-nonexistent + test + +Test including a directory as template map +BROKEN: This should probably be an error just like the bad __base__ above + + $ cat <<'EOF' > map-include-dir + > %include somedir + > [templates] + > changeset = "test\n" + > EOF + $ hg log -l1 -T./map-include-dir + test Test docheader, docfooter and separator in template map @@ -1227,6 +1275,19 @@ abort: specify a template [255] +Error if style is a directory: + + $ hg log --style somedir + abort: Is a directory: 'somedir' + [255] + +Error if style is a directory whose name is a built-in style: + + $ hg log --style coal + abort: style 'coal' not found + (available styles: bisect, changelog, compact, default, phases, show, status, xml) + [255] + Error if style missing key: $ echo 'q = q' > t