# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 2006-05-08 21:19:05
# Node ID 4f072bb06e897e6e032821d79621073277943403
# Parent  abfed2a82b0705c1c98e392232e705f48d318d7f

deprecate undo command, replace with rollback command.


diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2232,7 +2232,7 @@ def rename(ui, repo, *pats, **opts):
     return errs
 
 def revert(ui, repo, *pats, **opts):
-    """revert modified files or dirs to their states as of some revision
+    """revert files or dirs to their states as of some revision
 
     With no revision specified, revert the named files or directories
     to the contents they had in the parent of the working directory.
@@ -2361,6 +2361,35 @@ def revert(ui, repo, *pats, **opts):
     repo.dirstate.update(remove[0], 'r')
     return r
 
+def rollback(ui, repo):
+    """roll back the last transaction in this repository
+
+    Roll back the last transaction in this repository, restoring the
+    project to its state prior to the transaction.
+
+    Transactions are used to encapsulate the effects of all commands
+    that create new changesets or propagate existing changesets into a
+    repository. For example, the following commands are transactional,
+    and their effects can be rolled back:
+
+      commit
+      import
+      pull
+      push (with this repository as destination)
+      unbundle
+
+    This command should be used with care. There is only one level of
+    rollback, and there is no way to undo a rollback.
+
+    This command is not intended for use on public repositories. Once
+    changes are visible for pull by other users, rolling a transaction
+    back locally is ineffective (someone else may already have pulled
+    the changes). Furthermore, a race is possible with readers of the
+    repository; for example an in-progress pull from the repository
+    may fail if a rollback is performed.
+    """
+    repo.undo()
+
 def root(ui, repo):
     """print the root (top) of the current working dir
 
@@ -2676,19 +2705,12 @@ def unbundle(ui, repo, fname, **opts):
     return postincoming(ui, repo, modheads, opts['update'])
 
 def undo(ui, repo):
-    """undo the last commit or pull
-
-    Roll back the last pull or commit transaction on the
-    repository, restoring the project to its earlier state.
-
-    This command should be used with care. There is only one level of
-    undo and there is no redo.
-
-    This command is not intended for use on public repositories. Once
-    a change is visible for pull by other users, undoing it locally is
-    ineffective. Furthemore a race is possible with readers of the
-    repository, for example an ongoing pull from the repository will
-    fail and rollback.
+    """undo the last commit or pull (DEPRECATED)
+
+    (DEPRECATED)
+    This command is now deprecated and will be removed in a future
+    release. Please use the rollback command instead.  For usage
+    instructions, see the rollback command.
     """
     repo.undo()
 
@@ -3018,6 +3040,7 @@ table = {
           ('I', 'include', [], _('include names matching given patterns')),
           ('X', 'exclude', [], _('exclude names matching given patterns'))],
          _('hg revert [-r REV] [NAME]...')),
+    "rollback": (rollback, [], _('hg rollback')),
     "root": (root, [], _('hg root')),
     "^serve":
         (serve,
diff --git a/notes.txt b/notes.txt
--- a/notes.txt
+++ b/notes.txt
@@ -121,7 +121,7 @@ changeset entry gets added last. We keep
 of each file touched and its length prior to the transaction. On
 abort, we simply truncate each file to its prior length. This is one
 of the nice properties of the append-only structure of the revlogs.
-We can also reuse this journal for "undo".
+We can also reuse this journal for "rollback".
 
 Merging between repositories:
 
diff --git a/tests/test-hook b/tests/test-hook
--- a/tests/test-hook
+++ b/tests/test-hook
@@ -81,7 +81,7 @@ echo '[hooks]' > ../a/.hg/hgrc
 echo 'preoutgoing = echo preoutgoing hook: s=$HG_SOURCE' >> ../a/.hg/hgrc
 echo 'outgoing = echo outgoing hook: n=$HG_NODE s=$HG_SOURCE' >> ../a/.hg/hgrc
 hg pull ../a
-hg undo
+hg rollback
 
 # preoutgoing hook can prevent outgoing changes
 echo 'preoutgoing.forbid = echo preoutgoing.forbid hook; exit 1' >> ../a/.hg/hgrc
diff --git a/tests/test-undo b/tests/test-rollback
rename from tests/test-undo
rename to tests/test-rollback
--- a/tests/test-undo
+++ b/tests/test-rollback
@@ -9,7 +9,7 @@ hg commit -m "test" -d "1000000 0"
 hg verify
 hg parents
 hg status
-hg undo
+hg rollback
 hg verify
 hg parents
 hg status
diff --git a/tests/test-undo.out b/tests/test-rollback.out
rename from tests/test-undo.out
rename to tests/test-rollback.out