# Portions Copyright (c) Facebook, Inc. and its affiliates. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2. # drawdag.py - convert ASCII revision DAG to actual changesets # # Copyright Matt Mackall and others # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """ create changesets from an ASCII graph for testing purpose. For example, given the following input:: c d |/ b | a 4 changesets and 4 local tags will be created. `hg log -G -T "{rev} {desc} (tag: {tags})"` will output:: o 3 d (tag: d tip) | | o 2 c (tag: c) |/ o 1 b (tag: b) | o 0 a (tag: a) For root nodes (nodes without parents) in the graph, they can be revsets pointing to existing nodes. The ASCII graph could also have disconnected components with same names referring to the same changeset. Therefore, given the repo having the 4 changesets (and tags) above, with the following ASCII graph as input:: foo bar bar foo | / | | ancestor(c,d) a baz The result (`hg log -G -T "{desc}"`) will look like:: o foo |\ +---o bar | | | | o | baz | / +---o d | | +---o c | | o | b |/ o a Note that if you take the above `hg log` output directly as input. It will work as expected - the result would be an isomorphic graph:: o foo |\ | | o d | |/ | | o c | |/ | | o bar | |/| | o | b | |/ o / baz / o a This is because 'o' is specially handled in the input: instead of using 'o' as the node name, the word to the right will be used. Some special comments could have side effects: - Create obsmarkers # replace: A -> B -> C -> D # chained 1 to 1 replacements # split: A -> B, C # 1 to many # prune: A, B, C # many to nothing """ from __future__ import absolute_import, print_function import collections import itertools import re from . import ( bookmarks, context, error, mutation, node, obsolete, pycompat, scmutil, visibility, ) from .i18n import _ from .node import hex _pipechars = "\\/+-|" _nonpipechars = "".join( chr(i) for i in range(33, 127) if pycompat.bytechr(i) not in _pipechars ) def _isname(ch): """char -> bool. return True if ch looks like part of a name, False otherwise""" return ch in _nonpipechars def _parseasciigraph(text): r"""str -> {str : [str]}. convert the ASCII graph to edges >>> import pprint >>> pprint.pprint({pycompat.sysstr(k): [pycompat.sysstr(vv) for vv in v] ... for k, v in _parseasciigraph(r''' ... G ... | ... I D C F # split: B -> E, F, G ... \ \| | # replace: C -> D -> H ... H B E # prune: F, I ... \|/ ... A ... ''').items()}) {'A': [], 'B': ['A'], 'C': ['B'], 'D': ['B'], 'E': ['A'], 'F': ['E'], 'G': ['F'], 'H': ['A'], 'I': ['H']} >>> pprint.pprint({pycompat.sysstr(k): [pycompat.sysstr(vv) for vv in v] ... for k, v in _parseasciigraph(r''' ... o foo ... |\ ... +---o bar ... | | | ... | o | baz ... | / ... +---o d ... | | ... +---o c ... | | ... o | b ... |/ ... o a ... ''').items()}) {'a': [], 'b': ['a'], 'bar': ['b', 'a'], 'baz': [], 'c': ['b'], 'd': ['b'], 'foo': ['baz', 'b']} """ lines = text.splitlines() edges = collections.defaultdict(list) # {node: []} def get(y, x): """(int, int) -> char. give a coordinate, return the char. return a space for anything out of range""" if x < 0 or y < 0: return " " try: return lines[y][x : x + 1] or " " except IndexError: return " " def getname(y, x): """(int, int) -> str. like get(y, x) but concatenate left and right parts. if name is an 'o', try to replace it to the right""" result = "" for i in itertools.count(0): ch = get(y, x - i) if not _isname(ch): break result = ch + result for i in itertools.count(1): ch = get(y, x + i) if not _isname(ch): break result += ch if result == "o": # special handling, find the name to the right result = "" for i in itertools.count(2): ch = get(y, x + i) if ch == " " or ch in _pipechars: if result or x + i >= len(lines[y]): break else: result += ch return result or "o" return result def parents(y, x): """(int, int) -> [str]. follow the ASCII edges at given position, return a list of parents""" visited = {(y, x)} visit = [] result = [] def follow(y, x, expected): """conditionally append (y, x) to visit array, if it's a char in excepted. 'o' in expected means an '_isname' test. if '-' (or '+') is not in excepted, and get(y, x) is '-' (or '+'), the next line (y + 1, x) will be checked instead.""" ch = get(y, x) if any(ch == c and c not in expected for c in ("-", "+")): y += 1 return follow(y + 1, x, expected) if ch in expected or ("o" in expected and _isname(ch)): visit.append((y, x)) # -o- # starting point: # /|\ # follow '-' (horizontally), and '/|\' (to the bottom) follow(y + 1, x, "|") follow(y + 1, x - 1, "/") follow(y + 1, x + 1, "\\") follow(y, x - 1, "-") follow(y, x + 1, "-") while visit: y, x = visit.pop() if (y, x) in visited: continue visited.add((y, x)) ch = get(y, x) if _isname(ch): result.append(getname(y, x)) continue elif ch == "|": follow(y + 1, x, "/|o") follow(y + 1, x - 1, "/") follow(y + 1, x + 1, "\\") elif ch == "+": follow(y, x - 1, "-") follow(y, x + 1, "-") follow(y + 1, x - 1, "/") follow(y + 1, x + 1, "\\") follow(y + 1, x, "|") elif ch == "\\": follow(y + 1, x + 1, "\\|o") elif ch == "/": follow(y + 1, x - 1, "/|o") elif ch == "-": follow(y, x - 1, "-+o") follow(y, x + 1, "-+o") return result for y, line in enumerate(lines): for x, ch in enumerate(pycompat.bytestr(line)): if ch == "#": # comment break if _isname(ch): edges[getname(y, x)] += parents(y, x) return dict(edges) class simplefilectx(object): def __init__(self, path, data, renamed=None): self._data = data self._path = path self._renamed = renamed def data(self): return self._data def filenode(self): return None def path(self): return self._path def renamed(self): if self._renamed: return (self._renamed, node.nullid) return None def flags(self): return "" class simplecommitctx(context.committablectx): def __init__(self, repo, name, parentctxs, filemap, mutationspec, date): added = [] removed = [] for path, data in filemap.items(): # check "(renamed from)". mark the source as removed m = re.search("\(renamed from (.+)\)\s*\Z", data, re.S) if m: removed.append(m.group(1)) # check "(removed)" if re.match("\A\s*\(removed\)\s*\Z", data, re.S): removed.append(path) else: if path in removed: raise error.Abort(_("%s: both added and removed") % path) added.append(path) extra = {"branch": "default"} mutinfo = None if mutationspec is not None: predctxs, cmd, split = mutationspec mutinfo = { "mutpred": ",".join( [mutation.identfromnode(p.node()) for p in predctxs] ), "mutdate": date, "mutuser": repo.ui.config("mutation", "user") or repo.ui.username(), "mutop": cmd, } if split: mutinfo["mutsplit"] = ",".join( [mutation.identfromnode(s.node()) for s in split] ) if mutation.recording(repo): extra.update(mutinfo) opts = { "changes": scmutil.status([], added, removed, [], [], [], []), "date": date, "extra": extra, "mutinfo": mutinfo, } super(simplecommitctx, self).__init__(self, name, **opts) self._repo = repo self._filemap = filemap self._parents = parentctxs while len(self._parents) < 2: self._parents.append(repo[node.nullid]) def filectx(self, key): data = self._filemap[key] m = re.match("\A(.*) \((?:renamed|copied) from (.+)\)\s*\Z", data, re.S) if m: data = m.group(1) renamed = m.group(2) else: renamed = None return simplefilectx(key, data, renamed) def commit(self): return self._repo.commitctx(self) def _walkgraph(edges, extraedges): """yield node, parents in topologically order ``edges`` is a dict containing a mapping of each node to its parent nodes. ``extraedges`` is a dict containing other constraints on the ordering, e.g. if commit B was created by amending commit A, then this dict should have B -> A to ensure A is created before B. """ visible = set(edges.keys()) remaining = {} # {str: [str]} for k, vs in edges.items(): vs = vs[:] if k in extraedges: vs.extend(list(extraedges[k])) for v in vs: if v not in remaining: remaining[v] = [] remaining[k] = vs while remaining: leafs = [k for k, v in remaining.items() if not v] if not leafs: raise error.Abort(_("the graph has cycles")) for leaf in sorted(leafs): if leaf in visible: yield leaf, edges[leaf] del remaining[leaf] for k, v in remaining.items(): if leaf in v: v.remove(leaf) def _getcomments(text): """ >>> [pycompat.sysstr(s) for s in _getcomments(br''' ... G ... | ... I D C F # split: B -> E, F, G ... \ \| | # replace: C -> D -> H ... H B E # prune: F, I ... \|/ ... A ... ''')] ['split: B -> E, F, G', 'replace: C -> D -> H', 'prune: F, I'] """ for line in text.splitlines(): if " # " not in line: continue yield line.split(" # ", 1)[1].split(" # ")[0].strip() def drawdag(repo, text, **opts): """given an ASCII graph as text, create changesets in repo. The ASCII graph is like what :hg:`log -G` outputs, with each `o` replaced to the name of the node. The command will create dummy changesets and local tags with those names to make the dummy changesets easier to be referred to. If the name of a node is a single character 'o', It will be replaced by the word to the right. This makes it easier to reuse :hg:`log -G -T '{desc}'` outputs. For root (no parents) nodes, revset can be used to query existing repo. Note that the revset cannot have confusing characters which can be seen as the part of the graph edges, like `|/+-\`. """ # parse the graph and make sure len(parents) <= 2 for each node edges = _parseasciigraph(text) for k, v in edges.items(): if len(v) > 2: raise error.Abort(_("%s: too many parents: %s") % (k, " ".join(v))) # parse comments to get extra file content instructions files = collections.defaultdict(dict) # {(name, path): content} comments = list(_getcomments(text)) filere = re.compile(r"^(\w+)/([\w/]+)\s*=\s*(.*)$", re.M) for name, path, content in filere.findall("\n".join(comments)): content = content.replace(r"\n", "\n").replace(r"\1", "\1") files[name][path] = content # parse commits like "X: date=1 0" to specify dates dates = {} datere = re.compile(r"^(\w+) has date\s*[= ]([0-9 ]+)$", re.M) for name, date in datere.findall("\n".join(comments)): dates[name] = date # do not create default files? (ex. commit A has file "A") defaultfiles = not any("drawdag.defaultfiles=false" in c for c in comments) committed = {None: node.nullid} # {name: node} # for leaf nodes, try to find existing nodes in repo for name, parents in edges.items(): if len(parents) == 0: try: committed[name] = scmutil.revsingle(repo, name).node() except error.RepoLookupError: pass # parse special comments obsmarkers = [] mutations = {} for comment in comments: rels = [] # obsolete relationships args = comment.split(":", 1) if len(args) <= 1: continue cmd = args[0].strip() arg = args[1].strip() if cmd in ("replace", "rebase", "amend"): nodes = [n.strip() for n in arg.split("->")] for i in range(len(nodes) - 1): pred, succ = nodes[i], nodes[i + 1] rels.append((pred, (succ,))) if succ in mutations: raise error.Abort( _("%s: multiple mutations: from %s and %s") % (succ, pred, mutations[succ][0]) ) mutations[succ] = ([pred], cmd, None) elif cmd in ("split",): pred, succs = arg.split("->") pred = pred.strip() succs = [s.strip() for s in succs.split(",")] rels.append((pred, succs)) for succ in succs: if succ in mutations: raise error.Abort( _("%s: multiple mutations: from %s and %s") % (succ, pred, mutations[succ][0]) ) for i in range(len(succs) - 1): parent = succs[i] child = succs[i + 1] if child not in edges or parent not in edges[child]: raise error.Abort( _("%s: split targets must be a stack: %s is not a parent of %s") % (pred, parent, child) ) mutations[succs[-1]] = ([pred], cmd, succs[:-1]) elif cmd in ("fold",): preds, succ = arg.split("->") preds = [p.strip() for p in preds.split(",")] succ = succ.strip() for pred in preds: rels.append((pred, (succ,))) if succ in mutations: raise error.Abort( _("%s: multiple mutations: from %s and %s") % (succ, ", ".join(preds), mutations[succ][0]) ) for i in range(len(preds) - 1): parent = preds[i] child = preds[i + 1] if child not in edges or parent not in edges[child]: raise error.Abort( _("%s: fold sources must be a stack: %s is not a parent of %s") % (succ, parent, child) ) mutations[succ] = (preds, cmd, None) elif cmd in ("prune",): for n in arg.split(","): rels.append((n.strip(), ())) elif cmd in ("revive",): for n in arg.split(","): rels.append((n.strip(), (n.strip(),))) if rels: obsmarkers.append((cmd, rels)) # Only record mutations if mutation is enabled. mutationedges = {} mutationpreds = set() if mutation.enabled(repo): # For mutation recording to work, we must include the mutations # as extra edges when walking the DAG. for succ, (preds, cmd, split) in mutations.items(): succs = {succ} mutationpreds.update(preds) if split: succs.update(split) for s in succs: mutationedges.setdefault(s, set()).update(preds) else: mutationedges = {} mutations = {} # commit in topological order for name, parents in _walkgraph(edges, mutationedges): if name in committed: continue pctxs = [repo[committed[n]] for n in parents] pctxs.sort(key=lambda c: c.node()) added = {} if len(parents) > 1: # If it's a merge, take the files and contents from the parents for f in pctxs[1].manifest(): if f not in pctxs[0].manifest(): added[f] = pctxs[1][f].data() else: # If it's not a merge, add a single file, if defaultfiles is set if defaultfiles: added[name] = name # add extra file contents in comments for path, content in files.get(name, {}).items(): added[path] = content commitmutations = None if name in mutations: preds, cmd, split = mutations[name] if split is not None: split = [repo[committed[s]] for s in split] commitmutations = ([repo[committed[p]] for p in preds], cmd, split) date = dates.get(name, "0 0") ctx = simplecommitctx(repo, name, pctxs, added, commitmutations, date) n = ctx.commit() committed[name] = n if name not in mutationpreds: with repo.wlock(), repo.lock(), repo.transaction("bookmark") as tr: bookmarks.addbookmarks(repo, tr, [name], hex(n), True, True) # handle special comments with repo.wlock(), repo.lock(), repo.transaction("drawdag"): getctx = lambda x: repo.unfiltered()[committed[x.strip()]] if obsolete.isenabled(repo, obsolete.createmarkersopt): for cmd, markers in obsmarkers: obsrels = [(getctx(p), [getctx(s) for s in ss]) for p, ss in markers] if obsrels: obsolete.createmarkers(repo, obsrels, date=(0, 0), operation=cmd) if visibility.tracking(repo): hidenodes = set() revivenodes = set() for cmd, markers in obsmarkers: for p, ss in markers: if cmd == "revive": revivenodes.add(getctx(p).node()) else: hidenodes.add(getctx(p).node()) visibility.remove(repo, hidenodes - revivenodes) if opts.get("print"): for name, n in sorted(committed.items()): if name: repo.ui.write("%s %s\n" % (node.short(n), name))