merge with stable

authorPierre-Yves David <pierre-yves.david@logilab.fr>
changeset300e00d5d93f
branchdefault
phasepublic
hiddenno
parent revision#32d191e8504d Remove sys.path manipulation (closes #113034), #7ec57cb25d12 [compat] handle filtered repository
child revision#df71049376bb spelling: fix some typos and frenchisms and sloppiness
files modified by this revision
hgext/hgview.py
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1355148158 -3600
# Mon Dec 10 15:02:38 2012 +0100
# Node ID 300e00d5d93f5a1d941d5c8bb10707b443b6b238
# Parent 7ec57cb25d12fbfbc03bb03af32ce726c7a967d4
# Parent 32d191e8504d3984dc2cd5e2defbceb00df3c711
merge with stable

diff --git a/hgext/hgview.py b/hgext/hgview.py
@@ -16,11 +16,11 @@
1  buglink = 'https://www.logilab.org/project/hgview'
2 
3  import os
4  from optparse import Values
5  from mercurial import error
6 -    
7 +
8  # every command must take a ui and and repo as arguments.
9  # opts is a dict where you can find other command line flags
10  #
11  # Other parameters are taken in order from items on the command line that
12  # don't start with a dash.  If no default value is given in the parameter list,
@@ -57,21 +57,17 @@
13          from hgconf.uname import hook
14          hook(ui, repo)
15      except ImportError:
16          pass
17 
18 -    import sys
19 -    sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
20      from hgviewlib.application import start
21      def fnerror(text):
22          """process errors"""
23          raise(error.Abort(text))
24      options = Values(opts)
25      start(repo, options, pats, fnerror)
26 
27 -import sys
28 -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
29  import hgviewlib.hgviewhelp as hghelp
30 
31  start_hgview.__doc__ = hghelp.long_help_msg
32 
33  cmdtable = {