Browse files

bug 731989, hotfix to support mercurial 2.1 in addition to previous v…

…ersions, r=peterbe
  • Loading branch information...
1 parent 7cee3d8 commit c591396174deb95a71d95bd36203dd5ff3aef714 @Pike Pike committed Mar 8, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 apps/shipping/views/
8 apps/shipping/views/
@@ -60,7 +60,13 @@
from mercurial.ui import ui as _ui
from mercurial.hg import repository
from mercurial.node import nullid
-from mercurial.copies import copies as _copies
+ from mercurial.copies import copies as _copies
+except ImportError:
+ # mercurial 2.1
+ from mercurial.copies import pathcopies
+ def _copies(repo, ctx1, ctx2, base):
+ return (pathcopies(ctx1, ctx2),)
from Mozilla.Parser import getParser, Junk
from Mozilla.CompareLocales import AddRemove, Tree as DataTree

0 comments on commit c591396

Please sign in to comment.