# HG changeset patch
# User Yuki KODAMA <endflow....@gmail.com>
# Date 1252546627 -32400
# Node ID d6e701f0054714338b670c947dce66218177aa90
# Parent  09d91869d0df6334d4b8d0d072d9b9754c463257
gdialog: respect 'tortoisehg.fullpath' setting

diff --git a/hggtk/changeset.py b/hggtk/changeset.py
--- a/hggtk/changeset.py
+++ b/hggtk/changeset.py
@@ -27,7 +27,7 @@
         self.glog_parent = None

     def get_title(self):
-        title = toutf(os.path.basename(self.repo.root)) + ' changeset '
+        title = _('%s changeset ') % self.get_reponame()
         rev = self.opts['rev']
         if isinstance(rev, str):
             title += rev
diff --git a/hggtk/commit.py b/hggtk/commit.py
--- a/hggtk/commit.py
+++ b/hggtk/commit.py
@@ -135,7 +135,7 @@
         GStatus.parse_opts(self)

     def get_title(self):
-        root = hglib.toutf(os.path.basename(self.repo.root))
+        root = self.get_reponame()
         user = self.opts.get('user')
         if user: user = 'as ' + user
         date = self.opts.get('date')
diff --git a/hggtk/datamine.py b/hggtk/datamine.py
--- a/hggtk/datamine.py
+++ b/hggtk/datamine.py
@@ -34,7 +34,7 @@
     COL_LINENUM = 6

     def get_title(self):
-        return _('DataMining') + ' - ' +
hglib.toutf(os.path.basename(self.repo.root))
+        return _('%s - DataMining') % self.get_reponame()

     def get_icon(self):
         return 'menurepobrowse.ico'
diff --git a/hggtk/gdialog.py b/hggtk/gdialog.py
--- a/hggtk/gdialog.py
+++ b/hggtk/gdialog.py
@@ -314,6 +314,13 @@
     def get_toolbutton(self, label):
         return self.toolbuttons[label]

+    def get_reponame(self):
+        if self.repo.ui.config('tortoisehg', 'fullpath', False):
+            name = self.repo.root
+        else:
+            name = os.path.basename(self.repo.root)
+        return hglib.toutf(name)
+
     def windowstate(self, window, event):
         if event.changed_mask & gtk.gdk.WINDOW_STATE_MAXIMIZED:
             if event.new_window_state & gtk.gdk.WINDOW_STATE_MAXIMIZED:
diff --git a/hggtk/history.py b/hggtk/history.py
--- a/hggtk/history.py
+++ b/hggtk/history.py
@@ -45,7 +45,7 @@
         self.exs = [ name for name, module in extensions.extensions() ]

     def get_title(self):
-        return hglib.toutf(os.path.basename(self.repo.root)) + ' log'
+        return _('%s log') % self.get_reponame()

     def get_icon(self):
         return 'menulog.ico'
diff --git a/hggtk/status.py b/hggtk/status.py
--- a/hggtk/status.py
+++ b/hggtk/status.py
@@ -130,7 +130,7 @@


     def get_title(self):
-        root = hglib.toutf(os.path.basename(self.repo.root))
+        root = self.get_reponame()
         revs = self.opts.get('rev')
         name = self.pats and _('filtered status') or _('status')
         r = revs and ':'.join(revs) or ''
diff --git a/hggtk/thgconfig.py b/hggtk/thgconfig.py
--- a/hggtk/thgconfig.py
+++ b/hggtk/thgconfig.py
@@ -518,7 +518,7 @@
             root = paths.find_root()
             if root:
                 repo = hg.repository(self.ui, root)
-                name = repo.ui.config('web', 'name') or os.path.basename(root)
+                name = self.get_reponame(repo)
                 self.ui = repo.ui
             else:
                 repo = None
@@ -628,10 +628,18 @@
         self.configrepo = combo.get_active() and True or False
         self.refresh()

+    def get_reponame(self, repo):
+        if repo.ui.config('tortoisehg', 'fullpath', False):
+            name = repo.root
+        else:
+            name = repo.ui.config('web', 'name') \
+                        or os.path.basename(repo.root)
+        return hglib.toutf(name)
+
     def refresh(self):
         if self.configrepo:
             repo = hg.repository(ui.ui(), self.root)
-            name = repo.ui.config('web', 'name') or os.path.basename(repo.root)
+            name = self.get_reponame(repo)
             self.rcpath = [os.sep.join([repo.root, '.hg', 'hgrc'])]
             self.set_title(_('TortoiseHg Configure Repository - ') +
hglib.toutf(name))
             gtklib.set_tortoise_icon(self, 'settings_repo.ico')

Attachment: thg-kuy_rev3917.patch
Description: Binary data

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to