# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1365816926 25200
# Node ID acb34d7159bd07ccea64a1605e61e6083697b3ad
# Parent  d2647edb17827a3b7d484fd190a1cee1debde096# Parent  5093d2a87ff6fb99d054aa1006a2c2073c467584
merge away some failed evolve fat-fingering

diff -r 5093d2a87ff6 -r acb34d7159bd hgext/color.py
--- a/hgext/color.py	Fri Apr 12 17:20:09 2013 -0700
+++ b/hgext/color.py	Fri Apr 12 18:35:26 2013 -0700
@@ -103,7 +103,7 @@
 import os
 
 from mercurial import commands, dispatch, extensions, ui as uimod, util
-from mercurial import templater
+from mercurial import templater, error
 from mercurial.i18n import _
 
 testedwith = 'internal'
diff -r 5093d2a87ff6 -r acb34d7159bd hgext/largefiles/proto.py
--- a/hgext/largefiles/proto.py	Fri Apr 12 17:20:09 2013 -0700
+++ b/hgext/largefiles/proto.py	Fri Apr 12 18:35:26 2013 -0700
@@ -16,6 +16,11 @@
                            '\n\nPlease enable it in your Mercurial config '
                            'file.\n')
 
+# these will all be replaced by largefiles.uisetup
+capabilitiesorig = None
+ssholdcallstream = None
+httpoldcallstream = None
+
 def putlfile(repo, proto, sha):
     '''Put a largefile into a repository's local store and into the
     user cache.'''
diff -r 5093d2a87ff6 -r acb34d7159bd hgext/pager.py
--- a/hgext/pager.py	Fri Apr 12 17:20:09 2013 -0700
+++ b/hgext/pager.py	Fri Apr 12 18:35:26 2013 -0700
@@ -47,7 +47,7 @@
 normal behavior.
 '''
 
-import atexit, sys, os, signal, subprocess
+import atexit, sys, os, signal, subprocess, errno, shlex
 from mercurial import commands, dispatch, util, extensions
 from mercurial.i18n import _
 
diff -r 5093d2a87ff6 -r acb34d7159bd hgext/transplant.py
--- a/hgext/transplant.py	Fri Apr 12 17:20:09 2013 -0700
+++ b/hgext/transplant.py	Fri Apr 12 18:35:26 2013 -0700
@@ -294,10 +294,10 @@
 
         return n
 
-    def resume(self, repo, source, opts=None):
+    def resume(self, repo, source, opts):
         '''recover last transaction and apply remaining changesets'''
         if os.path.exists(os.path.join(self.path, 'journal')):
-            n, node = self.recover(repo)
+            n, node = self.recover(repo, opts)
             self.ui.status(_('%s transplanted as %s\n') % (short(node),
                                                            short(n)))
         seriespath = os.path.join(self.path, 'series')
@@ -312,7 +312,7 @@
 
         self.apply(repo, source, revmap, merges, opts)
 
-    def recover(self, repo):
+    def recover(self, repo, opts):
         '''commit working directory using journal metadata'''
         node, user, date, message, parents = self.readlog()
         merge = False
diff -r 5093d2a87ff6 -r acb34d7159bd mercurial/repoview.py
--- a/mercurial/repoview.py	Fri Apr 12 17:20:09 2013 -0700
+++ b/mercurial/repoview.py	Fri Apr 12 18:35:26 2013 -0700
@@ -36,6 +36,7 @@
             blockers.append(repo[bm].rev())
         blocked = cl.ancestors(blockers, inclusive=True)
         return frozenset(r for r in hideable if r not in blocked)
+    return frozenset()
 
 def computeunserved(repo):
     """compute the set of revision that should be filtered when used a server
@@ -54,7 +55,6 @@
         return frozenset(hiddens | secrets)
     else:
         return hiddens
-    return frozenset()
 
 def computemutable(repo):
     """compute the set of revision that should be filtered when used a server