# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1248335510 14400
# Node ID cec5eade320aacc57cdce615ba367d91bff1f5d5
# Parent  bf985aeca78e7f46a8730e6f626802b2400b772b
Add documentation for {node}.

diff -r bf985aeca78e -r cec5eade320a README
--- a/README	Thu Jul 23 03:51:36 2009 -0400
+++ b/README	Thu Jul 23 03:51:50 2009 -0400
@@ -59,7 +59,11 @@
 
 * **bookmark:** the current bookmark (requires the [bookmarks]() extension)
 * **branch:** the current branch
-* **rev:** the repository-local changeset number of the current parent.  This does not take into account merges (which have two parents) -- see the `rev|merge` keyword for that.
+* **node:** the (full) changeset hash of the current parent
+* **node|short:** a short form of the changeset hash of the current parent
+* **node|merge:** the (full) changeset hash of the changeset you're merging with if you're currently merging, otherwise nothing.
+* **node|merge|short:** a short form of the changeset hash of the changeset you're merging with if you're currently merging, otherwise nothing
+* **rev:** the repository-local changeset number of the current parent
 * **rev|merge:** the repository-local changeset number of the changeset you're merging with if you're currently merging, otherwise nothing
 * **root:** the full path to the root of the current repository, without a trailing slash
 * **root|basename:** the directory name of the root of the current repository.  For example, if the repository is in `/home/u/myrepo` then this keyword would expand to `myrepo`.
diff -r bf985aeca78e -r cec5eade320a prompt.py
--- a/prompt.py	Thu Jul 23 03:51:36 2009 -0400
+++ b/prompt.py	Thu Jul 23 03:51:50 2009 -0400
@@ -67,9 +67,13 @@
     
     - bookmark: the current bookmark (requires the bookmarks extension)
     - branch: the current branch
-    - rev: the repository-local changeset number of the current parent.  This
-        does not take into account merges (which have two parents) -- see the
-        'rev|merge' keyword for that.
+    - node: the (full) changeset hash of the current parent
+    - node|short: a short form of the changeset hash of the current parent
+    - node|merge: the (full) changeset hash of the changeset you're merging
+        with if you're currently merging, otherwise nothing.
+    - node|merge|short: a short form of the changeset hash of the changeset
+        you're merging with if you're currently merging, otherwise nothing
+    - rev: the repository-local changeset number of the current parent
     - rev|merge: the repository-local changeset number of the changeset
         you're merging with if you're currently merging, otherwise nothing
     - root: the full path to the root of the current repository, without a