This is mostly work on making sjl’s templates work within the templating engine without requiring extraneous files. I’ve also worked on bookmarks workflow. Below are the patches that have been accepted.

Author Commit Message Date Builds
Sean Farley
committablectx: move __contains__ into workingctx This was mistakenly moved from workingctx to committablectx in 9d56a3359011. Since the method is querying the dirstate, the only logical place is for it to reside is in workingctx.
Sean Farley
memctx: explicitly set substate to None In d2743be1bb06, memctx was changed to inherit from committablectx, this in turn added the 'substate' property to memctx. It turns out that the newcommitphase method tested for this property: def newcommitphase(ui, ctx): commitphase = phases.newcommitphase(ui) substate = getattr(ctx, "substate", None) if not substate: return commitphase Currently, memctx isn't ready…
Sean Farley
test-context: add test for performing a diff on a memctx We now see the first result of all that refactoring of memctx: we can now diff against a memctx.
Sean Farley
test-context: add test for memctx status
Sean Farley
memctx: add _manifest implementation that computes the filenode This is an initial implementation of having a manifest for memctx that computes the hash in the same way that filenodes are computed elsewhere.
Sean Farley
basectx: pass raw context objects to patch.diff
Sean Farley
patch: use ctx.node() instead of bare node variable Future patches will allow patch.diff to take a basectx so node1 (and node2) could make hexfunc error out. Instead, we'll call the node function on the context object directly.
Sean Farley
bash_completion: add -l|--list support for shelve This was overlooked previously and found via 'hg shelve -p -l <tab>' (to show the diff of the shelved commit).
Sean Farley
memfilectx: add a size method This method is needed to have memfilectx behave like the other file contexts. We can't just inherit this method because each file context has different behavior: filectx reads from the filelog, and workingfilectx reads from the disk. Therefore, we define memfilectx to return the size of the data in memory.
Sean Farley
memfilectx: remove path since it is now inherited
Sean Farley
memfilectx: remove __str__ since it is now inherited
Sean Farley
memfilectx: remove __nonzero__ since it is now inherited
Sean Farley
memfilectx: call super.__init__ instead of duplicating code This patch changes the calling signature of memfilectx's __init__ to fall in line with the other file contexts. Calling code and tests have been updated accordingly.
Sean Farley
memfilectx: inherit from committablefilectx This patch marks the beginning of having memfilectx become a full-fledged file contex so that we can handle diffing and merging.
Sean Farley
memctx: remove parents since it is now inherited
Sean Farley
memctx: remove flags since it is now inherited commitablectx has a much more robust implementation of flags() so we will use that instead of just blindly calling the flags function for the given path.
Sean Farley
memctx: remove extra since it is now inherited
Sean Farley
memctx: remove branch since it is now inherited
Sean Farley
memctx: remove clean since it is now inherited
Sean Farley
memctx: remove ignored since it is now inherited
Sean Farley
memctx: remove unknown since it is now inherited
Sean Farley
memctx: remove deleted since it is now inherited
Sean Farley
memctx: remove removed since it is now inherited
Sean Farley
memctx: remove added since it is now inherited
Sean Farley
memctx: remove modified since it is now inherited
Sean Farley
memctx: remove files since it is now inherited This is a slight change in definition from memctx returning only modified() but its parent's definition is more consistent with other contexts' behavior so we can call this change a slight bugfix and step in the right direction.
Sean Farley
memctx: remove description since it is now inherited
Sean Farley
memctx: remove date since it is now inherited
Sean Farley
memctx: remove user since it is now inherited
Sean Farley
memctx: remove p2 since it is now inherited
  1. Prev
  2. Next