components/mercurial/patches/hgk.patch
branchs11-update
changeset 4321 38b0ccd2f460
parent 821 5450c885c205
equal deleted inserted replaced
4318:7f2f7aebce6e 4321:38b0ccd2f460
     1 # 6542518 hg view does not work
     1 Make the hgk extension find the GUI bits as installed on Solaris without
       
     2 making the user do any extra configuration.  Because this is patch is
       
     3 specific to Solaris, it's not appropriate for sending upstream, and because
       
     4 it's so simple, it's effectively a zero maintenance burden.
     2 
     5 
     3 --- mercurial-2.2.1/hgext/hgk.py	Thu May  3 14:06:28 2012
     6 --- mercurial-3.4/hgext/hgk.py.orig	Fri May  1 14:48:50 2015
     4 +++ mercurial-2.2.1/hgext/hgk.py	Sat May 12 17:31:15 2012
     7 +++ mercurial-3.4/hgext/hgk.py	Mon May  4 14:43:19 2015
     5 @@ -307,7 +307,7 @@
     8 @@ -326,6 +326,6 @@
     6      "start interactive history viewer"
     9      if repo.filtername is None:
     7      os.chdir(repo.root)
    10          optstr += '--hidden'
     8      optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
    11  
     9 -    cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
    12 -    cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
    10 +    cmd = ui.config("hgk", "path", "/usr/demo/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
    13 +    cmd = ui.config("hgk", "path", "/usr/demo/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
    11      ui.debug("running %s\n" % cmd)
    14      ui.debug("running %s\n" % cmd)
    12      util.system(cmd)
    15      ui.system(cmd)
    13