This is an archive of the discontinued Mercurial Phabricator instance.

Differential D188

undo: clean up bin/hex
ClosedPublic

Authored by felixmerk on Jul 26 2017, 6:39 PM.
Tags
None
Subscribers
stash, phillco

Details

Reviewers
phillco
Group Reviewers
Restricted Project
Commits
rFBHGXa5f16618cedd: undo: clean up bin/hex
Summary

Standardizes some bin/hex in hg undo. hg stores node data in hex form to make
it easier to read its files and because it seems to resolve some parsing issues.
While converting everything to binary seems prudent, it proved non-trivial and
isn't a pressing concern. If we want to make this change, we should do it
before hg undo is rolled out generally. As no other extension should directly
access the data it doesn't seem that important. Interesting information should
be available with the revsets already.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

felixmerk created this revision.Jul 26 2017, 6:39 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 26 2017, 6:39 PM
phillco accepted this revision.Jul 26 2017, 7:23 PM
phillco added a subscriber: phillco.

lgtm

This revision is now accepted and ready to land.Jul 26 2017, 7:23 PM
felixmerk updated this revision to Diff 423.Jul 26 2017, 8:28 PM
stash added a subscriber: stash.Jul 27 2017, 6:56 AM

Awesome, thanks for doing it

felixmerk updated this revision to Diff 465.Jul 31 2017, 6:04 PM
felixmerk updated this revision to Diff 510.Aug 2 2017, 4:31 PM
felixmerk updated this revision to Diff 529.Aug 3 2017, 6:09 PM
Closed by commit rFBHGXa5f16618cedd: undo: clean up bin/hex (authored by felixmerk). · Explain WhyAug 4 2017, 9:19 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (30 lines)

Diff 540

hgext3rd/undo.py

