This is an archive of the discontinued Mercurial Phabricator instance.

Differential D463

undo: draft obsolete commits
ClosedPublic

Authored by felixmerk on Aug 21 2017, 2:42 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXa9cd7384aa69: undo: draft obsolete commits
Summary

Visible obsolete commits are slightly tricky. For example, an amend in the
middle of a stack will leave behind a visible obsoleted commit. This diff
removes visible obsolete commits from 'olddraft()'. This removes the need for
some special casing and allows for a more powerful preview.

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.Aug 21 2017, 2:42 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 21 2017, 2:42 PM
quark accepted this revision.Aug 21 2017, 3:22 PM
quark added a subscriber: quark.

Great! I like red lines.

This revision is now accepted and ready to land.Aug 21 2017, 3:22 PM
Closed by commit rFBHGXa9cd7384aa69: undo: draft obsolete commits (authored by felixmerk). · Explain WhyAug 21 2017, 8:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (32 lines)

Diff 1141

hgext3rd/undo.py

# Revset logic # Revset logic
def _getolddrafts(repo, reverseindex): def _getolddrafts(repo, reverseindex):
# convert reverseindex to node # convert reverseindex to node
# this makes cacheing guaranteed correct # this makes cacheing guaranteed correct
# bc immutable history # bc immutable history
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
return _cachedgetolddrafts(repo, nodedict["draftheads"]) return _cachedgetolddrafts(repo, nodedict["draftheads"],
nodedict["draftobsolete"])
def _cachedgetolddrafts(repo, node): def _cachedgetolddrafts(repo, draftnode, obsnode):
if not util.safehasattr(repo, '_undoolddraftcache'): if not util.safehasattr(repo, '_undoolddraftcache'):
repo._undoolddraftcache = {} repo._undoolddraftcache = {}
cache = repo._undoolddraftcache cache = repo._undoolddraftcache
if node not in cache: key = draftnode + obsnode
olddraftheads = _readnode(repo, "draftheads.i", node) if key not in cache:
olddraftheads = _readnode(repo, "draftheads.i", draftnode)
oldheadslist = olddraftheads.split("\n") oldheadslist = olddraftheads.split("\n")
oldlogrevstring = revsetlang.formatspec('draft() & ancestors(%ls)', oldobs = _readnode(repo, "draftobsolete.i", obsnode)
oldheadslist) oldobslist = filter(None, oldobs.split("\n"))
oldlogrevstring = revsetlang.formatspec(
'(draft() & ancestors(%ls)) - %ls', oldheadslist, oldobslist)
urepo = repo.unfiltered() urepo = repo.unfiltered()
cache[node] = smartset.baseset(urepo.revs(oldlogrevstring)) cache[key] = smartset.baseset(urepo.revs(oldlogrevstring))
return cache[node] return cache[key]
revsetpredicate = registrar.revsetpredicate() revsetpredicate = registrar.revsetpredicate()
@revsetpredicate('olddraft') @revsetpredicate('olddraft')
def _olddraft(repo, subset, x): def _olddraft(repo, subset, x):
"""``olddraft([index])`` """``olddraft([index])``
previous draft commits previous draft commits
if data[1][0] is None: if data[1][0] is None:
dirstate.remove(filename) dirstate.remove(filename)
# visible changesets # visible changesets
addedrevs = revsetlang.formatspec('olddraft(0) - olddraft(%d)', addedrevs = revsetlang.formatspec('olddraft(0) - olddraft(%d)',
reverseindex) reverseindex)
removedrevs = revsetlang.formatspec('olddraft(%d) - olddraft(0)', removedrevs = revsetlang.formatspec('olddraft(%d) - olddraft(0)',
reverseindex) reverseindex)
currentstate = _readindex(repo, 0)
curdraftobsolete = _readnode(repo, "draftobsolete.i",
currentstate["draftobsolete"])
newdraftobsolete = _readnode(repo, "draftobsolete.i",
nodedict["draftobsolete"])
obschange = (set(curdraftobsolete.split("\n"))
- set(newdraftobsolete.split("\n")))
obschangerevs = revsetlang.formatspec('%ls', obschange)
if not branch: if not branch:
smarthide(repo, addedrevs, removedrevs) smarthide(repo, addedrevs, removedrevs)
revealcommits(repo, removedrevs) revealcommits(repo, removedrevs)
revealcommits(repo, obschangerevs)
else: else:
localadds = revsetlang.formatspec('(olddraft(0) - olddraft(%d)) and' localadds = revsetlang.formatspec('(olddraft(0) - olddraft(%d)) and'
' _localbranch(%s)', ' _localbranch(%s)',
reverseindex, branch) reverseindex, branch)
localremoves = revsetlang.formatspec('(olddraft(%d) - olddraft(0)) and' localremoves = revsetlang.formatspec('(olddraft(%d) - olddraft(0)) and'
' _localbranch(%s)', ' _localbranch(%s)',
reverseindex, branch) reverseindex, branch)
localobschange = revsetlang.formatspec('(%ls) and _localbranch(%s)',
obschange, branch)
smarthide(repo, localadds, removedrevs) smarthide(repo, localadds, removedrevs)
smarthide(repo, addedrevs, localremoves, local=True) smarthide(repo, addedrevs, localremoves, local=True)
revealcommits(repo, localremoves) revealcommits(repo, localremoves)
revealcommits(repo, localobschange)
# informative output # informative output
time = _readnode(repo, "date.i", nodedict["date"]) time = _readnode(repo, "date.i", nodedict["date"])
time = util.datestr([float(x) for x in time.split(" ")]) time = util.datestr([float(x) for x in time.split(" ")])
nodedict = _readindex(repo, reverseindex - 1) nodedict = _readindex(repo, reverseindex - 1)
commandstr = _readnode(repo, "command.i", nodedict["command"]) commandstr = _readnode(repo, "command.i", nodedict["command"])
commandlist = commandstr.split("\0")[1:] commandlist = commandstr.split("\0")[1:]