# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1398805972 14400 # Node ID 2ddbf1893f3b928e870ac912e7ee1bdcb75b828c # Parent 8b84762b181451fa26f04d9a6491e46730aef47a Tweak session for Pycon lightning talk diff --git a/session b/session --- a/session +++ b/session @@ -1,19 +1,17 @@ # This talk is gonna be about a feature called "revsets". What are they? # The Octave repo (yeah, I work on Octave) -cd coding/vcs/octave +cd ~/octave # Let's look around -ls -hg summary +hg branches +hg bookmarks hg log -G -hg book - # Several ways to refer to a commit -hg log -r mtlpy -hg log -r 17395 -hg log -r ffe05002f437 +hg log -r jordi +hg log -r 18763 +hg log -r fddfb3054375 hg log -r tip hg log -r -1 hg log -r -2 @@ -43,9 +41,6 @@ hg log -r 'min(descendants(@) and not @)' hg log -r 'reverse(descendants(@) and not @)' -# This revset seems handy, let's alias it -emacs ~/.hgrc - # Of course, anywhere that you can fit revisions, you can also use a # revset! hg histedit -r 'children(@)' @@ -55,10 +50,10 @@ # In which release was histedit merged into core hg? cd ../mercurial-source -hg log -r 'min(adds(hgext/histedit.py):: and tag())' +hg log -r 'min(descendants(adds(hgext/histedit.py)) and tag())' # Let's write our own revset! -emacs ../revset-talk/lol.py +emacs ~/revset-talk/lol.py # And let's have fun with it emacs ~/.hgrc @@ -66,4 +61,4 @@ cd ../octave hg log -r 'lol()' hg log -r 'lol() and user(jordigh)' -hg log --patch --verbose --rev 'lol() and user(jordigh) and keyword(wisdom)' \ No newline at end of file +!THANKS \ No newline at end of file