We are currently indexing your data, so search results may be incomplete until we finish.
update: cleanup update dialog, streamline processes
remove features, add keyboard accelerators, make defaults efficient.
add --rev option to hgtk update
Fixes #97
Changeset 71d7e381eca0…
Parent 3a396cf032e4…
by
Changes to 2 files · Browse files at 71d7e381eca0 Showing diff from parent 3a396cf032e4 Diff from another changeset...
|
@@ -593,7 +593,9 @@ (serve,
[('', 'webdir-conf', '', _('name of the webdir config file'))],
_('hgtk serve [OPTION]...')),
- "^update|checkout|co": (update, [], _('hgtk update')),
+ "^update|checkout|co": (update,
+ [('r', 'rev', '', _('revision to update'))],
+ ('hgtk update')),
"^vdiff": (vdiff,
[('c', 'change', '', _('changeset to view in diff tool')),
('r', 'rev', [], _('revisions to view in diff tool'))],
|
||
|
|
|
@@ -16,6 +16,8 @@ import hgcmd
import gdialog
+_branch_tip_ = _('= Current Branch Tip =')
+
class UpdateDialog(gtk.Window):
""" Dialog to update Mercurial repo """
def __init__(self, rev=None):
@@ -23,163 +25,88 @@ gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
shlib.set_tortoise_icon(self, 'menucheckout.ico')
shlib.set_tortoise_keys(self)
- self.root = rootpath()
- self.rev = rev
+
+ self.set_default_size(350, 120)
self.notify_func = None
- u = ui.ui()
try:
- self.repo = hg.repository(u, path=self.root)
+ repo = hg.repository(ui.ui())
except RepoError:
- return None
+ self.destroy()
- # set dialog title
- title = "hg update - %s" % toutf(self.root)
+ title = "hg update - %s" % toutf(os.path.basename(repo.root))
self.set_title(title)
- self._create()
+ vbox = gtk.VBox()
+ self.add(vbox)
+
+ hbox = gtk.HBox()
+ lbl = gtk.Label(_('Update to:'))
+ hbox.pack_start(lbl, False, False, 2)
+
+ # revisions combo box
+ combo = gtk.combo_box_new_text()
+ hbox.pack_start(combo, True, True, 2)
+ vbox.pack_start(hbox, False, False, 10)
+ if rev:
+ combo.append_text(str(rev))
+ else:
+ combo.append_text(_branch_tip_)
+ combo.set_active(0)
+ for b in repo.branchtags():
+ combo.append_text(b)
+ tags = list(repo.tags())
+ tags.sort()
+ tags.reverse()
+ for t in tags:
+ combo.append_text(t)
+
+ self.overwrite = gtk.CheckButton(_('Overwrite local changes'))
+ vbox.pack_start(self.overwrite, False, False, 10)
+
+ hbbox = gtk.HButtonBox()
+ hbbox.set_layout(gtk.BUTTONBOX_END)
+ vbox.pack_start(hbbox, False, False, 2)
+ close = gtk.Button(_('Close'))
+ close.connect('clicked', lambda x: self.destroy())
+
+ accelgroup = gtk.AccelGroup()
+ self.add_accel_group(accelgroup)
+ key, modifier = gtk.accelerator_parse('Escape')
+ close.add_accelerator('clicked', accelgroup, key, 0,
+ gtk.ACCEL_VISIBLE)
+ hbbox.add(close)
+
+ update = gtk.Button(_('Update'))
+ update.connect('clicked', self.update, combo, repo)
+ mod = shlib.get_thg_modifier()
+ key, modifier = gtk.accelerator_parse(mod+'Return')
+ update.add_accelerator('clicked', accelgroup, key, modifier,
+ gtk.ACCEL_VISIBLE)
+ update.grab_focus()
+ hbbox.add(update)
+
+ def update(self, button, combo, repo):
+ overwrite = self.overwrite.get_active()
+ rev = combo.get_active_text()
+
+ cmdline = ['hg', 'update', '--verbose']
+ if rev != _branch_tip_:
+ cmdline.append('--rev')
+ cmdline.append(rev)
+ if overwrite:
+ cmdline.append('--clean')
+ dlg = hgcmd.CmdDialog(cmdline)
+ dlg.run()
+ dlg.hide()
+ if self.notify_func:
+ self.notify_func(self.notify_args)
+ if dlg.returncode == 0:
+ self.destroy()
def set_notify_func(self, func, *args):
self.notify_func = func
self.notify_args = args
- def _create(self):
- self.set_default_size(350, 120)
-
- # add toolbar with tooltips
- self.tbar = gtk.Toolbar()
- self.tips = gtk.Tooltips()
-
- self._btn_update = self._toolbutton(
- gtk.STOCK_REVERT_TO_SAVED, _('Update'),
- self._btn_update_clicked,
- tip=_('Update working directory to selected revision'))
- tbuttons = [
- self._btn_update,
- ]
- for btn in tbuttons:
- self.tbar.insert(btn, -1)
- vbox = gtk.VBox()
- self.add(vbox)
- vbox.pack_start(self.tbar, False, False, 2)
-
- # repo parent revisions
- parentbox = gtk.HBox()
- lbl = gtk.Label(_('Parent revisions:'))
- lbl.set_property('width-chars', 18)
- lbl.set_alignment(0, 0.5)
- self._parent_revs = gtk.Entry()
- self._parent_revs.set_sensitive(False)
- parentbox.pack_start(lbl, False, False)
- parentbox.pack_start(self._parent_revs, False, False)
- vbox.pack_start(parentbox, False, False, 2)
-
- # revision input
- revbox = gtk.HBox()
- lbl = gtk.Label(_('Update to revision:'))
- lbl.set_property('width-chars', 18)
- lbl.set_alignment(0, 0.5)
-
- # revisions combo box
- self._revlist = gtk.ListStore(str, str)
- self._revbox = gtk.ComboBoxEntry(self._revlist, 0)
-
- # add extra column to droplist for type of changeset
- cell = gtk.CellRendererText()
- self._revbox.pack_start(cell)
- self._revbox.add_attribute(cell, 'text', 1)
- self._rev_input = self._revbox.get_child()
-
- # setup buttons
- self._btn_rev_browse = gtk.Button(_('Browse...'))
- self._btn_rev_browse.connect('clicked', self._btn_rev_clicked)
- revbox.pack_start(lbl, False, False)
- revbox.pack_start(self._revbox, False, False)
- revbox.pack_start(self._btn_rev_browse, False, False, 5)
- vbox.pack_start(revbox, False, False, 2)
-
- self._overwrite = gtk.CheckButton(_('Overwrite local changes'))
- vbox.pack_end(self._overwrite, False, False, 10)
-
- # show them all
- self._refresh()
-
- def _toolbutton(self, stock, label, handler,
- menu=None, userdata=None, tip=None):
- if menu:
- tbutton = gtk.MenuToolButton(stock)
- tbutton.set_menu(menu)
- else:
- tbutton = gtk.ToolButton(stock)
-
- tbutton.set_label(label)
- if tip:
- tbutton.set_tooltip(self.tips, tip)
- tbutton.connect('clicked', handler, userdata)
- return tbutton
-
- def _refresh(self):
- """ update display on dialog with recent repo data """
- try:
- # FIXME: force hg to refresh parents info
- del self.repo
- self.repo = hg.repository(ui.ui(), path=self.root)
- except RepoError:
- return None
-
- # populate parent rev data
- self._parents = [x.node() for x in self.repo.changectx(None).parents()]
- self._parent_revs.set_text(", ".join([short(x) for x in self._parents]))
-
- # populate revision data
- heads = self.repo.heads()
- tip = self.repo.changelog.node(nullrev+len(self.repo.changelog))
- self._revlist.clear()
- for i, node in enumerate(heads):
- status = "head %d" % (i+1)
- if node == tip:
- status += ", tip"
- self._revlist.append([short(node), "(%s)" %status])
- if self.rev is not None:
- self._revbox.get_child().set_text(str(self.rev))
- else:
- self._revbox.set_active(0)
-
- def _btn_rev_clicked(self, button):
- """ select revision from history dialog """
- import histselect
- rev = histselect.select(self.root)
- if rev is not None:
- self._rev_input.set_text(rev)
-
- def _btn_update_clicked(self, button, data=None):
- self._do_update()
-
- def _do_update(self):
- rev = self._rev_input.get_text()
- overwrite = self._overwrite.get_active()
-
- if not rev:
- error_dialog(self, _('Cannot update'),
- _('please enter revision to update to'))
- return
-
- response = gdialog.Confirm(_('update'), [], self,
- _('to revision %s') % rev).run()
- if response != gtk.RESPONSE_YES:
- return
-
- cmdline = ['hg', 'update', '-R', self.root, '--rev', rev, '--verbose']
- if overwrite:
- cmdline.append('--clean')
-
- dlg = hgcmd.CmdDialog(cmdline)
- dlg.run()
- dlg.hide()
- if self.notify_func:
- self.notify_func(self.notify_args)
- self._refresh()
- shlib.shell_notify([self.root])
-
def run(ui, *pats, **opts):
- return UpdateDialog()
+ return UpdateDialog(opts.get('rev'))
|
Add a tag
Loading...