by
Changes to 7 files · Browse files at 79e07253b822 Showing diff from parent 209a98577d93 0b48ab113179 Diff from another changeset...
@@ -337,13 +337,7 @@ return self.menuitems.get(label, None)
def get_reponame(self):
- if self.repo.ui.config('tortoisehg', 'fullpath', False):
- name = self.repo.root
- elif self.repo.ui.config('web', 'name', False):
- name = self.repo.ui.config('web', 'name')
- else:
- name = os.path.basename(self.repo.root)
- return hglib.toutf(name)
+ return hglib.get_reponame(self.repo)
def helpcontents(self, item):
'User selected Help->Contents from menu bar'
|
@@ -24,6 +24,7 @@ gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
gtklib.set_tortoise_icon(self, 'menumerge.ico')
gtklib.set_tortoise_keys(self)
+ self.set_default_size(350, 120)
self.notify_func = None
if not rev:
@@ -37,10 +38,7 @@ except hglib.RepoError:
gobject.idle_add(self.destroy)
return
-
- title = _("Merging in ") + hglib.toutf(os.path.basename(repo.root))
- self.set_title(title)
- self.set_default_size(350, 120)
+ self.set_title(_('Merging in %s') % hglib.get_reponame(repo))
vbox = gtk.VBox()
self.add(vbox)
|
@@ -26,16 +26,18 @@ gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
gtklib.set_tortoise_icon(self, 'general.ico')
gtklib.set_tortoise_keys(self)
+ self.set_default_size(600, 400)
+ self.connect('delete-event', self._delete)
+ self.hgthread = None
- self.root = paths.find_root()
- self.selected_path = None
- self.hgthread = None
- self.connect('delete-event', self._delete)
-
- self.set_default_size(600, 400)
-
- name = os.path.basename(os.path.abspath(self.root))
- self.set_title(_('TortoiseHg Recovery - ') + hglib.toutf(name))
+ try:
+ repo = hg.repository(ui.ui(), path=paths.find_root())
+ except hglib.RepoError:
+ gobject.idle_add(self.destroy)
+ return
+ self.repo = repo
+ self.reponame = hglib.get_reponame(repo)
+ self.set_title(_('Recovery - %s') % self.reponame)
# toolbar
self.tbar = gtk.Toolbar()
@@ -118,25 +120,20 @@
def _clean_clicked(self, toolbutton, data=None):
response = gdialog.Confirm(_('Confirm clean repository'), [], self,
- _("Clean repository '%s' ?") % os.path.basename(self.root)).run()
+ _("Clean repository '%s' ?") % self.reponame).run()
if response != gtk.RESPONSE_YES:
return
- try:
- repo = hg.repository(ui.ui(), path=self.root)
- except hglib.RepoError:
- self.write(_('Unable to find repo at %s\n') % (self.root), False)
- return
- pl = repo.parents()
+ pl = self.repo.parents()
cmd = ['update', '--clean', '--rev', str(pl[0].rev())]
self._exec_cmd(cmd, postfunc=self._notify)
def _notify(self, ret, *args):
time.sleep(0.5) # give fs some time to pick up changes
- shlib.shell_notify([self.root])
+ shlib.shell_notify([self.repo.root])
def _rollback_clicked(self, toolbutton, data=None):
response = gdialog.Confirm(_('Confirm rollback repository'), [], self,
- _("Rollback repository '%s' ?") % os.path.basename(self.root)).run()
+ _("Rollback repository '%s' ?") % self.reponame).run()
if response != gtk.RESPONSE_YES:
return
cmd = ['rollback']
@@ -165,7 +162,7 @@ cmdline = cmd
cmdline.append('--verbose')
cmdline.append('--repository')
- cmdline.append(self.root)
+ cmdline.append(self.repo.root)
# show command to be executed
self.write("", False)
|
@@ -23,14 +23,16 @@ """ Dialog to add tag to Mercurial repo """
def __init__(self, repo, tag='', rev=''):
""" Initialize the Dialog """
- root = hglib.toutf(os.path.basename(repo.root))
- gtk.Dialog.__init__(self, title=_('TortoiseHg Tag - %s') % root,
- buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
+ gtk.Dialog.__init__(self,
+ buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
gtklib.set_tortoise_keys(self)
+ self.set_title(_('Tag - %s') % hglib.get_reponame(repo))
self.set_resizable(False)
self.set_has_separator(False)
self.connect('response', self.dialog_response)
+ self.repo = repo
+
# add Add button
addbutton = gtk.Button(_('Add'))
addbutton.connect('clicked', lambda b: self._do_add_tag())
@@ -44,8 +46,6 @@ # persistent settings
self.settings = settings.Settings('tagadd')
- self.repo = repo
-
# top layout table
table = gtklib.LayoutTable()
self.vbox.pack_start(table, True, True, 2)
|
@@ -36,13 +36,11 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- self.repo = repo
except hglib.RepoError:
gobject.idle_add(self.destroy)
return
-
- reponame = hglib.toutf(os.path.basename(repo.root))
- self.set_title(_('Update - %s') % reponame)
+ self.repo = repo
+ self.set_title(_('Update - %s') % hglib.get_reponame(repo))
# add dialog buttons
self.updatebtn = self.add_button(_('Update'), gtk.RESPONSE_OK)
|
@@ -194,6 +194,15 @@ u.setconfig('defaults', k, '')
return dispatch._dispatch(u, list(args))
+def get_reponame(repo):
+ if repo.ui.config('tortoisehg', 'fullpath', False):
+ name = repo.root
+ elif repo.ui.config('web', 'name', False):
+ name = repo.ui.config('web', 'name')
+ else:
+ name = os.path.basename(repo.root)
+ return toutf(name)
+
def displaytime(date):
return util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2')
|
Loading...