[PATCH 5 of 6] require: add a mention that the incompatible repository is local

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sat Jun 18 06:10:03 CDT 2011


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1308395190 -7200
# Node ID 2adef5173ae7566867fbb6d1cba76fd3711f1653
# Parent  fb1caa6ef3682bf9471fb7fb8bc1ed6e8bc420c8
require: add a mention that the incompatible repository is local

This highlight the fact that such compatibility issue are only possible with
local repository.

diff -r fb1caa6ef368 -r 2adef5173ae7 mercurial/dispatch.py
--- a/mercurial/dispatch.py	Sat Jun 18 11:51:33 2011 +0200
+++ b/mercurial/dispatch.py	Sat Jun 18 13:06:30 2011 +0200
@@ -124,7 +124,7 @@
             ui.warn(_("hg: %s\n") % inst.args[1])
             commands.help_(ui, 'shortlist')
     except error.MissingRequirementError, inst:
-        msg = _("abort: mercurial %s can not read this repository!\n")
+        msg = _("abort: mercurial %s can not read this local repository!\n")
         ui.warn(_(msg % util.version()))
         msg = _("       It requires feature '%s'.\n")
         ui.warn(_(msg % inst.missing))
diff -r fb1caa6ef368 -r 2adef5173ae7 tests/test-commit.t
--- a/tests/test-commit.t	Sat Jun 18 11:51:33 2011 +0200
+++ b/tests/test-commit.t	Sat Jun 18 13:06:30 2011 +0200
@@ -98,7 +98,7 @@
   $ echo foo >> foo
   $ echo fake >> .hg/requires
   $ hg commit -m bla
-  abort: mercurial 1.8.4+158-bb7e9bbe26ef+20110618 can not read this repository!
+  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this local repository! (re)
          It requires feature 'fake'.
   (see http://mercurial.selenic.com/wiki/RequiresFile for details)
   [255]
diff -r fb1caa6ef368 -r 2adef5173ae7 tests/test-identify.t
--- a/tests/test-identify.t	Sat Jun 18 11:51:33 2011 +0200
+++ b/tests/test-identify.t	Sat Jun 18 13:06:30 2011 +0200
@@ -107,14 +107,14 @@
 
   $ echo fake >> .hg/requires
   $ hg id
-  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this repository! (re)
+  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this local repository! (re)
          It requires feature 'fake'.
   (see http://mercurial.selenic.com/wiki/RequiresFile for details)
   [255]
 
   $ cd ..
   $ hg id test
-  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this repository! (re)
+  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this local repository! (re)
          It requires feature 'fake'.
   (see http://mercurial.selenic.com/wiki/RequiresFile for details)
   [255]
diff -r fb1caa6ef368 -r 2adef5173ae7 tests/test-requires.t
--- a/tests/test-requires.t	Sat Jun 18 11:51:33 2011 +0200
+++ b/tests/test-requires.t	Sat Jun 18 13:06:30 2011 +0200
@@ -9,7 +9,7 @@
   [255]
   $ echo indoor-pool > .hg/requires
   $ hg tip
-  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this repository! (re)
+  abort: mercurial \d+.\d+.\d+[-+0-9a-f]* can not read this local repository! (re)
          It requires feature 'indoor-pool'.
   (see http://mercurial.selenic.com/wiki/RequiresFile for details)
   [255]


More information about the Mercurial-devel mailing list