components/mercurial/patches/hgk.patch
author Danek Duvall <danek.duvall@oracle.com>
Wed, 06 May 2015 10:05:59 -0700
changeset 4263 078df530ebdb
parent 821 5450c885c205
permissions -rw-r--r--
21029166 mercurial 3.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     1
Make the hgk extension find the GUI bits as installed on Solaris without
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     2
making the user do any extra configuration.  Because this is patch is
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     3
specific to Solaris, it's not appropriate for sending upstream, and because
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     4
it's so simple, it's effectively a zero maintenance burden.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     6
--- mercurial-3.4/hgext/hgk.py.orig	Fri May  1 14:48:50 2015
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     7
+++ mercurial-3.4/hgext/hgk.py	Mon May  4 14:43:19 2015
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     8
@@ -326,6 +326,6 @@
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     9
     if repo.filtername is None:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    10
         optstr += '--hidden'
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    11
 
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
-    cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
+    cmd = ui.config("hgk", "path", "/usr/demo/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
     ui.debug("running %s\n" % cmd)
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    15
     ui.system(cmd)