Mercurial > hg
changeset 42190:7c0ece3cd3ee
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 23 Apr 2019 15:49:17 -0400 |
| parents | c0e30c9ee5ba (diff) cd1bede340b0 (current diff) |
| children | 0da689a60163 |
| files | mercurial/branchmap.py |
| diffstat | 46 files changed, 1580 insertions(+), 684 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Sun Apr 21 08:57:01 2019 -0700 +++ b/hgext/histedit.py Tue Apr 23 15:49:17 2019 -0400 @@ -1230,12 +1230,13 @@ def patchcontents(state): repo = state['repo'] rule = state['rules'][state['pos']] - repo.ui.verbose = True displayer = logcmdutil.changesetdisplayer(repo.ui, repo, { "patch": True, "template": "status" }, buffered=True) - displayer.show(rule.ctx) - displayer.close() + overrides = {('ui', 'verbose'): True} + with repo.ui.configoverride(overrides, source='histedit'): + displayer.show(rule.ctx) + displayer.close() return displayer.hunk[rule.ctx.rev()].splitlines() def _chisteditmain(repo, rules, stdscr):
--- a/hgext/phabricator.py Sun Apr 21 08:57:01 2019 -0700 +++ b/hgext/phabricator.py Tue Apr 23 15:49:17 2019 -0400 @@ -65,6 +65,7 @@ scmutil, smartset, tags, + templatefilters, templateutil, url as urlmod, util, @@ -380,11 +381,11 @@ params = { b'diff_id': diff[b'id'], b'name': b'hg:meta', - b'data': json.dumps({ - u'user': encoding.unifromlocal(ctx.user()), - u'date': u'{:.0f} {}'.format(*ctx.date()), - u'node': encoding.unifromlocal(ctx.hex()), - u'parent': encoding.unifromlocal(ctx.p1().hex()), + b'data': templatefilters.json({ + b'user': ctx.user(), + b'date': b'%d %d' % ctx.date(), + b'node': ctx.hex(), + b'parent': ctx.p1().hex(), }), } callconduit(ctx.repo(), b'differential.setdiffproperty', params) @@ -392,12 +393,11 @@ params = { b'diff_id': diff[b'id'], b'name': b'local:commits', - b'data': json.dumps({ - encoding.unifromlocal(ctx.hex()): { - u'author': encoding.unifromlocal(stringutil.person(ctx.user())), - u'authorEmail': encoding.unifromlocal( - stringutil.email(ctx.user())), - u'time': u'{:.0f}'.format(ctx.date()[0]), + b'data': templatefilters.json({ + ctx.hex(): { + b'author': stringutil.person(ctx.user()), + b'authorEmail': stringutil.email(ctx.user()), + b'time': int(ctx.date()[0]), }, }), }
--- a/mercurial/branchmap.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/branchmap.py Tue Apr 23 15:49:17 2019 -0400 @@ -608,51 +608,59 @@ wlock = None step = '' try: + # write the new names if self._rbcnamescount < len(self._names): - step = ' names' wlock = repo.wlock(wait=False) - if self._rbcnamescount != 0: - f = repo.cachevfs.open(_rbcnames, 'ab') - if f.tell() == self._rbcsnameslen: - f.write('\0') - else: - f.close() - repo.ui.debug("%s changed - rewriting it\n" % _rbcnames) - self._rbcnamescount = 0 - self._rbcrevslen = 0 - if self._rbcnamescount == 0: - # before rewriting names, make sure references are removed - repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True) - f = repo.cachevfs.open(_rbcnames, 'wb') - f.write('\0'.join(encoding.fromlocal(b) - for b in self._names[self._rbcnamescount:])) - self._rbcsnameslen = f.tell() - f.close() - self._rbcnamescount = len(self._names) + step = ' names' + self._writenames(repo) + # write the new revs start = self._rbcrevslen * _rbcrecsize if start != len(self._rbcrevs): step = '' if wlock is None: wlock = repo.wlock(wait=False) - revs = min(len(repo.changelog), - len(self._rbcrevs) // _rbcrecsize) - f = repo.cachevfs.open(_rbcrevs, 'ab') - if f.tell() != start: - repo.ui.debug("truncating cache/%s to %d\n" - % (_rbcrevs, start)) - f.seek(start) - if f.tell() != start: - start = 0 - f.seek(start) - f.truncate() - end = revs * _rbcrecsize - f.write(self._rbcrevs[start:end]) - f.close() - self._rbcrevslen = revs + self._writerevs(repo, start) + except (IOError, OSError, error.Abort, error.LockError) as inst: repo.ui.debug("couldn't write revision branch cache%s: %s\n" % (step, stringutil.forcebytestr(inst))) finally: if wlock is not None: wlock.release() + + def _writenames(self, repo): + """ write the new branch names to revbranchcache """ + if self._rbcnamescount != 0: + f = repo.cachevfs.open(_rbcnames, 'ab') + if f.tell() == self._rbcsnameslen: + f.write('\0') + else: + f.close() + repo.ui.debug("%s changed - rewriting it\n" % _rbcnames) + self._rbcnamescount = 0 + self._rbcrevslen = 0 + if self._rbcnamescount == 0: + # before rewriting names, make sure references are removed + repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True) + f = repo.cachevfs.open(_rbcnames, 'wb') + f.write('\0'.join(encoding.fromlocal(b) + for b in self._names[self._rbcnamescount:])) + self._rbcsnameslen = f.tell() + f.close() + self._rbcnamescount = len(self._names) + + def _writerevs(self, repo, start): + """ write the new revs to revbranchcache """ + revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize) + with repo.cachevfs.open(_rbcrevs, 'ab') as f: + if f.tell() != start: + repo.ui.debug("truncating cache/%s to %d\n" % (_rbcrevs, start)) + f.seek(start) + if f.tell() != start: + start = 0 + f.seek(start) + f.truncate() + end = revs * _rbcrecsize + f.write(self._rbcrevs[start:end]) + self._rbcrevslen = revs
--- a/mercurial/commands.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/commands.py Tue Apr 23 15:49:17 2019 -0400 @@ -63,6 +63,7 @@ tags as tagsmod, ui as uimod, util, + verify as verifymod, wireprotoserver, ) from .utils import ( @@ -6147,8 +6148,10 @@ ui.warn("(%s)\n" % obsfatemsg) return ret -@command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE) -def verify(ui, repo): +@command('verify', + [('', 'full', False, 'perform more checks (EXPERIMENTAL)')], + helpcategory=command.CATEGORY_MAINTENANCE) +def verify(ui, repo, **opts): """verify the integrity of the repository Verify the integrity of the current repository. @@ -6164,7 +6167,12 @@ Returns 0 on success, 1 if errors are encountered. """ - return hg.verify(repo) + opts = pycompat.byteskwargs(opts) + + level = None + if opts['full']: + level = verifymod.VERIFY_FULL + return hg.verify(repo, level) @command( 'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
--- a/mercurial/copies.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/copies.py Tue Apr 23 15:49:17 2019 -0400 @@ -353,27 +353,23 @@ return _chain(x, y, _backwardrenames(x, a, match=match), _forwardcopies(a, y, match=match)) -def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, baselabel=''): +def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, debug=True): """Computes, based on addedinm1 and addedinm2, the files exclusive to c1 and c2. This is its own function so extensions can easily wrap this call to see what files mergecopies is about to process. Even though c1 and c2 are not used in this function, they are useful in other extensions for being able to read the file nodes of the changed files. - - "baselabel" can be passed to help distinguish the multiple computations - done in the graft case. """ u1 = sorted(addedinm1 - addedinm2) u2 = sorted(addedinm2 - addedinm1) - header = " unmatched files in %s" - if baselabel: - header += ' (from %s)' % baselabel - if u1: - repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) - if u2: - repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) + if debug: + header = " unmatched files in %s" + if u1: + repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) + if u2: + repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) return u1, u2 @@ -552,7 +548,6 @@ tca = _c1.ancestor(_c2) limit = _findlimit(repo, c1, c2) - repo.ui.debug(" searching for copies back to rev %d\n" % limit) m1 = c1.manifest() m2 = c2.manifest() @@ -589,15 +584,14 @@ u1u, u2u = u1r, u2r else: # unmatched file from base (DAG rotation in the graft case) - u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, - baselabel='base') + u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) # unmatched file from topological common ancestors (no DAG rotation) # need to recompute this for directory move handling when grafting mta = tca.manifest() u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta, repo.narrowmatch()), m2.filesnotin(mta, repo.narrowmatch()), - baselabel='topological common ancestor') + debug=False) for f in u1u: _checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1) @@ -631,9 +625,6 @@ else: divergeset.update(fl) # reverse map for below - if bothnew: - repo.ui.debug(" unmatched files new in both:\n %s\n" - % "\n ".join(bothnew)) bothdiverge = {} bothincompletediverge = {} remainder = {} @@ -682,7 +673,25 @@ if len(fl) == 2 and fl[0] == fl[1]: copy[fl[0]] = of # not actually divergent, just matching renames - if fullcopy and repo.ui.debugflag: + # Sometimes we get invalid copies here (the "and not remotebase" in + # _checkcopies() seems suspicious). Filter them out. + for dst, src in fullcopy.copy().items(): + if src not in mb: + del fullcopy[dst] + # Sometimes we forget to add entries from "copy" to "fullcopy", so fix + # that up here + for dst, src in copy.items(): + fullcopy[dst] = src + # Sometimes we forget to add entries from "diverge" to "fullcopy", so fix + # that up here + for src, dsts in diverge.items(): + for dst in dsts: + fullcopy[dst] = src + + if not fullcopy: + return copy, {}, diverge, renamedelete, {} + + if repo.ui.debugflag: repo.ui.debug(" all copies found (* = to merge, ! = divergent, " "% = renamed and deleted):\n") for f in sorted(fullcopy): @@ -697,9 +706,6 @@ note)) del divergeset - if not fullcopy: - return copy, {}, diverge, renamedelete, {} - repo.ui.debug(" checking for directory renames\n") # generate a directory move map
--- a/mercurial/hg.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/hg.py Tue Apr 23 15:49:17 2019 -0400 @@ -1092,9 +1092,9 @@ recurse() return 0 # exit code is zero since we found outgoing changes -def verify(repo): +def verify(repo, level=None): """verify the consistency of a repository""" - ret = verifymod.verify(repo) + ret = verifymod.verify(repo, level=level) # Broken subrepo references in hidden csets don't seem worth worrying about, # since they can't be pushed/pulled, and --hidden can be used if they are a
--- a/mercurial/httppeer.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/httppeer.py Tue Apr 23 15:49:17 2019 -0400 @@ -382,6 +382,7 @@ self._path = path self._url = url self._caps = caps + self.limitedarguments = caps is not None and 'httppostargs' not in caps self._urlopener = opener self._requestbuilder = requestbuilder @@ -750,6 +751,9 @@ @interfaceutil.implementer(repository.ipeerv2) class httpv2peer(object): + + limitedarguments = False + def __init__(self, ui, repourl, apipath, opener, requestbuilder, apidescriptor): self.ui = ui
--- a/mercurial/match.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/match.py Tue Apr 23 15:49:17 2019 -0400 @@ -484,7 +484,7 @@ """Matches a set of (kind, pat, source) against a 'root' directory. >>> kindpats = [ - ... (b're', b'.*\.c$', b''), + ... (b're', br'.*\.c$', b''), ... (b'path', b'foo/a', b''), ... (b'relpath', b'b', b''), ... (b'glob', b'*.h', b''), @@ -651,7 +651,7 @@ r'''Matches the input files exactly. They are interpreted as paths, not patterns (so no kind-prefixes). - >>> m = exactmatcher([b'a.txt', b're:.*\.c$']) + >>> m = exactmatcher([b'a.txt', br're:.*\.c$']) >>> m(b'a.txt') True >>> m(b'b.txt') @@ -664,7 +664,7 @@ So pattern 're:.*\.c$' is not considered as a regex, but as a file name >>> m(b'main.c') False - >>> m(b're:.*\.c$') + >>> m(br're:.*\.c$') True ''' @@ -1075,7 +1075,7 @@ def patkind(pattern, default=None): '''If pattern is 'kind:pat' with a known kind, return kind. - >>> patkind(b're:.*\.c$') + >>> patkind(br're:.*\.c$') 're' >>> patkind(b'glob:*.c') 'glob'
--- a/mercurial/merge.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/merge.py Tue Apr 23 15:49:17 2019 -0400 @@ -1380,7 +1380,6 @@ # Pick the best bid for each file repo.ui.note(_('\nauction for merging merge bids\n')) actions = {} - dms = [] # filenames that have dm actions for f, bids in sorted(fbids.items()): # bids is a mapping from action method to list af actions # Consensus? @@ -1389,8 +1388,6 @@ if all(a == l[0] for a in l[1:]): # len(bids) is > 1 repo.ui.note(_(" %s: consensus for %s\n") % (f, m)) actions[f] = l[0] - if m == ACTION_DIR_RENAME_MOVE_LOCAL: - dms.append(f) continue # If keep is an option, just do it. if ACTION_KEEP in bids: @@ -1415,18 +1412,7 @@ repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') % (f, m)) actions[f] = l[0] - if m == ACTION_DIR_RENAME_MOVE_LOCAL: - dms.append(f) continue - # Work around 'dm' that can cause multiple actions for the same file - for f in dms: - dm, (f0, flags), msg = actions[f] - assert dm == ACTION_DIR_RENAME_MOVE_LOCAL, dm - if f0 in actions and actions[f0][0] == ACTION_REMOVE: - # We have one bid for removing a file and another for moving it. - # These two could be merged as first move and then delete ... - # but instead drop moving and just delete. - del actions[f] repo.ui.note(_('end of auction\n\n')) if wctx.rev() is None:
--- a/mercurial/narrowspec.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/narrowspec.py Tue Apr 23 15:49:17 2019 -0400 @@ -15,6 +15,7 @@ match as matchmod, merge, repository, + scmutil, sparse, util, ) @@ -292,8 +293,8 @@ removedmatch = matchmod.differencematcher(oldmatch, newmatch) ds = repo.dirstate - lookup, status = ds.status(removedmatch, subrepos=[], ignored=False, - clean=True, unknown=False) + lookup, status = ds.status(removedmatch, subrepos=[], ignored=True, + clean=True, unknown=True) trackeddirty = status.modified + status.added clean = status.clean if assumeclean: @@ -302,8 +303,13 @@ else: trackeddirty.extend(lookup) _deletecleanfiles(repo, clean) + uipathfn = scmutil.getuipathfn(repo) for f in sorted(trackeddirty): - repo.ui.status(_('not deleting possibly dirty file %s\n') % f) + repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f)) + for f in sorted(status.unknown): + repo.ui.status(_('not deleting unknown file %s\n') % uipathfn(f)) + for f in sorted(status.ignored): + repo.ui.status(_('not deleting ignored file %s\n') % uipathfn(f)) for f in clean + trackeddirty: ds.drop(f)
--- a/mercurial/repository.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/repository.py Tue Apr 23 15:49:17 2019 -0400 @@ -291,6 +291,10 @@ class ipeerrequests(interfaceutil.Interface): """Interface for executing commands on a peer.""" + limitedarguments = interfaceutil.Attribute( + """True if the peer cannot receive large argument value for commands.""" + ) + def commandexecutor(): """A context manager that resolves to an ipeercommandexecutor. @@ -329,6 +333,8 @@ class peer(object): """Base class for peer repositories.""" + limitedarguments = False + def capable(self, name): caps = self.capabilities() if name in caps:
--- a/mercurial/setdiscovery.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/setdiscovery.py Tue Apr 23 15:49:17 2019 -0400 @@ -119,13 +119,13 @@ self._childrenmap = None def addcommons(self, commons): - """registrer nodes known as common""" + """register nodes known as common""" self._common.addbases(commons) if self._undecided is not None: self._common.removeancestorsfrom(self._undecided) def addmissings(self, missings): - """registrer some nodes as missing""" + """register some nodes as missing""" newmissing = self._repo.revs('%ld::%ld', missings, self.undecided) if newmissing: self.missing.update(newmissing) @@ -275,9 +275,63 @@ # early exit if we know all the specified remote heads already ui.debug("query 1; heads\n") roundtrips += 1 - sample = _limitsample(ownheads, initialsamplesize) - # indices between sample and externalized version must match - sample = list(sample) + # We also ask remote about all the local heads. That set can be arbitrarily + # large, so we used to limit it size to `initialsamplesize`. We no longer + # do as it proved counter productive. The skipped heads could lead to a + # large "undecided" set, slower to be clarified than if we asked the + # question for all heads right away. + # + # We are already fetching all server heads using the `heads` commands, + # sending a equivalent number of heads the other way should not have a + # significant impact. In addition, it is very likely that we are going to + # have to issue "known" request for an equivalent amount of revisions in + # order to decide if theses heads are common or missing. + # + # find a detailled analysis below. + # + # Case A: local and server both has few heads + # + # Ownheads is below initialsamplesize, limit would not have any effect. + # + # Case B: local has few heads and server has many + # + # Ownheads is below initialsamplesize, limit would not have any effect. + # + # Case C: local and server both has many heads + # + # We now transfert some more data, but not significantly more than is + # already transfered to carry the server heads. + # + # Case D: local has many heads, server has few + # + # D.1 local heads are mostly known remotely + # + # All the known head will have be part of a `known` request at some + # point for the discovery to finish. Sending them all earlier is + # actually helping. + # + # (This case is fairly unlikely, it requires the numerous heads to all + # be merged server side in only a few heads) + # + # D.2 local heads are mostly missing remotely + # + # To determine that the heads are missing, we'll have to issue `known` + # request for them or one of their ancestors. This amount of `known` + # request will likely be in the same order of magnitude than the amount + # of local heads. + # + # The only case where we can be more efficient using `known` request on + # ancestors are case were all the "missing" local heads are based on a + # few changeset, also "missing". This means we would have a "complex" + # graph (with many heads) attached to, but very independant to a the + # "simple" graph on the server. This is a fairly usual case and have + # not been met in the wild so far. + if remote.limitedarguments: + sample = _limitsample(ownheads, initialsamplesize) + # indices between sample and externalized version must match + sample = list(sample) + else: + sample = ownheads with remote.commandexecutor() as e: fheads = e.callcommand('heads', {})
--- a/mercurial/verify.py Sun Apr 21 08:57:01 2019 -0700 +++ b/mercurial/verify.py Tue Apr 23 15:49:17 2019 -0400 @@ -22,9 +22,13 @@ util, ) -def verify(repo): +VERIFY_DEFAULT = 0 +VERIFY_FULL = 1 + +def verify(repo, level=None): with repo.lock(): - return verifier(repo).verify() + v = verifier(repo, level) + return v.verify() def _normpath(f): # under hg < 2.4, convert didn't sanitize paths properly, so a @@ -34,10 +38,13 @@ return f class verifier(object): - def __init__(self, repo): + def __init__(self, repo, level=None): self.repo = repo.unfiltered() self.ui = repo.ui self.match = repo.narrowmatch() + if level is None: + level = VERIFY_DEFAULT + self._level = level self.badrevs = set() self.errors = 0 self.warnings = 0 @@ -330,6 +337,16 @@ filenodes.setdefault(fullpath, {}).setdefault(fn, lr) except Exception as inst: self._exc(lr, _("reading delta %s") % short(n), inst, label) + if self._level >= VERIFY_FULL: + try: + # Various issues can affect manifest. So we read each full + # text from storage. This triggers the checks from the core + # code (eg: hash verification, filename are ordered, etc.) + mfdelta = mfl.get(dir, n).read() + except Exception as inst: + self._exc(lr, _("reading full manifest %s") % short(n), + inst, label) + if not dir: progress.complete()
--- a/rust/hg-core/src/dagops.rs Sun Apr 21 08:57:01 2019 -0700 +++ b/rust/hg-core/src/dagops.rs Tue Apr 23 15:49:17 2019 -0400 @@ -13,7 +13,8 @@ //! - Similarly *relative roots* of a collection of `Revision`, we mean //! those whose parents, if any, don't belong to the collection. use super::{Graph, GraphError, Revision, NULL_REVISION}; -use std::collections::HashSet; +use crate::ancestors::AncestorsIterator; +use std::collections::{BTreeSet, HashSet}; fn remove_parents( graph: &impl Graph, @@ -80,6 +81,92 @@ Ok(()) } +/// Roots of `revs`, passed as a `HashSet` +/// +/// They are returned in arbitrary order +pub fn roots<G: Graph>( + graph: &G, + revs: &HashSet<Revision>, +) -> Result<Vec<Revision>, GraphError> { + let mut roots: Vec<Revision> = Vec::new(); + for rev in revs { + if graph + .parents(*rev)? + .iter() + .filter(|p| **p != NULL_REVISION) + .all(|p| !revs.contains(p)) + { + roots.push(*rev); + } + } + Ok(roots) +} + +/// Compute the topological range between two collections of revisions +/// +/// This is equivalent to the revset `<roots>::<heads>`. +/// +/// Currently, the given `Graph` has to implement `Clone`, which means +/// actually cloning just a reference-counted Python pointer if +/// it's passed over through `rust-cpython`. This is due to the internal +/// use of `AncestorsIterator` +/// +/// # Algorithmic details +/// +/// This is a two-pass swipe inspired from what `reachableroots2` from +/// `mercurial.cext.parsers` does to obtain the same results. +/// +/// - first, we climb up the DAG from `heads` in topological order, keeping +/// them in the vector `heads_ancestors` vector, and adding any element of +/// `roots` we find among them to the resulting range. +/// - Then, we iterate on that recorded vector so that a revision is always +/// emitted after its parents and add all revisions whose parents are already +/// in the range to the results. +/// +/// # Performance notes +/// +/// The main difference with the C implementation is that +/// the latter uses a flat array with bit flags, instead of complex structures +/// like `HashSet`, making it faster in most scenarios. In theory, it's +/// possible that the present implementation could be more memory efficient +/// for very large repositories with many branches. +pub fn range( + graph: &(impl Graph + Clone), + roots: impl IntoIterator<Item = Revision>, + heads: impl IntoIterator<Item = Revision>, +) -> Result<BTreeSet<Revision>, GraphError> { + let mut range = BTreeSet::new(); + let roots: HashSet<Revision> = roots.into_iter().collect(); + let min_root: Revision = match roots.iter().cloned().min() { + None => { + return Ok(range); + } + Some(r) => r, + }; + + // Internally, AncestorsIterator currently maintains a `HashSet` + // of all seen revision, which is also what we record, albeit in an ordered + // way. There's room for improvement on this duplication. + let ait = AncestorsIterator::new(graph.clone(), heads, min_root, true)?; + let mut heads_ancestors: Vec<Revision> = Vec::new(); + for revres in ait { + let rev = revres?; + if roots.contains(&rev) { + range.insert(rev); + } + heads_ancestors.push(rev); + } + + for rev in heads_ancestors.into_iter().rev() { + for parent in graph.parents(rev)?.iter() { + if *parent != NULL_REVISION && range.contains(parent) { + range.insert(rev); + } + } + } + Ok(range) +} + #[cfg(test)] mod tests { @@ -137,4 +224,53 @@ Ok(()) } + /// Apply `roots()` and sort the result for easier comparison + fn roots_sorted( + graph: &impl Graph, + revs: &[Revision], + ) -> Result<Vec<Revision>, GraphError> { + let mut as_vec = roots(graph, &revs.iter().cloned().collect())?; + as_vec.sort(); + Ok(as_vec) + } + + #[test] + fn test_roots() -> Result<(), GraphError> { + assert_eq!(roots_sorted(&SampleGraph, &[4, 5, 6])?, vec![4]); + assert_eq!( + roots_sorted(&SampleGraph, &[4, 1, 6, 12, 0])?, + vec![0, 4, 12] + ); + assert_eq!( + roots_sorted(&SampleGraph, &[1, 2, 3, 4, 5, 6, 7, 8, 9])?, + vec![1, 8] + ); + Ok(()) + } + + /// Apply `range()` and convert the result into a Vec for easier comparison + fn range_vec( + graph: impl Graph + Clone, + roots: &[Revision], + heads: &[Revision], + ) -> Result<Vec<Revision>, GraphError> { + range(&graph, roots.iter().cloned(), heads.iter().cloned()) + .map(|bs| bs.into_iter().collect()) + } + + #[test] + fn test_range() -> Result<(), GraphError> { + assert_eq!(range_vec(SampleGraph, &[0], &[4])?, vec![0, 1, 2, 4]); + assert_eq!(range_vec(SampleGraph, &[0], &[8])?, vec![]); + assert_eq!( + range_vec(SampleGraph, &[5, 6], &[10, 11, 13])?, + vec![5, 10] + ); + assert_eq!( + range_vec(SampleGraph, &[5, 6], &[10, 12])?, + vec![5, 6, 9, 10, 12] + ); + Ok(()) + } + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rust/hg-core/src/discovery.rs Tue Apr 23 15:49:17 2019 -0400 @@ -0,0 +1,209 @@ +// discovery.rs +// +// Copyright 2019 Georges Racinet <georges.racinet@octobus.net> +// +// This software may be used and distributed according to the terms of the +// GNU General Public License version 2 or any later version. + +//! Discovery operations +//! +//! This is a Rust counterpart to the `partialdiscovery` class of +//! `mercurial.setdiscovery` + +use super::{Graph, GraphError, Revision}; +use crate::ancestors::MissingAncestors; +use crate::dagops; +use std::collections::HashSet; + +pub struct PartialDiscovery<G: Graph + Clone> { + target_heads: Option<Vec<Revision>>, + graph: G, // plays the role of self._repo + common: MissingAncestors<G>, + undecided: Option<HashSet<Revision>>, + missing: HashSet<Revision>, +} + +pub struct DiscoveryStats { + pub undecided: Option<usize>, +} + +impl<G: Graph + Clone> PartialDiscovery<G> { + /// Create a PartialDiscovery object, with the intent + /// of comparing our `::<target_heads>` revset to the contents of another + /// repo. + /// + /// For now `target_heads` is passed as a vector, and will be used + /// at the first call to `ensure_undecided()`. + /// + /// If we want to make the signature more flexible, + /// we'll have to make it a type argument of `PartialDiscovery` or a trait + /// object since we'll keep it in the meanwhile + pub fn new(graph: G, target_heads: Vec<Revision>) -> Self { + PartialDiscovery { + undecided: None, + target_heads: Some(target_heads), + graph: graph.clone(), + common: MissingAncestors::new(graph, vec![]), + missing: HashSet::new(), + } + } + + /// Register revisions known as being common + pub fn add_common_revisions( + &mut self, + common: impl IntoIterator<Item = Revision>, + ) -> Result<(), GraphError> { + self.common.add_bases(common); + if let Some(ref mut undecided) = self.undecided { + self.common.remove_ancestors_from(undecided)?; + } + Ok(()) + } + + /// Register revisions known as being missing + pub fn add_missing_revisions( + &mut self, + missing: impl IntoIterator<Item = Revision>, + ) -> Result<(), GraphError> { + self.ensure_undecided()?; + let range = dagops::range( + &self.graph, + missing, + self.undecided.as_ref().unwrap().iter().cloned(), + )?; + let undecided_mut = self.undecided.as_mut().unwrap(); + for missrev in range { + self.missing.insert(missrev); + undecided_mut.remove(&missrev); + } + Ok(()) + } + + /// Do we have any information about the peer? + pub fn has_info(&self) -> bool { + self.common.has_bases() + } + + /// Did we acquire full knowledge of our Revisions that the peer has? + pub fn is_complete(&self) -> bool { + self.undecided.as_ref().map_or(false, |s| s.is_empty()) + } + + /// Return the heads of the currently known common set of revisions. + /// + /// If the discovery process is not complete (see `is_complete()`), the + /// caller must be aware that this is an intermediate state. + /// + /// On the other hand, if it is complete, then this is currently + /// the only way to retrieve the end results of the discovery process. + /// + /// We may introduce in the future an `into_common_heads` call that + /// would be more appropriate for normal Rust callers, dropping `self` + /// if it is complete. + pub fn common_heads(&self) -> Result<HashSet<Revision>, GraphError> { + self.common.bases_heads() + } + + /// Force first computation of `self.undecided` + /// + /// After this, `self.undecided.as_ref()` and `.as_mut()` can be + /// unwrapped to get workable immutable or mutable references without + /// any panic. + /// + /// This is an imperative call instead of an access with added lazyness + /// to reduce easily the scope of mutable borrow for the caller, + /// compared to undecided(&'a mut self) -> &'a… that would keep it + /// as long as the resulting immutable one. + fn ensure_undecided(&mut self) -> Result<(), GraphError> { + if self.undecided.is_some() { + return Ok(()); + } + let tgt = self.target_heads.take().unwrap(); + self.undecided = + Some(self.common.missing_ancestors(tgt)?.into_iter().collect()); + Ok(()) + } + + /// Provide statistics about the current state of the discovery process + pub fn stats(&self) -> DiscoveryStats { + DiscoveryStats { + undecided: self.undecided.as_ref().map(|s| s.len()), + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::testing::SampleGraph; + + /// A PartialDiscovery as for pushing all the heads of `SampleGraph` + fn full_disco() -> PartialDiscovery<SampleGraph> { + PartialDiscovery::new(SampleGraph, vec![10, 11, 12, 13]) + } + + fn sorted_undecided( + disco: &PartialDiscovery<SampleGraph>, + ) -> Vec<Revision> { + let mut as_vec: Vec<Revision> = + disco.undecided.as_ref().unwrap().iter().cloned().collect(); + as_vec.sort(); + as_vec + } + + fn sorted_missing(disco: &PartialDiscovery<SampleGraph>) -> Vec<Revision> { + let mut as_vec: Vec<Revision> = + disco.missing.iter().cloned().collect(); + as_vec.sort(); + as_vec + } + + fn sorted_common_heads( + disco: &PartialDiscovery<SampleGraph>, + ) -> Result<Vec<Revision>, GraphError> { + let mut as_vec: Vec<Revision> = + disco.common_heads()?.iter().cloned().collect(); + as_vec.sort(); + Ok(as_vec) + } + + #[test] + fn test_add_common_get_undecided() -> Result<(), GraphError> { + let mut disco = full_disco(); + assert_eq!(disco.undecided, None); + assert!(!disco.has_info()); + assert_eq!(disco.stats().undecided, None); + + disco.add_common_revisions(vec![11, 12])?; + assert!(disco.has_info()); + assert!(!disco.is_complete()); + assert!(disco.missing.is_empty()); + + // add_common_revisions did not trigger a premature computation + // of `undecided`, let's check that and ask for them + assert_eq!(disco.undecided, None); + disco.ensure_undecided()?; + assert_eq!(sorted_undecided(&disco), vec![5, 8, 10, 13]); + assert_eq!(disco.stats().undecided, Some(4)); + Ok(()) + } + + /// in this test, we pretend that our peer misses exactly (8+10):: + /// and we're comparing all our repo to it (as in a bare push) + #[test] + fn test_discovery() -> Result<(), GraphError> { + let mut disco = full_disco(); + disco.add_common_revisions(vec![11, 12])?; + disco.add_missing_revisions(vec![8, 10])?; + assert_eq!(sorted_undecided(&disco), vec![5]); + assert_eq!(sorted_missing(&disco), vec![8, 10, 13]); + assert!(!disco.is_complete()); + + disco.add_common_revisions(vec![5])?; + assert_eq!(sorted_undecided(&disco), vec![]); + assert_eq!(sorted_missing(&disco), vec![8, 10, 13]); + assert!(disco.is_complete()); + assert_eq!(sorted_common_heads(&disco)?, vec![5, 11, 12]); + Ok(()) + } +}
--- a/rust/hg-core/src/lib.rs Sun Apr 21 08:57:01 2019 -0700 +++ b/rust/hg-core/src/lib.rs Tue Apr 23 15:49:17 2019 -0400 @@ -6,6 +6,7 @@ pub mod dagops; pub use ancestors::{AncestorsIterator, LazyAncestors, MissingAncestors}; pub mod testing; // unconditionally built, for use from integration tests +pub mod discovery; /// Mercurial revision numbers ///
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rust/hg-cpython/src/discovery.rs Tue Apr 23 15:49:17 2019 -0400 @@ -0,0 +1,125 @@ +// discovery.rs +// +// Copyright 2018 Georges Racinet <gracinet@anybox.fr> +// +// This software may be used and distributed according to the terms of the +// GNU General Public License version 2 or any later version. + +//! Bindings for the `hg::discovery` module provided by the +//! `hg-core` crate. From Python, this will be seen as `rustext.discovery` +//! +//! # Classes visible from Python: +//! - [`PartialDiscover`] is the Rust implementation of +//! `mercurial.setdiscovery.partialdiscovery`. + +use crate::conversion::{py_set, rev_pyiter_collect}; +use cindex::Index; +use cpython::{ + ObjectProtocol, PyDict, PyModule, PyObject, PyResult, Python, ToPyObject, +}; +use exceptions::GraphError; +use hg::discovery::PartialDiscovery as CorePartialDiscovery; +use hg::Revision; + +use std::cell::RefCell; + +py_class!(pub class PartialDiscovery |py| { + data inner: RefCell<Box<CorePartialDiscovery<Index>>>; + + def __new__( + _cls, + index: PyObject, + targetheads: PyObject + ) -> PyResult<PartialDiscovery> { + Self::create_instance( + py, + RefCell::new(Box::new(CorePartialDiscovery::new( + Index::new(py, index)?, + rev_pyiter_collect(py, &targetheads)?, + ))) + ) + } + + def addcommons(&self, commons: PyObject) -> PyResult<PyObject> { + let mut inner = self.inner(py).borrow_mut(); + let commons_vec: Vec<Revision> = rev_pyiter_collect(py, &commons)?; + inner.add_common_revisions(commons_vec) + .map_err(|e| GraphError::pynew(py, e))?; + Ok(py.None()) + } + + def addmissings(&self, missings: PyObject) -> PyResult<PyObject> { + let mut inner = self.inner(py).borrow_mut(); + let missings_vec: Vec<Revision> = rev_pyiter_collect(py, &missings)?; + inner.add_missing_revisions(missings_vec) + .map_err(|e| GraphError::pynew(py, e))?; + Ok(py.None()) + } + + def addinfo(&self, sample: PyObject) -> PyResult<PyObject> { + let mut missing: Vec<Revision> = Vec::new(); + let mut common: Vec<Revision> = Vec::new(); + for info in sample.iter(py)? { // info is a pair (Revision, bool) + let mut revknown = info?.iter(py)?; + let rev: Revision = revknown.next().unwrap()?.extract(py)?; + let known: bool = revknown.next().unwrap()?.extract(py)?; + if known { + common.push(rev); + } else { + missing.push(rev); + } + } + let mut inner = self.inner(py).borrow_mut(); + inner.add_common_revisions(common) + .map_err(|e| GraphError::pynew(py, e))?; + inner.add_missing_revisions(missing) + .map_err(|e| GraphError::pynew(py, e))?; + Ok(py.None()) + } + + def hasinfo(&self) -> PyResult<bool> { + Ok(self.inner(py).borrow().has_info()) + } + + def iscomplete(&self) -> PyResult<bool> { + Ok(self.inner(py).borrow().is_complete()) + } + + def stats(&self) -> PyResult<PyDict> { + let stats = self.inner(py).borrow().stats(); + let as_dict: PyDict = PyDict::new(py); + as_dict.set_item(py, "undecided", + stats.undecided.map(|l| l.to_py_object(py)) + .unwrap_or_else(|| py.None()))?; + Ok(as_dict) + } + + def commonheads(&self) -> PyResult<PyObject> { + py_set( + py, + &self.inner(py).borrow().common_heads() + .map_err(|e| GraphError::pynew(py, e))? + ) + } +}); + +/// Create the module, with __package__ given from parent +pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> { + let dotted_name = &format!("{}.discovery", package); + let m = PyModule::new(py, dotted_name)?; + m.add(py, "__package__", package)?; + m.add( + py, + "__doc__", + "Discovery of common node sets - Rust implementation", + )?; + m.add_class::<PartialDiscovery>(py)?; + + let sys = PyModule::import(py, "sys")?; + let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?; + sys_modules.set_item(py, dotted_name, &m)?; + // Example C code (see pyexpat.c and import.c) will "give away the + // reference", but we won't because it will be consumed once the + // Rust PyObject is dropped. + Ok(m) +}
--- a/rust/hg-cpython/src/lib.rs Sun Apr 21 08:57:01 2019 -0700 +++ b/rust/hg-cpython/src/lib.rs Tue Apr 23 15:49:17 2019 -0400 @@ -28,6 +28,7 @@ mod cindex; mod conversion; pub mod dagops; +pub mod discovery; pub mod exceptions; py_module_initializer!(rustext, initrustext, PyInit_rustext, |py, m| { @@ -40,6 +41,7 @@ let dotted_name: String = m.get(py, "__name__")?.extract(py)?; m.add(py, "ancestor", ancestors::init_module(py, &dotted_name)?)?; m.add(py, "dagop", dagops::init_module(py, &dotted_name)?)?; + m.add(py, "discovery", discovery::init_module(py, &dotted_name)?)?; m.add(py, "GraphError", py.get_type::<exceptions::GraphError>())?; Ok(()) });
--- a/tests/test-annotate.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-annotate.t Tue Apr 23 15:49:17 2019 -0400 @@ -1,4 +1,7 @@ - $ HGMERGE=true; export HGMERGE + $ cat >> "$HGRCPATH" << EOF + > [ui] + > merge = :merge3 + > EOF init @@ -210,8 +213,34 @@ created new head $ hg merge merging b - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat b + a + a + a + <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 + b4 + c + b5 + ||||||| base + ======= + b4 + b5 + b6 + >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 + $ cat <<EOF > b + > a + > a + > a + > b4 + > c + > b5 + > EOF + $ hg resolve --mark -q + $ rm b.orig $ hg ci -mmergeb -d '3 0' annotate after merge @@ -244,15 +273,37 @@ > EOF $ hg ci -mc -d '3 0' created new head +BROKEN: 'a' was copied to 'b' on both sides. We should not get a merge conflict here $ hg merge merging b - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ cat <<EOF >> b + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat b + <<<<<<< working copy: b80e3e32f75a - test: c + a + z + a + ||||||| base + ======= + a + a + a + b4 + c + b5 + >>>>>>> merge rev: 64afcdf8e29e - test: mergeb + $ cat <<EOF > b + > a + > z + > a > b4 > c > b5 > EOF + $ hg resolve --mark -q + $ rm b.orig $ echo d >> b $ hg ci -mmerge2 -d '4 0' @@ -695,8 +746,41 @@ 27: baz:3+->3- $ hg merge 25 merging baz and qux to qux - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) + warning: conflicts while merging qux! (edit, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat qux + 0 + 0 + 1 baz:1 + 2 baz:2 + <<<<<<< working copy: 863de62655ef - test: baz:3+->3- + 3- baz:3 + 4 baz:4 + ||||||| base + 3+ baz:3 + 4 baz:4 + ======= + 3+ baz:3 + 4+ baz:4 + >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+ + 5 + 6 + 7 + $ cat > qux <<EOF + > 0 + > 0 + > 1 baz:1 + > 2 baz:2 + > 3- baz:3 + > 4 baz:4 + > 5 + > 6 + > 7 + > EOF + $ hg resolve --mark -q + $ rm qux.orig $ hg ci -m merge $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' 16: baz:0 @@ -709,8 +793,40 @@ $ hg up 25 --quiet $ hg merge 27 merging qux and baz to qux - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) + warning: conflicts while merging qux! (edit, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat qux + 0 + 0 + 1 baz:1 + 2 baz:2 + <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ + 3+ baz:3 + 4+ baz:4 + ||||||| base + 3+ baz:3 + 4 baz:4 + ======= + 3- baz:3 + 4 baz:4 + >>>>>>> merge rev: 863de62655ef - test: baz:3+->3- + 5 + 6 + 7 + $ cat > qux <<EOF + > 0 + > 0 + > 1 baz:1 + > 2 baz:2 + > 3+ baz:3 + > 4+ baz:4 + > 5 + > 6 + > EOF + $ hg resolve --mark -q + $ rm qux.orig $ hg ci -m 'merge from other side' created new head $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' @@ -1061,6 +1177,19 @@ $ echo 3 >> a $ hg commit -m 3 -q $ hg merge 2 -q + warning: conflicts while merging a! (edit, then use 'hg resolve --mark') + [1] + $ cat a + <<<<<<< working copy: 0a068f0261cf - test: 3 + 1 + 2 + 3 + ||||||| base + 1 + 2 + ======= + a + >>>>>>> merge rev: 9409851bc20a - test: a $ cat > a << EOF > b > 1 @@ -1069,6 +1198,7 @@ > a > EOF $ hg resolve --mark -q + $ rm a.orig $ hg commit -m m $ hg annotate a 4: b
--- a/tests/test-completion.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-completion.t Tue Apr 23 15:49:17 2019 -0400 @@ -347,7 +347,7 @@ tip: patch, git, style, template unbundle: update update: clean, check, merge, date, rev, tool - verify: + verify: full version: template $ hg init a
--- a/tests/test-copy-move-merge.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-copy-move-merge.t Tue Apr 23 15:49:17 2019 -0400 @@ -23,7 +23,6 @@ $ hg ci -qAm "other" $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: b c
--- a/tests/test-copytrace-heuristics.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-copytrace-heuristics.t Tue Apr 23 15:49:17 2019 -0400 @@ -16,6 +16,9 @@ > [extensions] > rebase= > shelve= + > [alias] + > l = log -G -T 'rev: {rev}\ndesc: {desc}\n' + > pl = log -G -T 'rev: {rev}, phase: {phase}\ndesc: {desc}\n' > EOF NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to @@ -43,13 +46,13 @@ $ echo b > dir/file.txt $ hg ci -qm 'mod a, mod dir/file.txt' - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081 - | desc: mod a, mod dir/file.txt - | o changeset: 928d74bc9110681920854d845c06959f6dfc9547 - |/ desc: mv a b, mv dir/ dir2/ - o changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee - desc: initial + $ hg l + @ rev: 2 + | desc: mod a, mod dir/file.txt + | o rev: 1 + |/ desc: mv a b, mv dir/ dir2/ + o rev: 0 + desc: initial $ hg rebase -s . -d 1 rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip) @@ -76,13 +79,13 @@ $ printf 'somecontent\nmoarcontent' > a $ hg ci -qm 'mode a' - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: d526312210b9e8f795d576a77dc643796384d86e - | desc: mode a - | o changeset: 46985f76c7e5e5123433527f5c8526806145650b - |/ desc: rm a, add b - o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 - desc: initial + $ hg l + @ rev: 2 + | desc: mode a + | o rev: 1 + |/ desc: rm a, add b + o rev: 0 + desc: initial $ hg rebase -s . -d 1 rebasing 2:d526312210b9 "mode a" (tip) @@ -113,15 +116,15 @@ $ echo b > a $ hg ci -qm 'mod a' - $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' - @ changeset: 9d5cf99c3d9f8e8b05ba55421f7f56530cfcf3bc - | desc: mod a, phase: draft - | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d - |/ desc: mv a b, phase: draft - o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 - | desc: randomcommit, phase: draft - o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 - desc: initial, phase: draft + $ hg pl + @ rev: 3, phase: draft + | desc: mod a + | o rev: 2, phase: draft + |/ desc: mv a b + o rev: 1, phase: draft + | desc: randomcommit + o rev: 0, phase: draft + desc: initial $ hg rebase -s . -d 2 rebasing 3:9d5cf99c3d9f "mod a" (tip) @@ -148,15 +151,15 @@ $ echo b > b $ hg ci -qm 'mod b' - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: fbe97126b3969056795c462a67d93faf13e4d298 - | desc: mod b - o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d - | desc: mv a b - o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 - | desc: randomcommit - o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 - desc: initial + $ hg l + @ rev: 3 + | desc: mod b + o rev: 2 + | desc: mv a b + o rev: 1 + | desc: randomcommit + o rev: 0 + desc: initial $ hg rebase -s . -d 0 rebasing 3:fbe97126b396 "mod b" (tip) @@ -185,15 +188,15 @@ $ echo b > dir/a $ hg ci -qm 'mod dir/a' - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea - | desc: mod dir/a - | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa - | | desc: create dir2/a - | o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade - |/ desc: mv dir/a dir/b - o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 - desc: initial + $ hg l + @ rev: 3 + | desc: mod dir/a + | o rev: 2 + | | desc: create dir2/a + | o rev: 1 + |/ desc: mv dir/a dir/b + o rev: 0 + desc: initial $ hg rebase -s . -d 2 rebasing 3:6b2f4cece40f "mod dir/a" (tip) @@ -230,13 +233,13 @@ $ hg ci -m 'mod a' created new head - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e - | desc: mod a - | o changeset: 8329d5c6bf479ec5ca59b9864f3f45d07213f5a4 - |/ desc: mv a foo, add many files - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 2 + | desc: mod a + | o rev: 1 + |/ desc: mv a foo, add many files + o rev: 0 + desc: initial With small limit @@ -278,13 +281,13 @@ $ hg ci -m 'del a' created new head - $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' - @ changeset: 7d61ee3b1e48577891a072024968428ba465c47b - | desc: del a, phase: draft - | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - |/ desc: mv a b, phase: draft - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial, phase: draft + $ hg pl + @ rev: 2, phase: draft + | desc: del a + | o rev: 1, phase: draft + |/ desc: mv a b + o rev: 0, phase: draft + desc: initial $ hg rebase -s 1 -d 2 rebasing 1:472e38d57782 "mv a b" @@ -311,13 +314,13 @@ $ hg mv -q dir/ dir2 $ hg ci -qm 'mv dir/ dir2/' - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239 - | desc: mv dir/ dir2/ - | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea - |/ desc: mod dir/a - o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 - desc: initial + $ hg l + @ rev: 2 + | desc: mv dir/ dir2/ + | o rev: 1 + |/ desc: mod dir/a + o rev: 0 + desc: initial $ hg rebase -s . -d 1 rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip) @@ -345,15 +348,15 @@ $ hg ci -m 'mod a' created new head - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 - | desc: mod a - | o changeset: d3efd280421d24f9f229997c19e654761c942a71 - | | desc: mv b c - | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - |/ desc: mv a b - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 3 + | desc: mod a + | o rev: 2 + | | desc: mv b c + | o rev: 1 + |/ desc: mv a b + o rev: 0 + desc: initial $ hg rebase -s . -d 2 rebasing 3:d41316942216 "mod a" (tip) merging c and a to c @@ -379,15 +382,15 @@ $ echo c > a $ hg ci -m 'mod a' created new head - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 - | desc: mod a - | o changeset: d3efd280421d24f9f229997c19e654761c942a71 - | | desc: mv b c - | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - |/ desc: mv a b - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 3 + | desc: mod a + | o rev: 2 + | | desc: mv b c + | o rev: 1 + |/ desc: mv a b + o rev: 0 + desc: initial $ hg rebase -s 1 -d . rebasing 1:472e38d57782 "mv a b" merging a and b to b @@ -417,15 +420,15 @@ $ hg ci -m 'mod a' created new head - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e - | desc: mod a - | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9 - | | desc: add c - | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - |/ desc: mv a b - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 3 + | desc: mod a + | o rev: 2 + | | desc: add c + | o rev: 1 + |/ desc: mv a b + o rev: 0 + desc: initial $ hg rebase -s . -d 2 rebasing 3:ef716627c70b "mod a" (tip) @@ -455,13 +458,13 @@ created new head $ hg up -q 2 - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - | desc: mv a b - | o changeset: b0357b07f79129a3d08a68621271ca1352ae8a09 - |/ desc: modify a - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 2 + | desc: mv a b + | o rev: 1 + |/ desc: modify a + o rev: 0 + desc: initial $ hg merge 1 merging b and a to b @@ -490,13 +493,13 @@ $ hg ci -m 'mod a' created new head - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e - | desc: mod a - | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8 - |/ desc: cp a c, mv a b - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 2 + | desc: mod a + | o rev: 1 + |/ desc: cp a c, mv a b + o rev: 0 + desc: initial $ hg rebase -s . -d 1 rebasing 2:ef716627c70b "mod a" (tip) @@ -530,32 +533,32 @@ $ hg mv b c $ hg ci -qm 'mv b c' $ hg up -q 1 - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - o changeset: d3efd280421d24f9f229997c19e654761c942a71 - | desc: mv b c - o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - | desc: mv a b - | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e - |/ desc: mod a - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + o rev: 3 + | desc: mv b c + o rev: 2 + | desc: mv a b + | @ rev: 1 + |/ desc: mod a + o rev: 0 + desc: initial $ hg merge 3 merging a and c to c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -qm 'merge' - $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' - @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825 - |\ desc: merge, phase: draft - | o changeset: d3efd280421d24f9f229997c19e654761c942a71 - | | desc: mv b c, phase: draft - | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - | | desc: mv a b, phase: draft - o | changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e - |/ desc: mod a, phase: draft - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial, phase: draft + $ hg pl + @ rev: 4, phase: draft + |\ desc: merge + | o rev: 3, phase: draft + | | desc: mv b c + | o rev: 2, phase: draft + | | desc: mv a b + o | rev: 1, phase: draft + |/ desc: mod a + o rev: 0, phase: draft + desc: initial $ ls c $ cd .. @@ -577,11 +580,11 @@ $ hg mv a b $ hg ci -m 'mv a b' - $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' - @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 - | desc: mv a b - o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 - desc: initial + $ hg l + @ rev: 1 + | desc: mv a b + o rev: 0 + desc: initial $ hg unshelve unshelving change 'default' rebasing shelved changes @@ -614,13 +617,13 @@ $ cd .. $ hg ci -qm 'mod a' - $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n' - @ changeset 6207d2d318e710b882e3d5ada2a89770efc42c96 - | desc mod a, phase: draft - | o changeset abffdd4e3dfc04bc375034b970299b2a309a1cce - |/ desc mv a b; mv dir1 dir2, phase: draft - o changeset 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3 - desc initial, phase: draft + $ hg pl + @ rev: 2, phase: draft + | desc: mod a + | o rev: 1, phase: draft + |/ desc: mv a b; mv dir1 dir2 + o rev: 0, phase: draft + desc: initial $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 rebasing 2:6207d2d318e7 "mod a" (tip) @@ -652,13 +655,13 @@ $ hg mv -q dir1 dir2 $ hg ci -qm 'mv dir1 dir2' - $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n' - @ changeset e8919e7df8d036e07b906045eddcd4a42ff1915f - | desc mv dir1 dir2, phase: draft - | o changeset 7c7c6f339be00f849c3cb2df738ca91db78b32c8 - |/ desc hg add dir1/a, phase: draft - o changeset a235dcce55dcf42034c4e374cb200662d0bb4a13 - desc initial, phase: draft + $ hg pl + @ rev: 2, phase: draft + | desc: mv dir1 dir2 + | o rev: 1, phase: draft + |/ desc: hg add dir1/a + o rev: 0, phase: draft + desc: initial $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) @@ -685,19 +688,19 @@ $ mkdir foo $ hg mv a foo/bar $ hg ci -m "Moved a to foo/bar" - $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n' - @ changeset b4b0f7880e500b5c364a5f07b4a2b167de7a6fb0 - | desc Moved a to foo/bar, phase: draft - o changeset 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d - | desc added b, phase: draft - | o changeset 8b6e13696c38e8445a759516474640c2f8dddef6 - |/ desc added more things to a, phase: draft - o changeset 9092f1db7931481f93b37d5c9fbcfc341bcd7318 - desc added a, phase: draft + $ hg pl + @ rev: 3, phase: draft + | desc: Moved a to foo/bar + o rev: 2, phase: draft + | desc: added b + | o rev: 1, phase: draft + |/ desc: added more things to a + o rev: 0, phase: draft + desc: added a When the sourcecommitlimit is small and we have more drafts, we use heuristics only - $ hg rebase -s 8b6e13696 -d . + $ hg rebase -s 1 -d . rebasing 1:8b6e13696c38 "added more things to a" file 'a' was deleted in local [dest] but was modified in other [source]. What do you want to do? @@ -710,7 +713,7 @@ $ hg rebase --abort rebase aborted - $ hg rebase -s 8b6e13696 -d . --config experimental.copytrace.sourcecommitlimit=100 + $ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100 rebasing 1:8b6e13696c38 "added more things to a" merging foo/bar and a to foo/bar saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg
--- a/tests/test-double-merge.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-double-merge.t Tue Apr 23 15:49:17 2019 -0400 @@ -26,7 +26,6 @@ summary: cp foo bar; change both $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: bar all copies found (* = to merge, ! = divergent, % = renamed and deleted):
--- a/tests/test-fastannotate-hg.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-fastannotate-hg.t Tue Apr 23 15:49:17 2019 -0400 @@ -1,6 +1,8 @@ (this file is backported from core hg tests/test-annotate.t) $ cat >> $HGRCPATH << EOF + > [ui] + > merge = :merge3 > [diff] > git=1 > [extensions] @@ -11,8 +13,6 @@ > mainbranch=. > EOF - $ HGMERGE=true; export HGMERGE - init $ hg init repo @@ -157,8 +157,34 @@ created new head $ hg merge merging b - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat b + a + a + a + <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 + b4 + c + b5 + ||||||| base + ======= + b4 + b5 + b6 + >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 + $ cat <<EOF > b + > a + > a + > a + > b4 + > c + > b5 + > EOF + $ hg resolve --mark -q + $ rm b.orig $ hg ci -mmergeb -d '3 0' annotate after merge @@ -247,15 +273,37 @@ > EOF $ hg ci -mc -d '3 0' created new head +BROKEN: 'a' was copied to 'b' on both sides. We should not get a merge conflict here $ hg merge merging b - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ cat <<EOF >> b + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat b + <<<<<<< working copy: b80e3e32f75a - test: c + a + z + a + ||||||| base + ======= + a + a + a + b4 + c + b5 + >>>>>>> merge rev: 64afcdf8e29e - test: mergeb + $ cat <<EOF > b + > a + > z + > a > b4 > c > b5 > EOF + $ hg resolve --mark -q + $ rm b.orig $ echo d >> b $ hg ci -mmerge2 -d '4 0' @@ -745,6 +793,19 @@ $ echo 3 >> a $ hg commit -m 3 -q $ hg merge 2 -q + warning: conflicts while merging a! (edit, then use 'hg resolve --mark') + [1] + $ cat a + <<<<<<< working copy: 0a068f0261cf - test: 3 + 1 + 2 + 3 + ||||||| base + 1 + 2 + ======= + a + >>>>>>> merge rev: 9409851bc20a - test: a $ cat > a << EOF > b > 1 @@ -753,6 +814,7 @@ > a > EOF $ hg resolve --mark -q + $ rm a.orig $ hg commit -m m $ hg annotate a 4: b
--- a/tests/test-fastannotate-perfhack.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-fastannotate-perfhack.t Tue Apr 23 15:49:17 2019 -0400 @@ -5,8 +5,6 @@ > perfhack=1 > EOF - $ HGMERGE=true; export HGMERGE - $ hg init repo $ cd repo
--- a/tests/test-fastannotate-protocol.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-fastannotate-protocol.t Tue Apr 23 15:49:17 2019 -0400 @@ -7,8 +7,6 @@ > mainbranch=@ > EOF - $ HGMERGE=true; export HGMERGE - setup the server repo $ hg init repo-server
--- a/tests/test-fastannotate.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-fastannotate.t Tue Apr 23 15:49:17 2019 -0400 @@ -3,8 +3,6 @@ > fastannotate= > EOF - $ HGMERGE=true; export HGMERGE - $ hg init repo $ cd repo
--- a/tests/test-graft.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-graft.t Tue Apr 23 15:49:17 2019 -0400 @@ -199,7 +199,6 @@ scanning for duplicate grafts skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) grafting 1:5d205f8b35b6 "1" - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -221,9 +220,6 @@ committing changelog updating the branch cache grafting 5:97f8bfe72746 "5" - searching for copies back to rev 1 - unmatched files in other (from topological common ancestor): - c resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 @@ -237,9 +233,6 @@ $ HGEDITOR=cat hg graft 4 3 --log --debug scanning for duplicate grafts grafting 4:9c233e8e184d "4" - searching for copies back to rev 1 - unmatched files in other (from topological common ancestor): - c resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d @@ -744,11 +737,9 @@ $ hg graft -q 13 --debug scanning for duplicate grafts grafting 13:7a4785234d87 "2" - searching for copies back to rev 12 - unmatched files in other (from topological common ancestor): - g - unmatched files new in both: - b + all copies found (* = to merge, ! = divergent, % = renamed and deleted): + src: 'a' -> dst: 'b' * + checking for directory renames resolving manifests branchmerge: True, force: True, partial: False ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 @@ -969,7 +960,6 @@ A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all. A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge. A.5 has issue5343 as a special case. -TODO: add test coverage for A.5 A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious incomplete divergence, which is in fact complete. This is handled later in mergecopies. @@ -1072,13 +1062,32 @@ $ hg mv f4a f4e $ hg mv f5a f5b $ hg ci -qAm "E0" + $ hg up -q "min(desc("A0"))" + $ hg cp f1a f1f + $ hg ci -qAm "F0" + $ hg up -q "min(desc("A0"))" + $ hg cp f1a f1g + $ echo c1g > f1g + $ hg ci -qAm "G0" $ hg log -G - @ changeset: 6:6bd1736cab86 + @ changeset: 8:ba67f08fb15a | tag: tip | parent: 0:11f7a1b56675 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: E0 + | summary: G0 + | + | o changeset: 7:d376ab0d7fda + |/ parent: 0:11f7a1b56675 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: F0 + | + | o changeset: 6:6bd1736cab86 + |/ parent: 0:11f7a1b56675 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: E0 | | o changeset: 5:560daee679da | | user: test @@ -1115,6 +1124,7 @@ Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x), and A.3 with a local content change to be preserved (f2x). + $ hg up -q "desc("E0")" $ HGEDITOR="echo C2 >" hg graft -r 'desc("C0")' --edit grafting 2:f58c7e2b28fa "C0" merging f1e and f1b to f1e @@ -1131,93 +1141,129 @@ merging f4e and f4a to f4e warning: can't find ancestor for 'f3d' copied from 'f3b'! + $ hg cat f2c + c2e + +Test the case A.5 (move case, f1x). + + $ hg up -q "desc("C0")" +BROKEN: Shouldn't get the warning about missing ancestor + $ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit + grafting 6:6bd1736cab86 "E0" + note: possible conflict - f1a was renamed multiple times to: + f1b + f1e + note: possible conflict - f3a was renamed multiple times to: + f3b + f3e + merging f2c and f2a to f2c + merging f5a and f5b to f5b + warning: can't find ancestor for 'f1e' copied from 'f1a'! + warning: can't find ancestor for 'f3e' copied from 'f3a'! + $ cat f1e + c1a + +Test the case A.5 (copy case, f1x). + + $ hg up -q "desc("C0")" +BROKEN: Shouldn't get the warning about missing ancestor + $ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit + grafting 7:d376ab0d7fda "F0" + warning: can't find ancestor for 'f1f' copied from 'f1a'! +BROKEN: f1f should be marked a copy from f1b + $ hg st --copies --change . + A f1f +BROKEN: f1f should have the new content from f1b (i.e. "c1c") + $ cat f1f + c1a + +Test the case A.5 (copy+modify case, f1x). + + $ hg up -q "desc("C0")" +BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0 +(content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content +"c1a") + $ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit + grafting 8:ba67f08fb15a "G0" + warning: can't find ancestor for 'f1g' copied from 'f1a'! + Check the results of the grafts tested $ hg log -CGv --patch --git - @ changeset: 8:93ee502e8b0a + @ changeset: 13:ef3adf6c20a4 | tag: tip + | parent: 2:f58c7e2b28fa | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | files: f3d f4e + | files: f1g | description: - | D2 + | G1 | | - | diff --git a/f3d b/f3d + | diff --git a/f1g b/f1g | new file mode 100644 | --- /dev/null - | +++ b/f3d + | +++ b/f1g | @@ -0,0 +1,1 @@ - | +c3a - | diff --git a/f4e b/f4e - | --- a/f4e - | +++ b/f4e - | @@ -1,1 +1,1 @@ - | -c4a - | +c4d + | +c1g | - o changeset: 7:539cf145f496 - | user: test - | date: Thu Jan 01 00:00:00 1970 +0000 - | files: f1e f2a f2c f5a f5b - | copies: f2c (f2a) f5a (f5b) - | description: - | C2 + | o changeset: 12:b5542d755b54 + |/ parent: 2:f58c7e2b28fa + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | files: f1f + | description: + | F1 | | - | diff --git a/f1e b/f1e - | --- a/f1e - | +++ b/f1e - | @@ -1,1 +1,1 @@ - | -c1a - | +c1c - | diff --git a/f2a b/f2c - | rename from f2a - | rename to f2c - | diff --git a/f5b b/f5a - | rename from f5b - | rename to f5a - | --- a/f5b - | +++ b/f5a - | @@ -1,1 +1,1 @@ - | -c5a - | +c5c + | diff --git a/f1f b/f1f + | new file mode 100644 + | --- /dev/null + | +++ b/f1f + | @@ -0,0 +1,1 @@ + | +c1a | - o changeset: 6:6bd1736cab86 - | parent: 0:11f7a1b56675 - | user: test - | date: Thu Jan 01 00:00:00 1970 +0000 - | files: f1a f1e f2a f3a f3e f4a f4e f5a f5b - | copies: f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a) - | description: - | E0 + | o changeset: 11:f8a162271246 + |/ parent: 2:f58c7e2b28fa + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | files: f1e f2c f3e f4a f4e f5a f5b + | copies: f4e (f4a) f5b (f5a) + | description: + | E1 | | - | diff --git a/f1a b/f1e - | rename from f1a - | rename to f1e - | diff --git a/f2a b/f2a - | --- a/f2a - | +++ b/f2a - | @@ -1,1 +1,1 @@ - | -c2a - | +c2e - | diff --git a/f3a b/f3e - | rename from f3a - | rename to f3e - | diff --git a/f4a b/f4e - | rename from f4a - | rename to f4e - | diff --git a/f5a b/f5b - | rename from f5a - | rename to f5b + | diff --git a/f1e b/f1e + | new file mode 100644 + | --- /dev/null + | +++ b/f1e + | @@ -0,0 +1,1 @@ + | +c1a + | diff --git a/f2c b/f2c + | --- a/f2c + | +++ b/f2c + | @@ -1,1 +1,1 @@ + | -c2a + | +c2e + | diff --git a/f3e b/f3e + | new file mode 100644 + | --- /dev/null + | +++ b/f3e + | @@ -0,0 +1,1 @@ + | +c3a + | diff --git a/f4a b/f4e + | rename from f4a + | rename to f4e + | diff --git a/f5a b/f5b + | rename from f5a + | rename to f5b | - | o changeset: 5:560daee679da + | o changeset: 10:93ee502e8b0a | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | files: f3d f4a + | | files: f3d f4e | | description: - | | D1 + | | D2 | | | | | | diff --git a/f3d b/f3d @@ -1226,59 +1272,170 @@ | | +++ b/f3d | | @@ -0,0 +1,1 @@ | | +c3a - | | diff --git a/f4a b/f4a - | | --- a/f4a - | | +++ b/f4a + | | diff --git a/f4e b/f4e + | | --- a/f4e + | | +++ b/f4e | | @@ -1,1 +1,1 @@ | | -c4a | | +c4d | | - | o changeset: 4:c9763722f9bd - |/ parent: 0:11f7a1b56675 - | user: test - | date: Thu Jan 01 00:00:00 1970 +0000 - | files: f1a f2a f2c f5a - | copies: f2c (f2a) - | description: - | C1 - | - | - | diff --git a/f1a b/f1a - | --- a/f1a - | +++ b/f1a - | @@ -1,1 +1,1 @@ - | -c1a - | +c1c - | diff --git a/f2a b/f2c - | rename from f2a - | rename to f2c - | diff --git a/f5a b/f5a - | --- a/f5a - | +++ b/f5a - | @@ -1,1 +1,1 @@ - | -c5a - | +c5c - | - | o changeset: 3:b69f5839d2d9 + | o changeset: 9:539cf145f496 + | | parent: 6:6bd1736cab86 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | files: f3b f3d f4a - | | copies: f3d (f3b) + | | files: f1e f2a f2c f5a f5b + | | copies: f2c (f2a) f5a (f5b) | | description: - | | D0 + | | C2 + | | + | | + | | diff --git a/f1e b/f1e + | | --- a/f1e + | | +++ b/f1e + | | @@ -1,1 +1,1 @@ + | | -c1a + | | +c1c + | | diff --git a/f2a b/f2c + | | rename from f2a + | | rename to f2c + | | diff --git a/f5b b/f5a + | | rename from f5b + | | rename to f5a + | | --- a/f5b + | | +++ b/f5a + | | @@ -1,1 +1,1 @@ + | | -c5a + | | +c5c + | | + | | o changeset: 8:ba67f08fb15a + | | | parent: 0:11f7a1b56675 + | | | user: test + | | | date: Thu Jan 01 00:00:00 1970 +0000 + | | | files: f1g + | | | copies: f1g (f1a) + | | | description: + | | | G0 + | | | + | | | + | | | diff --git a/f1a b/f1g + | | | copy from f1a + | | | copy to f1g + | | | --- a/f1a + | | | +++ b/f1g + | | | @@ -1,1 +1,1 @@ + | | | -c1a + | | | +c1g + | | | + | | | o changeset: 7:d376ab0d7fda + | | |/ parent: 0:11f7a1b56675 + | | | user: test + | | | date: Thu Jan 01 00:00:00 1970 +0000 + | | | files: f1f + | | | copies: f1f (f1a) + | | | description: + | | | F0 + | | | + | | | + | | | diff --git a/f1a b/f1f + | | | copy from f1a + | | | copy to f1f + | | | + | o | changeset: 6:6bd1736cab86 + | |/ parent: 0:11f7a1b56675 + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | files: f1a f1e f2a f3a f3e f4a f4e f5a f5b + | | copies: f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a) + | | description: + | | E0 | | | | - | | diff --git a/f3b b/f3d - | | rename from f3b - | | rename to f3d - | | diff --git a/f4a b/f4a - | | --- a/f4a - | | +++ b/f4a - | | @@ -1,1 +1,1 @@ - | | -c4a - | | +c4d + | | diff --git a/f1a b/f1e + | | rename from f1a + | | rename to f1e + | | diff --git a/f2a b/f2a + | | --- a/f2a + | | +++ b/f2a + | | @@ -1,1 +1,1 @@ + | | -c2a + | | +c2e + | | diff --git a/f3a b/f3e + | | rename from f3a + | | rename to f3e + | | diff --git a/f4a b/f4e + | | rename from f4a + | | rename to f4e + | | diff --git a/f5a b/f5b + | | rename from f5a + | | rename to f5b | | - | o changeset: 2:f58c7e2b28fa + | | o changeset: 5:560daee679da + | | | user: test + | | | date: Thu Jan 01 00:00:00 1970 +0000 + | | | files: f3d f4a + | | | description: + | | | D1 + | | | + | | | + | | | diff --git a/f3d b/f3d + | | | new file mode 100644 + | | | --- /dev/null + | | | +++ b/f3d + | | | @@ -0,0 +1,1 @@ + | | | +c3a + | | | diff --git a/f4a b/f4a + | | | --- a/f4a + | | | +++ b/f4a + | | | @@ -1,1 +1,1 @@ + | | | -c4a + | | | +c4d + | | | + | | o changeset: 4:c9763722f9bd + | |/ parent: 0:11f7a1b56675 + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | files: f1a f2a f2c f5a + | | copies: f2c (f2a) + | | description: + | | C1 + | | + | | + | | diff --git a/f1a b/f1a + | | --- a/f1a + | | +++ b/f1a + | | @@ -1,1 +1,1 @@ + | | -c1a + | | +c1c + | | diff --git a/f2a b/f2c + | | rename from f2a + | | rename to f2c + | | diff --git a/f5a b/f5a + | | --- a/f5a + | | +++ b/f5a + | | @@ -1,1 +1,1 @@ + | | -c5a + | | +c5c + | | + +---o changeset: 3:b69f5839d2d9 + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | files: f3b f3d f4a + | | copies: f3d (f3b) + | | description: + | | D0 + | | + | | + | | diff --git a/f3b b/f3d + | | rename from f3b + | | rename to f3d + | | diff --git a/f4a b/f4a + | | --- a/f4a + | | +++ b/f4a + | | @@ -1,1 +1,1 @@ + | | -c4a + | | +c4d + | | + o | changeset: 2:f58c7e2b28fa | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | files: f1b f2a f2c f5a f5b @@ -1305,7 +1462,7 @@ | | -c5a | | +c5c | | - | o changeset: 1:3d7bba921b5d + o | changeset: 1:3d7bba921b5d |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | files: f1a f1b f3a f3b f5a f5b @@ -1363,9 +1520,6 @@ @@ -0,0 +1,1 @@ +c5a - $ hg cat f2c - c2e - Check superfluous filemerge of files renamed in the past but untouched by graft $ echo a > a
--- a/tests/test-help.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-help.t Tue Apr 23 15:49:17 2019 -0400 @@ -615,6 +615,8 @@ Returns 0 on success, 1 if errors are encountered. + options: + (some details hidden, use --verbose to show complete help) $ hg help diff
--- a/tests/test-issue1802.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-issue1802.t Tue Apr 23 15:49:17 2019 -0400 @@ -52,7 +52,6 @@ Simulate a Windows merge: $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug - searching for copies back to rev 1 unmatched files in local: b resolving manifests
--- a/tests/test-issue522.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-issue522.t Tue Apr 23 15:49:17 2019 -0400 @@ -25,7 +25,6 @@ $ hg ci -qAm 'add bar' $ hg merge --debug - searching for copies back to rev 1 unmatched files in local: bar resolving manifests
--- a/tests/test-issue672.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-issue672.t Tue Apr 23 15:49:17 2019 -0400 @@ -25,7 +25,6 @@ created new head $ hg merge --debug 1 - searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -54,7 +53,6 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge -y --debug 4 - searching for copies back to rev 1 unmatched files in local: 1a all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -77,7 +75,6 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge -y --debug 3 - searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent, % = renamed and deleted):
--- a/tests/test-merge-commit.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-merge-commit.t Tue Apr 23 15:49:17 2019 -0400 @@ -67,7 +67,6 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 @@ -155,7 +154,6 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
--- a/tests/test-merge-criss-cross.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-merge-criss-cross.t Tue Apr 23 15:49:17 2019 -0400 @@ -11,15 +11,9 @@ $ hg up -qr0 $ echo '2 first change' > f2 - $ mkdir d1 - $ echo '0 base' > d1/f3 - $ echo '0 base' > d1/f4 - $ hg add -q d1 $ hg ci -qm '2 first change f2' $ hg merge -qr 1 - $ hg rm d1/f3 - $ hg mv -q d1 d2 $ hg ci -m '3 merge' $ hg up -qr2 @@ -30,38 +24,38 @@ $ hg ci -m '5 second change f1' $ hg up -r3 - 2 files updated, 0 files merged, 2 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo '6 second change' > f2 $ hg ci -m '6 second change f2' $ hg log -G - @ changeset: 6:6373bbfdae1d + @ changeset: 6:3b08d01b0ab5 | tag: tip - | parent: 3:c202c8af058d + | parent: 3:cf89f02107e5 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: 6 second change f2 | - | o changeset: 5:e673248094b1 + | o changeset: 5:adfe50279922 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: 5 second change f1 | | - | o changeset: 4:177f58377c06 - | |\ parent: 2:d1d156401c1b + | o changeset: 4:7d3e55501ae6 + | |\ parent: 2:40663881a6dd | | | parent: 1:0f6b37dbe527 | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | summary: 4 merge | | | - o---+ changeset: 3:c202c8af058d - | | | parent: 2:d1d156401c1b + o---+ changeset: 3:cf89f02107e5 + | | | parent: 2:40663881a6dd |/ / parent: 1:0f6b37dbe527 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: 3 merge | | - | o changeset: 2:d1d156401c1b + | o changeset: 2:40663881a6dd | | parent: 0:40494bf2444c | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -79,51 +73,26 @@ $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!' - note: using 0f6b37dbe527 as ancestor of 6373bbfdae1d and e673248094b1 - alternatively, use --config merge.preferancestor=d1d156401c1b - searching for copies back to rev 3 - unmatched files in local: - d2/f4 - unmatched files in other: - d1/f3 - d1/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' - pending file src: 'd1/f3' -> dst: 'd2/f3' - pending file src: 'd1/f4' -> dst: 'd2/f4' + note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 + alternatively, use --config merge.preferancestor=40663881a6dd resolving manifests branchmerge: True, force: False, partial: False - ancestor: 0f6b37dbe527, local: 6373bbfdae1d+, remote: e673248094b1 - preserving d2/f4 for resolve of d2/f4 + ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 preserving f2 for resolve of f2 f1: remote is newer -> g getting f1 - d2/f3: local directory rename - get from d1/f3 -> dg - getting d1/f3 to d2/f3 - d2/f4: local directory rename, both created -> m (premerge) f2: versions differ -> m (premerge) picked tool ':dump' for f2 (binary False symlink False changedelete False) merging f2 - my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527 + my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 f2: versions differ -> m (merge) picked tool ':dump' for f2 (binary False symlink False changedelete False) - my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527 - 3 files updated, 0 files merged, 0 files removed, 1 files unresolved + my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 + 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] - $ f --dump --recurse * - d2: directory with 2 files - d2/f3: - >>> - 0 base - <<< - d2/f4: - >>> - 0 base - <<< + $ f --dump * f1: >>> 5 second change @@ -151,13 +120,11 @@ $ hg up -qC . $ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d" - note: using 0f6b37dbe527 as ancestor of 6373bbfdae1d and e673248094b1 - alternatively, use --config merge.preferancestor=d1d156401c1b + note: using 40663881a6dd as ancestor of 3b08d01b0ab5 and adfe50279922 + alternatively, use --config merge.preferancestor=0f6b37dbe527 resolving manifests - getting f1 - getting d1/f3 to d2/f3 - merging f2 - 3 files updated, 0 files merged, 0 files removed, 1 files unresolved + merging f1 + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] @@ -166,70 +133,34 @@ $ rm f* $ hg up -qC . $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" - note: merging 6373bbfdae1d+ and e673248094b1 using bids from ancestors 0f6b37dbe527 and d1d156401c1b + note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 - searching for copies back to rev 3 - unmatched files in local: - d2/f4 - unmatched files in other: - d1/f3 - d1/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' - pending file src: 'd1/f3' -> dst: 'd2/f3' - pending file src: 'd1/f4' -> dst: 'd2/f4' resolving manifests branchmerge: True, force: False, partial: False - ancestor: 0f6b37dbe527, local: 6373bbfdae1d+, remote: e673248094b1 - d2/f3: local directory rename - get from d1/f3 -> dg - d2/f4: local directory rename, both created -> m + ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 f1: remote is newer -> g f2: versions differ -> m - calculating bids for ancestor d1d156401c1b - searching for copies back to rev 3 - unmatched files in local: - d2/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' + calculating bids for ancestor 40663881a6dd resolving manifests branchmerge: True, force: False, partial: False - ancestor: d1d156401c1b, local: 6373bbfdae1d+, remote: e673248094b1 + ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 f1: versions differ -> m f2: remote unchanged -> k auction for merging merge bids - d2/f3: consensus for dg - d2/f4: consensus for m f1: picking 'get' action f2: picking 'keep' action end of auction - preserving d2/f4 for resolve of d2/f4 f1: remote is newer -> g getting f1 f2: remote unchanged -> k - d2/f3: local directory rename - get from d1/f3 -> dg - getting d1/f3 to d2/f3 - d2/f4: local directory rename, both created -> m (premerge) - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) - $ f --dump --recurse * - d2: directory with 2 files - d2/f3: - >>> - 0 base - <<< - d2/f4: - >>> - 0 base - <<< + $ f --dump * f1: >>> 5 second change @@ -243,79 +174,36 @@ The other way around: $ hg up -C -r5 - 4 files updated, 0 files merged, 1 files removed, 0 files unresolved + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge -v --debug --config merge.preferancestor="*" - note: merging e673248094b1+ and 6373bbfdae1d using bids from ancestors 0f6b37dbe527 and d1d156401c1b + note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 - searching for copies back to rev 3 - unmatched files in local: - d1/f3 - d1/f4 - unmatched files in other: - d2/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' - pending file src: 'd1/f3' -> dst: 'd2/f3' - pending file src: 'd1/f4' -> dst: 'd2/f4' resolving manifests branchmerge: True, force: False, partial: False - ancestor: 0f6b37dbe527, local: e673248094b1+, remote: 6373bbfdae1d - d2/f3: remote directory rename - move from d1/f3 -> dm - d2/f4: remote directory rename, both created -> m + ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 f1: remote unchanged -> k f2: versions differ -> m - calculating bids for ancestor d1d156401c1b - searching for copies back to rev 3 - unmatched files in other: - d2/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' + calculating bids for ancestor 40663881a6dd resolving manifests branchmerge: True, force: False, partial: False - ancestor: d1d156401c1b, local: e673248094b1+, remote: 6373bbfdae1d - d1/f3: other deleted -> r - d1/f4: other deleted -> r - d2/f4: remote created -> g + ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 f1: versions differ -> m f2: remote is newer -> g auction for merging merge bids - d1/f3: consensus for r - d1/f4: consensus for r - d2/f3: consensus for dm - d2/f4: picking 'get' action f1: picking 'keep' action f2: picking 'get' action end of auction - d1/f3: other deleted -> r - removing d1/f3 - d1/f4: other deleted -> r - removing d1/f4 - d2/f4: remote created -> g - getting d2/f4 f2: remote is newer -> g getting f2 f1: remote unchanged -> k - 2 files updated, 0 files merged, 2 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) - $ f --dump --recurse * - d2: directory with 2 files - d2/f3: - >>> - 0 base - <<< - d2/f4: - >>> - 0 base - <<< + $ f --dump * f1: >>> 5 second change @@ -329,85 +217,55 @@ $ hg up -qC $ hg merge - 2 files updated, 0 files merged, 2 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg up -qC tip $ hg merge -v - note: merging 6373bbfdae1d+ and e673248094b1 using bids from ancestors 0f6b37dbe527 and d1d156401c1b + note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 resolving manifests - calculating bids for ancestor d1d156401c1b + calculating bids for ancestor 40663881a6dd resolving manifests auction for merging merge bids - d2/f3: consensus for dg - d2/f4: consensus for m f1: picking 'get' action f2: picking 'keep' action end of auction getting f1 - getting d1/f3 to d2/f3 - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg up -qC $ hg merge -v --debug --config merge.preferancestor="*" - note: merging 6373bbfdae1d+ and e673248094b1 using bids from ancestors 0f6b37dbe527 and d1d156401c1b + note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd calculating bids for ancestor 0f6b37dbe527 - searching for copies back to rev 3 - unmatched files in local: - d2/f4 - unmatched files in other: - d1/f3 - d1/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' - pending file src: 'd1/f3' -> dst: 'd2/f3' - pending file src: 'd1/f4' -> dst: 'd2/f4' resolving manifests branchmerge: True, force: False, partial: False - ancestor: 0f6b37dbe527, local: 6373bbfdae1d+, remote: e673248094b1 - d2/f3: local directory rename - get from d1/f3 -> dg - d2/f4: local directory rename, both created -> m + ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 f1: remote is newer -> g f2: versions differ -> m - calculating bids for ancestor d1d156401c1b - searching for copies back to rev 3 - unmatched files in local: - d2/f4 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/f4' -> dst: 'd2/f4' - checking for directory renames - discovered dir src: 'd1/' -> dst: 'd2/' + calculating bids for ancestor 40663881a6dd resolving manifests branchmerge: True, force: False, partial: False - ancestor: d1d156401c1b, local: 6373bbfdae1d+, remote: e673248094b1 + ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 f1: versions differ -> m f2: remote unchanged -> k auction for merging merge bids - d2/f3: consensus for dg - d2/f4: consensus for m f1: picking 'get' action f2: picking 'keep' action end of auction - preserving d2/f4 for resolve of d2/f4 f1: remote is newer -> g getting f1 f2: remote unchanged -> k - d2/f3: local directory rename - get from d1/f3 -> dg - getting d1/f3 to d2/f3 - d2/f4: local directory rename, both created -> m (premerge) - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Test the greatest common ancestor returning multiple changesets @@ -418,7 +276,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: 1 first change f1 - changeset: 2:d1d156401c1b + changeset: 2:40663881a6dd parent: 0:40494bf2444c user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -513,3 +371,80 @@ 2 $ cd .. + + $ hg init issue5020 + $ cd issue5020 + + $ echo a > noop + $ hg ci -qAm initial + + $ echo b > noop + $ hg ci -qAm 'uninteresting change' + + $ hg up -q 0 + $ mkdir d1 + $ echo a > d1/a + $ echo b > d1/b + $ hg ci -qAm 'add d1/a and d1/b' + + $ hg merge -q 1 + $ hg rm d1/a + $ hg mv -q d1 d2 + $ hg ci -qm 'merge while removing d1/a and moving d1/b to d2/b' + + $ hg up -q 1 + $ hg merge -q 2 + $ hg ci -qm 'merge (no changes while merging)' + $ hg log -G -T '{rev}:{node|short} {desc}' + @ 4:c0ef19750a22 merge (no changes while merging) + |\ + +---o 3:6ca01f7342b9 merge while removing d1/a and moving d1/b to d2/b + | |/ + | o 2:154e6000f54e add d1/a and d1/b + | | + o | 1:11b5b303e36c uninteresting change + |/ + o 0:7b54db1ebf33 initial + + $ hg merge 3 --debug + note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e + + calculating bids for ancestor 11b5b303e36c + unmatched files in local: + d1/a + d1/b + unmatched files in other: + d2/b + resolving manifests + branchmerge: True, force: False, partial: False + ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 + d2/b: remote created -> g + + calculating bids for ancestor 154e6000f54e + unmatched files in other: + d2/b + all copies found (* = to merge, ! = divergent, % = renamed and deleted): + src: 'd1/b' -> dst: 'd2/b' + checking for directory renames + discovered dir src: 'd1/' -> dst: 'd2/' + resolving manifests + branchmerge: True, force: False, partial: False + ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 + d1/a: other deleted -> r + d1/b: other deleted -> r + d2/b: remote created -> g + + auction for merging merge bids + d1/a: consensus for r + d1/b: consensus for r + d2/b: consensus for g + end of auction + + d1/a: other deleted -> r + removing d1/a + d1/b: other deleted -> r + removing d1/b + d2/b: remote created -> g + getting d2/b + 1 files updated, 0 files merged, 2 files removed, 0 files unresolved + (branch merge, don't forget to commit)
--- a/tests/test-merge-types.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-merge-types.t Tue Apr 23 15:49:17 2019 -0400 @@ -30,7 +30,6 @@ Symlink is local parent, executable is other: $ hg merge --debug - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c @@ -63,7 +62,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :union - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -86,7 +84,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :merge3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -109,7 +106,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :merge-local - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -131,7 +127,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug --tool :merge-other - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f @@ -165,7 +160,6 @@ $ hg up -Cq 0 $ echo data > a $ HGMERGE= hg up -y --debug --config ui.merge= - searching for copies back to rev 2 resolving manifests branchmerge: False, force: False, partial: False ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
--- a/tests/test-merge7.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-merge7.t Tue Apr 23 15:49:17 2019 -0400 @@ -81,7 +81,6 @@ new changesets 40d11a4173a8 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge --debug - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
--- a/tests/test-narrow-share.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-narrow-share.t Tue Apr 23 15:49:17 2019 -0400 @@ -28,6 +28,9 @@ $ hg clone --narrow ssh://user@dummy/remote main -q \ > --include d1 --include d3 --include d5 --include d7 +Ignore file called "ignored" + $ echo ignored > main/.hgignore + $ hg share main share updating working directory 4 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -55,15 +58,19 @@ # Make d3/f dirty $ echo x >> main/d3/f $ echo y >> main/d3/g + $ touch main/d3/ignored + $ touch main/d3/untracked $ hg add main/d3/g $ hg -R main st M d3/f A d3/g + ? d3/untracked # Make d5/f not match the dirstate timestamp even though it's clean $ sleep 2 $ hg -R main st M d3/f A d3/g + ? d3/untracked $ hg -R main debugdirstate --no-dates n 644 2 set d1/f n 644 2 set d3/f @@ -91,6 +98,8 @@ not deleting possibly dirty file d3/f not deleting possibly dirty file d3/g not deleting possibly dirty file d5/f + not deleting unknown file d3/untracked + not deleting ignored file d3/ignored # d1/f, d3/f, d3/g and d5/f should no longer be reported $ hg -R main files main/d7/f @@ -99,6 +108,8 @@ $ find main/d* -type f | sort main/d3/f main/d3/g + main/d3/ignored + main/d3/untracked main/d5/f main/d7/f @@ -131,6 +142,8 @@ $ hg -R main st --all M d3/f ? d3/g + ? d3/untracked + I d3/ignored C d1/f C d7/f
--- a/tests/test-narrow-update.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-narrow-update.t Tue Apr 23 15:49:17 2019 -0400 @@ -72,5 +72,5 @@ $ hg mv inside/f1 inside/f2 $ hg update -q 'desc("modify outside")' - $ hg update -q 'desc("initial")' + $ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("modify inside")'
--- a/tests/test-rebase-conflicts.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-rebase-conflicts.t Tue Apr 23 15:49:17 2019 -0400 @@ -248,9 +248,6 @@ getting f1.txt merge against 9:e31216eec445 detach base 8:8e4e2c1a07ae - searching for copies back to rev 3 - unmatched files in other (from topological common ancestor): - f2.txt resolving manifests branchmerge: True, force: True, partial: False ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 @@ -268,9 +265,6 @@ already in destination merge against 10:2f2496ddf49d detach base 9:e31216eec445 - searching for copies back to rev 3 - unmatched files in other (from topological common ancestor): - f2.txt resolving manifests branchmerge: True, force: True, partial: False ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
--- a/tests/test-rename-dir-merge.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-rename-dir-merge.t Tue Apr 23 15:49:17 2019 -0400 @@ -24,7 +24,6 @@ created new head $ hg merge --debug 1 - searching for copies back to rev 1 unmatched files in local: a/c unmatched files in other: @@ -70,7 +69,6 @@ $ hg co -C 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge --debug 2 - searching for copies back to rev 1 unmatched files in local: b/a b/b
--- a/tests/test-rename-merge1.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-rename-merge1.t Tue Apr 23 15:49:17 2019 -0400 @@ -22,7 +22,6 @@ created new head $ hg merge -y --debug - searching for copies back to rev 1 unmatched files in local: c2 unmatched files in other: @@ -76,7 +75,7 @@ $ hg cp b b3 $ hg cp b b4 $ hg ci -A -m 'copy b twice' - $ hg up eb92d88a9712 + $ hg up '.^' 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg up 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -88,7 +87,7 @@ $ hg cp b b3 $ hg mv b b4 $ hg ci -A -m 'divergent renames in same changeset' - $ hg up c761c6948de0 + $ hg up '.^' 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg up 2 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -168,7 +167,6 @@ $ hg commit -m "deleted file" created new head $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: newfile all copies found (* = to merge, ! = divergent, % = renamed and deleted):
--- a/tests/test-rename-merge2.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-rename-merge2.t Tue Apr 23 15:49:17 2019 -0400 @@ -68,7 +68,6 @@ > hg add $2 2> /dev/null > fi > } - $ uc() { up $1; hg cp $1 $2; } # update + copy $ um() { up $1; hg mv $1 $2; } $ nc() { hg cp $1 $2; } # just copy $ nm() { hg mv $1 $2; } # just move @@ -77,7 +76,6 @@ -------------- test L:up a R:nc a b W: - 1 get local a to b -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -116,7 +114,6 @@ -------------- test L:nc a b R:up a W: - 2 get rem change to a and b -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -156,7 +153,6 @@ -------------- test L:up a R:nm a b W: - 3 get local a change to b, remove a -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -195,7 +191,6 @@ -------------- test L:nm a b R:up a W: - 4 get remote change to b -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -233,7 +228,6 @@ -------------- test L: R:nc a b W: - 5 get b -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -266,7 +260,6 @@ -------------- test L:nc a b R: W: - 6 nothing -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -298,7 +291,6 @@ -------------- test L: R:nm a b W: - 7 get b -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -332,7 +324,6 @@ -------------- test L:nm a b R: W: - 8 nothing -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -363,9 +354,9 @@ -------------- test L:um a b R:um a b W: - 9 do merge with ancestor in a -------------- - searching for copies back to rev 1 - unmatched files new in both: - b + all copies found (* = to merge, ! = divergent, % = renamed and deleted): + src: 'a' -> dst: 'b' * + checking for directory renames resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 @@ -404,7 +395,6 @@ -------------- test L:nm a b R:nm a c W: - 11 get c, keep b -------------- - searching for copies back to rev 1 unmatched files in local: b unmatched files in other: @@ -443,9 +433,6 @@ -------------- test L:nc a b R:up b W: - 12 merge b no ancestor -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 @@ -482,9 +469,6 @@ -------------- test L:up b R:nm a b W: - 13 merge b no ancestor -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a @@ -522,9 +506,6 @@ -------------- test L:nc a b R:up a b W: - 14 merge b no ancestor -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a @@ -562,9 +543,6 @@ -------------- test L:up b R:nm a b W: - 15 merge b no ancestor, remove a -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a @@ -602,9 +580,6 @@ -------------- test L:nc a b R:up a b W: - 16 get a, merge b no ancestor -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a @@ -642,9 +617,6 @@ -------------- test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 @@ -681,9 +653,6 @@ -------------- test L:nm a b R:up a b W: - 18 merge b no ancestor -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a @@ -726,9 +695,6 @@ -------------- test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a -------------- - searching for copies back to rev 1 - unmatched files new in both: - b resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a @@ -772,7 +738,6 @@ -------------- test L:up a R:um a b W: - 20 merge a and b to b, remove a -------------- - searching for copies back to rev 1 unmatched files in other: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -815,7 +780,6 @@ -------------- test L:um a b R:up a W: - 21 merge a and b to b -------------- - searching for copies back to rev 1 unmatched files in local: b all copies found (* = to merge, ! = divergent, % = renamed and deleted): @@ -860,7 +824,6 @@ -------------- test L:nm a b R:up a c W: - 23 get c, keep b -------------- - searching for copies back to rev 1 unmatched files in local: b unmatched files in other: @@ -941,7 +904,6 @@ $ echo m > 7/f $ echo m > 8/f $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null - searching for copies back to rev 1 unmatched files in local: 5/g 6/g @@ -949,10 +911,8 @@ 3/g 4/g 7/f - unmatched files new in both: - 0/f - 1/g all copies found (* = to merge, ! = divergent, % = renamed and deleted): + src: '1/f' -> dst: '1/g' * src: '3/f' -> dst: '3/g' * src: '4/f' -> dst: '4/g' * src: '5/f' -> dst: '5/g' *
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-rust-discovery.py Tue Apr 23 15:49:17 2019 -0400 @@ -0,0 +1,111 @@ +from __future__ import absolute_import +import unittest + +try: + from mercurial import rustext + rustext.__name__ # trigger immediate actual import +except ImportError: + rustext = None +else: + # this would fail already without appropriate ancestor.__package__ + from mercurial.rustext.discovery import ( + PartialDiscovery, + ) + +try: + from mercurial.cext import parsers as cparsers +except ImportError: + cparsers = None + +# picked from test-parse-index2, copied rather than imported +# so that it stays stable even if test-parse-index2 changes or disappears. +data_non_inlined = ( + b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19' + b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff' + b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d' + b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00' + b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00' + b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff' + b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh' + b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' + b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00' + b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n' + b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00' + b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F' + b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01' + b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1' + b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00' + b'\x00\x00\x00\x00\x00\x00\x00\x00\x00' + ) + + +@unittest.skipIf(rustext is None or cparsers is None, + "rustext or the C Extension parsers module " + "discovery relies on is not available") +class rustdiscoverytest(unittest.TestCase): + """Test the correctness of binding to Rust code. + + This test is merely for the binding to Rust itself: extraction of + Python variable, giving back the results etc. + + It is not meant to test the algorithmic correctness of the provided + methods. Hence the very simple embedded index data is good enough. + + Algorithmic correctness is asserted by the Rust unit tests. + """ + + def parseindex(self): + return cparsers.parse_index2(data_non_inlined, False)[0] + + def testindex(self): + idx = self.parseindex() + # checking our assumptions about the index binary data: + self.assertEqual({i: (r[5], r[6]) for i, r in enumerate(idx)}, + {0: (-1, -1), + 1: (0, -1), + 2: (1, -1), + 3: (2, -1)}) + + def testaddcommonsmissings(self): + idx = self.parseindex() + disco = PartialDiscovery(idx, [3]) + self.assertFalse(disco.hasinfo()) + self.assertFalse(disco.iscomplete()) + + disco.addcommons([1]) + self.assertTrue(disco.hasinfo()) + self.assertFalse(disco.iscomplete()) + + disco.addmissings([2]) + self.assertTrue(disco.hasinfo()) + self.assertTrue(disco.iscomplete()) + + self.assertEqual(disco.commonheads(), {1}) + + def testaddmissingsstats(self): + idx = self.parseindex() + disco = PartialDiscovery(idx, [3]) + self.assertIsNone(disco.stats()['undecided'], None) + + disco.addmissings([2]) + self.assertEqual(disco.stats()['undecided'], 2) + + def testaddinfocommonfirst(self): + idx = self.parseindex() + disco = PartialDiscovery(idx, [3]) + disco.addinfo([(1, True), (2, False)]) + self.assertTrue(disco.hasinfo()) + self.assertTrue(disco.iscomplete()) + self.assertEqual(disco.commonheads(), {1}) + + def testaddinfomissingfirst(self): + idx = self.parseindex() + disco = PartialDiscovery(idx, [3]) + disco.addinfo([(2, False), (1, True)]) + self.assertTrue(disco.hasinfo()) + self.assertTrue(disco.iscomplete()) + self.assertEqual(disco.commonheads(), {1}) + +if __name__ == '__main__': + import silenttestrunner + silenttestrunner.main(__name__)
--- a/tests/test-setdiscovery.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-setdiscovery.t Tue Apr 23 15:49:17 2019 -0400 @@ -926,7 +926,7 @@ common heads: 7ead0cba2838 -One with >200 heads, which used to use up all of the sample: +One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. $ hg init manyheads $ cd manyheads @@ -974,20 +974,17 @@ searching for changes taking quick initial sample searching: 2 queries - query 2; still undecided: 1240, sample size is: 100 + query 2; still undecided: 1080, sample size is: 100 sampling from both directions searching: 3 queries - query 3; still undecided: 1140, sample size is: 200 + query 3; still undecided: 980, sample size is: 200 sampling from both directions searching: 4 queries query 4; still undecided: \d+, sample size is: 200 (re) sampling from both directions searching: 5 queries - query 5; still undecided: \d+, sample size is: 200 (re) - sampling from both directions - searching: 6 queries - query 6; still undecided: \d+, sample size is: \d+ (re) - 6 total queries in *.????s (glob) + query 5; still undecided: 195, sample size is: 195 + 5 total queries in *.????s (glob) elapsed time: * seconds (glob) heads summary: total common heads: 1 @@ -1116,6 +1113,6 @@ $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track= * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob) - * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob) + * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob) * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) $ cd ..
--- a/tests/test-subrepo.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-subrepo.t Tue Apr 23 15:49:17 2019 -0400 @@ -274,7 +274,6 @@ $ hg ci -m9 created new head $ hg merge 6 --debug # test change - searching for copies back to rev 2 resolving manifests branchmerge: True, force: False, partial: False ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 @@ -301,7 +300,6 @@ $ hg ci -m10 committing subrepository t $ HGMERGE=internal:merge hg merge --debug 7 # test conflict - searching for copies back to rev 2 resolving manifests branchmerge: True, force: False, partial: False ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf @@ -313,7 +311,6 @@ starting 4 threads for background file closing (?) (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m merging subrepository "t" - searching for copies back to rev 2 resolving manifests branchmerge: True, force: False, partial: False ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
--- a/tests/test-up-local-change.t Sun Apr 21 08:57:01 2019 -0700 +++ b/tests/test-up-local-change.t Tue Apr 23 15:49:17 2019 -0400 @@ -40,7 +40,6 @@ summary: 1 $ hg --debug up - searching for copies back to rev 1 unmatched files in other: b resolving manifests @@ -68,9 +67,6 @@ $ hg --debug up 0 starting 4 threads for background file closing (?) - searching for copies back to rev 0 - unmatched files in local (from topological common ancestor): - b resolving manifests branchmerge: False, force: False, partial: False ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a @@ -95,7 +91,6 @@ summary: 1 $ hg --debug up - searching for copies back to rev 1 unmatched files in other: b resolving manifests