Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: fix typos, improve messages
authorPatrick Mezard <patrick@mezard.eu>
Thu, 26 Jul 2012 13:40:32 +0200
changeset 390 54582eebeb08
parent 389 cb575242d2ba
child 391 92adb5b34a04
obsolete: fix typos, improve messages
docs/tutorials/tutorial.t file | annotate | diff | comparison | revisions
hgext/obsolete.py file | annotate | diff | comparison | revisions
tests/test-obsolete.t file | annotate | diff | comparison | revisions 
--- a/docs/tutorials/tutorial.t	Thu Jul 26 13:45:09 2012 +0200
+++ b/docs/tutorials/tutorial.t	Thu Jul 26 13:40:32 2012 +0200
@@ -610,7 +610,7 @@
   pushing to $TESTTMP/other
   searching for changes
   abort: push includes an unstable changeset: 9ac5d0e790a2!
-  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  (use 'hg stabilize' to get a stable history or --force to ignore warnings)
   [255]
  
 
--- a/hgext/obsolete.py	Thu Jul 26 13:45:09 2012 +0200
+++ b/hgext/obsolete.py	Thu Jul 26 13:40:32 2012 +0200
@@ -371,14 +371,14 @@
     """
     # do not push instability
     for h in outgoing.missingheads:
-        # checking heads only is enought because any thing base on obsolete
-        # changeset is either obsolete or unstable.
+        # Checking heads is enough, obsolete descendants are either
+        # obsolete or unstable.
         ctx = repo[h]
         if ctx.latecomer():
-            raise util.Abort(_("push includes an latecomer changeset: %s!")
+            raise util.Abort(_("push includes a latecomer changeset: %s!")
                              % ctx)
         if ctx.conflicting():
-            raise util.Abort(_("push includes conflicting changeset: %s!")
+            raise util.Abort(_("push includes a conflicting changeset: %s!")
                              % ctx)
     return orig(repo, remote, outgoing, *args, **kwargs)
 
@@ -774,7 +774,8 @@
             try:
                 result = opush(remote, *args, **opts)
             except util.Abort, ex:
-                hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
+                hint = _("use 'hg stabilize' to get a stable history "
+                         "or --force to ignore warnings")
                 if (len(ex.args) >= 1
                     and ex.args[0].startswith('push includes ')
                     and ex.hint is None):
--- a/tests/test-obsolete.t	Thu Jul 26 13:45:09 2012 +0200
+++ b/tests/test-obsolete.t	Thu Jul 26 13:40:32 2012 +0200
@@ -160,7 +160,7 @@
   pushing to ../other-new
   searching for changes
   abort: push includes an unstable changeset: a7a6f2b5d8a5!
-  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  (use 'hg stabilize' to get a stable history or --force to ignore warnings)
   [255]
   $ hg push -f ../other-new
   pushing to ../other-new
@@ -213,7 +213,7 @@
   pushing to ../other-new
   searching for changes
   abort: push includes an unstable changeset: 95de7fc6918d!
-  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  (use 'hg stabilize' to get a stable history or --force to ignore warnings)
   [255]
   $ hg push ../other-new -f # use f because there is unstability
   pushing to ../other-new
@@ -282,7 +282,7 @@
   pushing to ../other-old
   searching for changes
   abort: push includes an unstable changeset: 909a0fb57e5d!
-  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  (use 'hg stabilize' to get a stable history or --force to ignore warnings)
   [255]
   $ hg push -f ../other-old
   pushing to ../other-old
@@ -532,8 +532,8 @@
   $ hg push ../other-new/
   pushing to ../other-new/
   searching for changes
-  abort: push includes an latecomer changeset: 6db5e282cb91!
-  (use 'hg stabilize' to get a stable history (or --force to proceed))
+  abort: push includes a latecomer changeset: 6db5e282cb91!
+  (use 'hg stabilize' to get a stable history or --force to ignore warnings)
   [255]
 
 Check hg commit --amend compat
evolve