node = rlog.addrevision(revstring, tr, 1, nullid, nullid) node = rlog.addrevision(revstring, tr, 1, nullid, nullid)
return hex(node) return hex(node)
def _logdate(repo, tr): def _logdate(repo, tr):
revstring = " ".join(str(x) for x in util.makedate()) revstring = " ".join(str(x) for x in util.makedate())
return writelog(repo, tr, "date.i", revstring) return writelog(repo, tr, "date.i", revstring)
def _logdraftheads(repo, tr): def _logdraftheads(repo, tr):
revs = repo.revs('heads(draft())') spec = revsetlang.formatspec('heads(draft())')
tonode = repo.changelog.node hexnodes = tohexnode(repo, spec)
hexnodes = [hex(tonode(x)) for x in revs]
revstring = "\n".join(sorted(hexnodes)) revstring = "\n".join(sorted(hexnodes))
return writelog(repo, tr, "draftheads.i", revstring) return writelog(repo, tr, "draftheads.i", revstring)
def _logcommand(repo, tr, command): def _logcommand(repo, tr, command):
revstring = "\0".join(command) revstring = "\0".join(command)
return writelog(repo, tr, "command.i", revstring) return writelog(repo, tr, "command.i", revstring)
def _logbookmarks(repo, tr): def _logbookmarks(repo, tr):
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
except IndexError: except IndexError:
raise error.Abort(_("index out of bounds")) raise error.Abort(_("index out of bounds"))
# bookmarks # bookmarks
bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"]) bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"])
booklist = bookstring.split("\n") booklist = bookstring.split("\n")
if branch: if branch:
revs = repo.revs(revsetlang.formatspec('_localbranch(%s)', branch)) spec = revsetlang.formatspec('_localbranch(%s)', branch)
tonode = repo.changelog.node branchcommits = tohexnode(repo, spec)
branchcommits = [tonode(x) for x in revs]
else: else:
branchcommits = False branchcommits = False
# copy implementation for bookmarks # copy implementation for bookmarks
itercopy = [] itercopy = []
for mark in repo._bookmarks.iteritems(): for mark in repo._bookmarks.iteritems():
itercopy.append(mark) itercopy.append(mark)
bmremove = [] bmremove = []
for mark in itercopy: for mark in itercopy:
if not branchcommits or mark[1] in branchcommits: if not branchcommits or hex(mark[1]) in branchcommits:
bmremove.append((mark[0], None)) bmremove.append((mark[0], None))
repo._bookmarks.applychanges(repo, repo.currenttransaction(), bmremove) repo._bookmarks.applychanges(repo, repo.currenttransaction(), bmremove)
bmchanges = [] bmchanges = []
for mark in booklist: for mark in booklist:
if mark: if mark:
kv = mark.rsplit(" ", 1) kv = mark.rsplit(" ", 1)
if not branchcommits or\ if not branchcommits or\
bin(kv[1]) in branchcommits or\ kv[1] in branchcommits or\
(kv[0], None) in bmremove: (kv[0], None) in bmremove:
bmchanges.append((kv[0], bin(kv[1]))) bmchanges.append((kv[0], bin(kv[1])))
repo._bookmarks.applychanges(repo, repo.currenttransaction(), bmchanges) repo._bookmarks.applychanges(repo, repo.currenttransaction(), bmchanges)
# working copy parent # working copy parent
workingcopyparent = _readnode(repo, "workingparent.i", workingcopyparent = _readnode(repo, "workingparent.i",
nodedict["workingparent"]) nodedict["workingparent"])
if not keep: if not keep:
if not branchcommits or bin(workingcopyparent) in branchcommits: if not branchcommits or workingcopyparent in branchcommits:
hg.updatetotally(ui, repo, workingcopyparent, workingcopyparent, hg.updatetotally(ui, repo, workingcopyparent, workingcopyparent,
clean=False, updatecheck='abort') clean=False, updatecheck='abort')
elif not branchcommits or bin(workingcopyparent) in branchcommits: elif not branchcommits or workingcopyparent in branchcommits:
# keeps working copy files # keeps working copy files
precnode = bin(workingcopyparent) precnode = bin(workingcopyparent)
precctx = repo[precnode] precctx = repo[precnode]
changedfiles = [] changedfiles = []
wctx = repo[None] wctx = repo[None]
wctxmanifest = wctx.manifest() wctxmanifest = wctx.manifest()
precctxmanifest = precctx.manifest() precctxmanifest = precctx.manifest()
except IndexError: except IndexError:
raise error.Abort(_("index out of bounds")) raise error.Abort(_("index out of bounds"))
alphaworkingcopyparent = _readnode(repo, "workingparent.i", alphaworkingcopyparent = _readnode(repo, "workingparent.i",
nodedict["workingparent"]) nodedict["workingparent"])
alphabookstring = _readnode(repo, "bookmarks.i", alphabookstring = _readnode(repo, "bookmarks.i",
nodedict["bookmarks"]) nodedict["bookmarks"])
incrementalindex = reverseindex incrementalindex = reverseindex
localbranch = repo.revs( spec = revsetlang.formatspec("_localbranch(%s)", branch)
revsetlang.formatspec("_localbranch(%s)", branch)) hexnodes = tohexnode(repo, spec)
tonode = repo.changelog.node
hexnodes = [hex(tonode(x)) for x in localbranch]
done = False done = False
while not done: while not done:
# move index # move index
incrementalindex += direction incrementalindex += direction
# check this index # check this index
try: try:
nodedict = _readindex(repo, incrementalindex) nodedict = _readindex(repo, incrementalindex)
# corruption: for now, we can simply nuke all files # corruption: for now, we can simply nuke all files
# TODO: log to Scuba # TODO: log to Scuba
repo.ui.debug("caught revlog error. %s was probably corrupted\n" % path) repo.ui.debug("caught revlog error. %s was probably corrupted\n" % path)
repo.vfs.rmtree('undolog') repo.vfs.rmtree('undolog')
repo.vfs.makedirs('undolog') repo.vfs.makedirs('undolog')
# if we get the error a second time # if we get the error a second time
# then someone is actively messing with these files # then someone is actively messing with these files
return revlog.revlog(repo.vfs, path) return revlog.revlog(repo.vfs, path)
def tohexnode(repo, spec):
revs = repo.revs(spec)
tonode = repo.changelog.node
hexnodes = [hex(tonode(x)) for x in revs]
return hexnodes