Changeset d702d0193f3a…
Parent eb20fab551ee…
by
Changes to one file · Browse files at d702d0193f3a Showing diff from parent eb20fab551ee Diff from another changeset...
@@ -39,10 +39,6 @@ self.paths = self._get_paths()
self.origchangecount = len(self.repo.changelog)
- # load the fetch and rebase extensions explicitly
- extensions.load(self.ui, 'fetch', None)
- extensions.load(self.ui, 'rebase', None)
-
name = self.repo.ui.config('web', 'name') or os.path.basename(self.root)
self.set_title(_('TortoiseHg Synchronize - ') + name)
@@ -420,6 +416,8 @@ aopts = self._get_advanced_options()
if self.fetchradio.get_active():
cmd = ['fetch', '--message', 'merge']
+ # load the fetch extensions explicitly
+ extensions.load(self.ui, 'fetch', None)
else:
cmd = ['pull']
cmd += aopts.get('force', [])
@@ -428,6 +426,8 @@ cmd.append('--update')
elif self.rebaseradio.get_active():
cmd.append('--rebase')
+ # load the rebase extensions explicitly
+ extensions.load(self.ui, 'rebase', None)
cmd += aopts.get('rev', [])
self._exec_cmd(cmd)
|
Loading...