Anonymous avatar Anonymous committed 6ef9363

Fix for Mercurial 1.2

Comments (0)

Files changed (2)

 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:
 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
                                                   remove=('bundle',),
                                                   table=hgext.fetch.cmdtable),
                                     _('hg ffetch [OPTION]... [SOURCE]'))})
-    except findcmd.UnknownCommand:
+    except UnknownCommand:
         return
 
 commands.norepo += " fclone fseed"
 
 # 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
 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
 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]
 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]
 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]
 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]
 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]
 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
 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]
 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]
 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]
 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
 
 .
 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]
 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]
 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
 
 .
 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]
 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]
 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]
 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]
 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
 
 .
 
 # 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]
 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
 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
 .
 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
 
 [.]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.