This is an archive of the discontinued Mercurial Phabricator instance.

Differential D385

drawdag: allow override file contents via comments
ClosedPublic

Authored by quark on Aug 14 2017, 10:24 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG0531ffd59a98: drawdag: allow override file contents via comments
Summary

This makes drawdag more flexible, and allow us to create non-clean merges in
test cases.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 14 2017, 10:24 AM
martinvonz added a subscriber: martinvonz.Aug 14 2017, 1:10 PM
martinvonz added inline comments.
tests/test-drawdag.t
243

Does it support creating graphs of resolved conflicts as follows?

> C       # A/f = a
> |\      # B/f = b
> A B     # C/f = c
quark added inline comments.Aug 14 2017, 1:41 PM
tests/test-drawdag.t
243

Yes. I uses = to indicate "replace the content". In the future we might want += to do "append content" etc.

quark added a comment.EditedAug 14 2017, 1:42 PM

Wait, I guess I know what you're saying. Let me double check.

UPDATE: Seems it works without modification.

quark updated this revision to Diff 872.Aug 14 2017, 1:54 PM
martinvonz accepted this revision.Aug 14 2017, 1:58 PM
This revision is now accepted and ready to land.Aug 14 2017, 1:58 PM
Closed by commit rHG0531ffd59a98: drawdag: allow override file contents via comments (authored by quark). · Explain WhyAug 14 2017, 2:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/drawdag.py (23 lines)
Mtests/test-drawdag.t (36 lines)

Diff 867

tests/drawdag.py

# replace: A -> B -> C -> D # chained 1 to 1 replacements # replace: A -> B -> C -> D # chained 1 to 1 replacements
# split: A -> B, C # 1 to many # split: A -> B, C # 1 to many
# prune: A, B, C # many to nothing # prune: A, B, C # many to nothing
""" """
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import collections import collections
import itertools import itertools
import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
context, context,
error, error,
node, node,
obsolete, obsolete,
registrar, registrar,
for leaf in sorted(leafs): for leaf in sorted(leafs):
if leaf in visible: if leaf in visible:
yield leaf, edges[leaf] yield leaf, edges[leaf]
del remaining[leaf] del remaining[leaf]
for k, v in remaining.iteritems(): for k, v in remaining.iteritems():
if leaf in v: if leaf in v:
v.remove(leaf) v.remove(leaf)
def _getcomments(text):
for line in text.splitlines():
if ' # ' not in line:
continue
yield line.split(' # ', 1)[1].split(' # ')[0].strip()
@command('debugdrawdag', []) @command('debugdrawdag', [])
def debugdrawdag(ui, repo, **opts): def debugdrawdag(ui, repo, **opts):
"""read an ASCII graph from stdin and create changesets """read an ASCII graph from stdin and create changesets
The ASCII graph is like what :hg:`log -G` outputs, with each `o` replaced 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 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 tags with those names to make the dummy changesets easier to be referred
to. to.
# parse the graph and make sure len(parents) <= 2 for each node # parse the graph and make sure len(parents) <= 2 for each node
edges = _parseasciigraph(text) edges = _parseasciigraph(text)
for k, v in edges.iteritems(): for k, v in edges.iteritems():
if len(v) > 2: if len(v) > 2:
raise error.Abort(_('%s: too many parents: %s') raise error.Abort(_('%s: too many parents: %s')
% (k, ' '.join(v))) % (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)):
files[name][path] = content.replace(r'\n', '\n')
committed = {None: node.nullid} # {name: node} committed = {None: node.nullid} # {name: node}
# for leaf nodes, try to find existing nodes in repo # for leaf nodes, try to find existing nodes in repo
for name, parents in edges.iteritems(): for name, parents in edges.iteritems():
if len(parents) == 0: if len(parents) == 0:
try: try:
committed[name] = scmutil.revsingle(repo, name) committed[name] = scmutil.revsingle(repo, name)
except error.RepoLookupError: except error.RepoLookupError:
if len(parents) > 1: if len(parents) > 1:
# If it's a merge, take the files and contents from the parents # If it's a merge, take the files and contents from the parents
for f in pctxs[1].manifest(): for f in pctxs[1].manifest():
if f not in pctxs[0].manifest(): if f not in pctxs[0].manifest():
added[f] = pctxs[1][f].data() added[f] = pctxs[1][f].data()
else: else:
# If it's not a merge, add a single file # If it's not a merge, add a single file
added[name] = name added[name] = name
# add extra file contents in comments
for path, content in files.get(name, {}).items():
added[path] = content
ctx = simplecommitctx(repo, name, pctxs, added) ctx = simplecommitctx(repo, name, pctxs, added)
n = ctx.commit() n = ctx.commit()
committed[name] = n committed[name] = n
tagsmod.tag(repo, name, n, message=None, user=None, date=None, tagsmod.tag(repo, name, n, message=None, user=None, date=None,
local=True) local=True)
# handle special comments # handle special comments
with repo.wlock(), repo.lock(), repo.transaction('drawdag'): with repo.wlock(), repo.lock(), repo.transaction('drawdag'):
getctx = lambda x: repo.unfiltered()[committed[x.strip()]] getctx = lambda x: repo.unfiltered()[committed[x.strip()]]
for line in text.splitlines(): for comment in comments:
if ' # ' not in line:
continue
rels = [] # obsolete relationships rels = [] # obsolete relationships
comment = line.split(' # ', 1)[1].split(' # ')[0].strip()
args = comment.split(':', 1) args = comment.split(':', 1)
if len(args) <= 1: if len(args) <= 1:
continue continue
cmd = args[0].strip() cmd = args[0].strip()
arg = args[1].strip() arg = args[1].strip()
if cmd in ('replace', 'rebase', 'amend'): if cmd in ('replace', 'rebase', 'amend'):

