Mercurial > hg
changeset 18924:acb34d7159bd
merge away some failed evolve fat-fingering
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Fri, 12 Apr 2013 18:35:26 -0700 |
parents | d2647edb1782 (diff) 5093d2a87ff6 (current diff) |
children | 8deaa703a622 |
files | mercurial/repoview.py |
diffstat | 5 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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'
--- 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.'''
--- 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 _
--- 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
--- 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