# HG changeset patch # User Simon Law # Date 1237395321 14400 # Node ID 6ef9363eaba084e39d3350a0c99b5316879768df # Parent 67003e27eb794c9e7dbeb3bef68f2d5d572c6163 Fix for Mercurial 1.2 diff -r 67003e27eb79 -r 6ef9363eaba0 forest.py --- a/forest.py Sat Oct 25 14:54:54 2008 +0200 +++ b/forest.py Wed Mar 18 12:55:21 2009 -0400 @@ -58,7 +58,16 @@ from mercurial import cmdutil, commands, hg, hgweb, node, util from mercurial import localrepo, sshrepo, sshserver, httprepo, statichttprepo from mercurial.i18n import gettext as _ -from mercurial.repo import RepoError + +# Import exceptions with backwards compatibility +try: + from mercurial.error import RepoError, UnknownCommand +except ImportError: + from mercurial.repo import RepoError + try: + from mercurial.cmdutil import UnknownCommand + except ImportError: + from mercurial.commands import UnknownCommand # For backwards compatibility, we need the following function definition. # If we didn't want that, we'd have just written: @@ -75,11 +84,9 @@ try: findcmd.findcmd = cmdutil.findcmd findcmd.__doc__ = cmdutil.findcmd.__doc__ - findcmd.UnknownCommand = cmdutil.UnknownCommand except AttributeError: findcmd.findcmd = commands.findcmd findcmd.__doc__ = commands.findcmd.__doc__ - findcmd.UnknownCommand = commands.UnknownCommand # For backwards compatibility, find the parseurl() function that splits # urls and revisions. Mercurial 0.9.3 doesn't have this, so we need @@ -1393,7 +1400,7 @@ remove=('bundle',), table=hgext.fetch.cmdtable), _('hg ffetch [OPTION]... [SOURCE]'))}) - except findcmd.UnknownCommand: + except UnknownCommand: return commands.norepo += " fclone fseed" diff -r 67003e27eb79 -r 6ef9363eaba0 test-forest.out --- a/test-forest.out Sat Oct 25 14:54:54 2008 +0200 +++ b/test-forest.out Wed Mar 18 12:55:21 2009 -0400 @@ -37,23 +37,18 @@ # fclone [.] -updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap @@ -198,7 +193,6 @@ summary: new line # fseed -updating working directory 4 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] requesting all changes @@ -206,7 +200,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] @@ -215,7 +208,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -224,7 +216,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -233,7 +224,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [tree1] @@ -372,7 +362,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -381,7 +370,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # foutgoing @@ -595,7 +583,6 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] @@ -604,7 +591,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -613,7 +599,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -622,7 +607,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -635,7 +619,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -644,7 +627,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -653,7 +635,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -691,7 +672,6 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] @@ -700,7 +680,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] @@ -709,7 +688,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -718,7 +696,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t/t] @@ -727,7 +704,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved . @@ -780,15 +756,12 @@ # fclone + mq [.] -updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [e/d] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [t] @@ -798,7 +771,6 @@ skipped: 't/t' has mq patches applied [t/t/.hg/patches] -updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap + mq @@ -864,7 +836,7 @@ skipped: 't/t' has mq patches applied [t/t/.hg/patches] -skipped: branch default not found +0 files updated, 0 files merged, 0 files removed, 0 files unresolved # walk **/.hg . @@ -897,15 +869,12 @@ adding f adding f [.] -updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved [a] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [b] -updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [.]