tests/test-drawdag.t

o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0 o A 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
$ hg debugobsolete $ hg debugobsolete
112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 112478962961147124edd43549aedd1a335e44bf 7fb047a69f220c21711122dfd94305a9efb60cba 64a8289d249234b9886244d379f15e6b650b28e3 711f53bbef0bebd12eb6f0511d5e2e998b984846 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 26805aba1e600a82e93661149f2313866a221a7b be0ef73c17ade3fc89dc41701eb9fc3a91b58282 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} be0ef73c17ade3fc89dc41701eb9fc3a91b58282 575c4b5ec114d64b681d33f8792853568bfb2b2c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 64a8289d249234b9886244d379f15e6b650b28e3 0 {7fb047a69f220c21711122dfd94305a9efb60cba} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 58e6b987bf7045fcd9c54f496396ca1d1fc81047 0 {575c4b5ec114d64b681d33f8792853568bfb2b2c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
Change file contents via comments
$ reinit
$ hg debugdrawdag <<'EOS'
> C # A/dir1/a = 1\n2
> |\ # B/dir2/b = 34
> A B # C/dir1/c = 5
> # C/dir2/c = 6
martinvonzUnsubmitted
Not Done

Does it support creating graphs of resolved conflicts as follows?

> C       # A/f = a
> |\      # B/f = b
> A B     # C/f = c
martinvonz: Does it support creating graphs of resolved conflicts as follows? > C # A/f = a > |\…
quarkAuthorUnsubmitted
Not Done

Yes. I uses = to indicate "replace the content". In the future we might want += to do "append content" etc.

quark: Yes. I uses `=` to indicate "replace the content". In the future we might want `+=` to do…
> EOS
$ hg log -G -T '{desc} {files}'
o C dir1/c dir2/c
|\
| o B B dir2/b
|
o A A dir1/a
$ for f in `hg files -r C`; do
> echo FILE "$f"
> hg cat -r C "$f"
> echo
> done
FILE A
A
FILE B
B
FILE dir1/a
1
2
FILE dir1/c
5
FILE dir2/b
34
FILE dir2/c
6