| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 02 May 2017 17:33:26 -0700 | |
| changeset 7964 | d9801318ed3d |
| parent 4263 | 078df530ebdb |
| permissions | -rw-r--r-- |
|
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 | 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 | 12 |
- cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
|
13 |
+ cmd = ui.config("hgk", "path", "/usr/demo/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
|
|
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) |