Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset 15ec58c23797…

Parents 4be8e0270905…

Parents 2849fee4b610…

by Steve Borho

Changes to 2 files · Browse files at 15ec58c23797 Showing diff from parent 4be8e0270905 2849fee4b610 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
468
469
470
471
 
472
473
474
 
468
469
470
 
471
472
473
474
@@ -468,7 +468,7 @@
  if menus:   allmenus = [   (_('_Tools'), - [dict(text=_('Changelog'), func=self.launch, args=['log'], + [dict(text=_('Repository Explorer'), func=self.launch, args=['log'],   icon='menulog.ico'),   dict(text=_('Commit'), func=self.launch, args=['commit'],   icon='menucommit.ico'),
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1327
1328
1329
 
1330
1331
1332
1333
1334
1335
1336
 
1337
1338
1339
 
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
 
1337
1338
1339
1340
@@ -1327,13 +1327,14 @@
  extensions.load(self.ui, 'rebase', None)     path = hglib.fromutf(self.pathentry.get_text()).strip() + remote_path = hglib.validate_synch_path(path, self.repo)   if not path:   gdialog.Prompt(_('No remote path specified'),   _('Please enter or select a remote path'),   self).run()   self.pathentry.grab_focus()   return - cmdline = ['hg'] + cmd + self.get_proxy_args() + [path] + cmdline = ['hg'] + cmd + self.get_proxy_args() + [remote_path]   dlg = hgcmd.CmdDialog(cmdline, text=' '.join(['hg'] + cmd))   dlg.show_all()   dlg.run()