Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge

Changeset b40200540d59…

Parents 02a11a1973b8…

Parents d49805b2d53c…

by Steve Borho

Changes to 2 files · Browse files at b40200540d59 Showing diff from parent 02a11a1973b8 d49805b2d53c Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​hgtk.py Stacked
 
6
7
8
9
 
10
11
12
 
15
16
17
18
19
20
21
22
23
24
 
 
25
26
27
 
34
35
36
 
 
 
 
37
38
39
 
6
7
8
 
9
10
11
12
 
15
16
17
 
 
 
18
19
20
 
21
22
23
24
25
 
32
33
34
35
36
37
38
39
40
41
@@ -6,7 +6,7 @@
 # Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>    shortlicense = '''\ -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2009 Steve Borho <steve@borho.org>.  This is free software; see the source for copying conditions. There is NO  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  ''' @@ -15,13 +15,11 @@
 # alternatively, you can change this line or set TORTOISEHG_PATH  tortoisehg_dir = '~/tools/tortoisehg-dev'   -import os -import sys -import traceback  import pygtk  pygtk.require('2.0')  import gtk -import shlex + +from mercurial import demandimport; demandimport.enable()  from mercurial.i18n import _  from mercurial import hg, util, fancyopts, commands, cmdutil  import mercurial.ui as _ui @@ -34,6 +32,10 @@
  from mercurial.cmdutil import UnknownCommand, AmbiguousCommand   from mercurial.dispatch import ParseError   +import os +import sys +import traceback +  nonrepo_commands = 'userconfig clone init about help version'    def dispatch(args):
Change 1 of 1 Show Entire File hgtk Stacked
 
6
7
8
9
10
11
 
12
13
14
15
16
17
 
 
 
 
 
18
19
20
 
6
7
8
 
9
 
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
@@ -6,15 +6,19 @@
 # Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>  #   -  shortlicense = '''\ -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2009 Steve Borho <steve@borho.org>.  This is free software; see the source for copying conditions. There is NO  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  '''    TORTOISEHG_PATH = '~/tools/tortoisehg-dev'   +import pygtk +pygtk.require('2.0') +import gtk + +from mercurial import demandimport; demandimport.enable()  import sys    if not hasattr(sys, "frozen"):