History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.8, 0.8.1, and 0.8.2

nautilus: more simplification work for menu generators

menuThg.get_commands() should not have to devine a cwd or repo
from the passed in file list, each platform could have different
schemes. So this command is now passed in repo and cwd, which
will be common. Also, make a separate function for non-repo
menus.

On the nautilus side, fix it up so this logic happens in one
place. Also, send canonized paths to hgproc to make things
more readable to the user (makes paths relative to cwd)

Changeset 283fe96bcb86 …

Parent 08b697ca6875 …

by Steve Borho Feb 23 09 at 1:12 AM

Changes to 2 files · Browse files at 283fe96bcb86 Showing diff from parent 08b697ca6875 Diff from another changeset...

Change 1 of 4 Show Changes Only Show Entire File Loading... contrib/nautilus-thg.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331	`# TortoiseHg plugin for Nautilus` `#` `# Copyright (C) 2007-9 Steve Borho` `#` `# Stolen mercilessly from nautilus-bzr, thanks guys` `# Copyright (C) 2006 Jeff Bailey` `# Copyright (C) 2006 Wouter van Heyst` `# Copyright (C) 2006 Jelmer Vernooij` `#` `# Published under the GNU GPL` `import gtk` `import gobject` `import os` `import nautilus` `import subprocess` `import sys` `import tempfile` `import urllib` `try:` `from mercurial import hg, ui, match, util` `except ImportError:` `# workaround to use user's local python libs` `userlib = os.path.expanduser('~/lib/python')` `if os.path.exists(userlib) and userlib not in sys.path:` `sys.path.append(userlib)` `from mercurial import hg, ui, match, util` `try:` `from mercurial.error import RepoError` `except ImportError:` `from mercurial.repo import RepoError` `from mercurial.node import short` `TORTOISEHG_PATH = '~/tools/tortoisehg-dev'` `nofilecmds = 'about serve synch repoconfig userconfig merge unmerge'.split()` `nocachecmds = 'about serve repoconfig userconfig'.split()` `class HgExtension(nautilus.MenuProvider,` `nautilus.ColumnProvider,` `nautilus.InfoProvider,` `nautilus.PropertyPageProvider):` `def __init__(self):` `self.cacherepo = None` `self.cacheroot = None` `# check if nautilus-thg.py is a symlink first` `pfile = __file__` `if pfile.endswith('.pyc'):` `pfile = pfile[:-1]` `path = os.path.dirname(os.path.realpath(pfile))` `thgpath = os.path.normpath(os.path.join(path, '..'))` `testpath = os.path.join(thgpath, 'tortoise')` `if os.path.isdir(testpath):` `if thgpath not in sys.path:` `sys.path.insert(0, thgpath)` `else:` `# try environment or hard-coded path` `thgpath = os.environ.get('TORTOISEHG_PATH', TORTOISEHG_PATH)` `thgpath = os.path.normpath(os.path.expanduser(thgpath))` `if os.path.exists(thgpath) and thgpath not in sys.path:` `sys.path.insert(0, thgpath)` `# else assume tortoise is already in PYTHONPATH` `try:` `import tortoise.thgutil` `import tortoise.menuthg` `except ImportError, e:` `# if thgutil is not found, then repository cannot be found` `# if menuthg is not found, you have an older version in sys.path` `print e` `self.menu = None` `return` `self.env = os.environ` `self.env['PYTHONPATH'] = ':'.join(sys.path)` `self.env['TORTOISEHG_PATH'] = thgpath` `self.env['THG_ICON_PATH'] = os.path.join(thgpath, 'icons')` `self.hgproc = os.path.join(thgpath, 'hgproc.py')` `self.ipath = os.path.join(thgpath, 'icons', 'tortoise')` `self.menu = tortoise.menuthg.menuThg()` `def icon(self, iname):` `return os.path.join(self.ipath, iname)` `def get_path_for_vfs_file(self, vfs_file):` `if vfs_file.get_uri_scheme() != 'file':` `return None` `return urllib.unquote(vfs_file.get_uri()[7:])` `def get_repo_for_path(self, path):` `'''` `Find mercurial repository for vfs_file` `Returns hg.repo` `'''` `p = os.path.isdir(path) and path or os.path.dirname(path)` `while not os.path.isdir(os.path.join(p, ".hg")):` `oldp = p` `p = os.path.dirname(p)` `if p == oldp:` `return None` `if p == self.cacheroot:` `return self.cacherepo` `# Keep one repo cached` `try:` `self.cacheroot = p` `self.cacherepo = hg.repository(ui.ui(), path=p)` `return self.cacherepo` `except RepoError:` `self.cacheroot = None` `self.cacherepo = None` `return None` `#start dialogs` `def run_dialog(self, menuitem, hgcmd):` `'''` `hgcmd - hgproc subcommand` `'''`-`paths = self.files`-`if paths[0] is None:`-`return`--`path = paths[0]`-`repo = self.get_repo_for_path(path)`-`cwd = os.path.isdir(path) and path or os.path.dirname(path)`--`if repo is not None:`-`root = repo.root`-`else:`-`root = cwd`+`cwd = self.cwd`+`repo = self.get_repo_for_path(cwd)` `if hgcmd == 'vdiff':` `diffcmd = repo.ui.config('tortoisehg', 'vdiff', None)` `if diffcmd is None:` `hgcmd = 'diff'` `else:` `cmdline = ['hg', diffcmd]`-`cwd = os.path.isdir(path) and path or os.path.dirname(path)`-`paths = [self.get_path_for_vfs_file(f) for f in vfs_files]`-`subprocess.Popen(cmdline+paths, shell=False, env=self.env,`-`cwd=cwd)`+`cmdline.extend(self.files)`+`subprocess.Popen(cmdline, shell=False, env=self.env, cwd=cwd)` `return` `cmdopts = [sys.executable, self.hgproc]`-`cmdopts += ['--root', root]`+`if repo: cmdopts += ['--root', repo.root]` `cmdopts += ['--cwd', cwd]` `cmdopts += ['--command', hgcmd]` -`if hgcmd not in nofilecmds:`+`if hgcmd not in nofilecmds and self.files:` `# Use temporary file to store file list (avoid shell command` `# line limitations)` `fd, tmpfile = tempfile.mkstemp(prefix="tortoisehg_filelist_")`-`os.write(fd, "\n".join(paths))`+`os.write(fd, "\n".join(self.files))` `os.close(fd)` `cmdopts += ['--listfile', tmpfile, '--deletelistfile']` `subprocess.Popen(cmdopts, cwd=cwd, env=self.env, shell=False)` `if hgcmd not in nocachecmds:` `# Remove cached repo object, dirstate may change` `self.cacherepo = None` `self.cacheroot = None` -`def buildMenu(self, menuf, vfsfile):`+`def buildMenu(self, vfs_files, bg):` `'''Build menu'''`+`self.pos = 0`+`self.files = []`+`files = [self.get_path_for_vfs_file(f) for f in vfs_files]`+`if bg:`+`cwd = files[0]`+`files = []`+`repo = self.get_repo_for_path(cwd)`+`else:`+`cwd = os.path.dirname(files[0])`+`repo = self.get_repo_for_path(cwd)`+`if repo:`+`menus = self.menu.get_commands(repo, cwd, files)`+`for f in files:`+`self.files.append(util.canonpath(repo.root, cwd, f))`+`else:`+`menus = self.menu.get_norepo_commands(cwd, files)`+`self.cwd = cwd`+`return self._buildMenu(menus)` -`self.files = [self.get_path_for_vfs_file(f) for f in vfsfile]`-`self.pos = 0`-`return self._buildMenu(menuf(self.files))`--`def _buildMenu(self, menus, pos=0):`+`def _buildMenu(self, menus):` `'''Build menu'''` `items = []` `for menu_info in menus:` `idstr = 'HgNautilus::%02d' % self.pos` `self.pos += 1` `if menu_info.isSep():` `# can not insert a separator till now` `pass` `elif menu_info.isSubmenu():` `if nautilus.__dict__.get('Menu'):` `item = nautilus.MenuItem(idstr, menu_info.menutext,` `menu_info.helptext)` `submenu = nautilus.Menu()` `item.set_submenu(submenu)` `for subitem in self._buildMenu(menu_info.get_menus()):` `submenu.append_item(subitem)` `items.append(item)` `else: #submenu not suported` `for subitem in self._buildMenu(menu_info.get_menus()):` `items.append(subitem)` `else:` `if menu_info.state:` `item = nautilus.MenuItem(idstr,` `menu_info.menutext,` `menu_info.helptext,` `self.icon(menu_info.icon))` `item.connect('activate', self.run_dialog, menu_info.hgcmd)` `items.append(item)` `return items` `def get_background_items(self, window, vfs_file):` `'''Build context menu for current directory'''` `if vfs_file and self.menu:`-`return self.buildMenu(self.menu.get_commands, [vfs_file])`+`return self.buildMenu([vfs_file], True)` `def get_file_items(self, window, vfs_files):` `'''Build context menu for selected files/directories'''` `if vfs_files and self.menu:`-`return self.buildMenu(self.menu.get_commands, vfs_files)`+`return self.buildMenu(vfs_files, False)` `def get_columns(self):` `return nautilus.Column("HgNautilus::80hg_status",` `"hg_status",` `"HG Status",` `"Version control status"),` `def _get_file_status(self, repo, localpath):` `emblem = None` `status = '?'` `# This is not what the API is optimized for, but this appears` `# to work efficiently enough` `matcher = match.always(repo.root, localpath)` `changes = repo.dirstate.status(matcher, True, True, True)` `(lookup, modified, added, removed, deleted, unknown,` `ignored, clean) = changes` `if localpath in clean:` `emblem = 'default'` `status = 'clean'` `elif localpath in modified:` `emblem = 'cvs-modified'` `status = 'modified'` `elif localpath in added:` `emblem = 'cvs-aded'` `status = 'added'` `elif localpath in unknown:` `emblem = 'new'` `status = 'unrevisioned'` `elif localpath in ignored:` `status = 'ignored'` `elif localpath in deleted:` `# Should be hard to reach this state` `emblem = 'stockmail-priority-high'` `status = 'deleted'` `return emblem, status` `def update_file_info(self, file):` `'''Return emblem and hg status for this file'''` `path = self.get_path_for_vfs_file(file)` `if path is None or file.is_directory():` `return` `repo = self.get_repo_for_path(path)` `if repo is None:` `return` `localpath = path[len(repo.root)+1:]` `emblem, status = self._get_file_status(repo, localpath)` `if emblem is not None:` `file.add_emblem(emblem)` `file.add_string_attribute('hg_status', status)` `# property page borrowed from http://www.gnome.org/~gpoo/hg/nautilus-hg/` `def __add_row(self, row, label_item, label_value):` `label = gtk.Label(label_item)` `label.set_use_markup(True)` `label.set_alignment(1, 0)` `self.table.attach(label, 0, 1, row, row + 1, gtk.FILL, gtk.FILL, 0, 0)` `label.show()` `label = gtk.Label(label_value)` `label.set_use_markup(True)` `label.set_alignment(0, 1)` `label.show()` `self.table.attach(label, 1, 2, row, row + 1, gtk.FILL, 0, 0, 0)` `def get_property_pages(self, vfs_files):` `if len(vfs_files) != 1:` `return` `file = vfs_files[0]` `path = self.get_path_for_vfs_file(file)` `if path is None or file.is_directory():` `return` `repo = self.get_repo_for_path(path)` `if repo is None:` `return` `localpath = path[len(repo.root)+1:]` `emblem, status = self._get_file_status(repo, localpath)` `# Get the information from Mercurial` `ctx = repo.changectx(None).parents()[0]` `try:` `fctx = ctx.filectx(localpath)` `rev = fctx.filelog().linkrev(fctx.filerev())` `except:` `rev = ctx.rev()` `ctx = repo.changectx(rev)` `node = short(ctx.node())` `date = util.datestr(ctx.date(), '%Y-%m-%d %H:%M:%S %1%2')` `parents = '\n'.join([short(p.node()) for p in ctx.parents()])` `description = ctx.description()` `user = ctx.user()` `user = gobject.markup_escape_text(user)` `tags = ', '.join(ctx.tags())` `branch = ctx.branch()` `self.property_label = gtk.Label('Mercurial')` `self.table = gtk.Table(7, 2, False)` `self.table.set_border_width(5)` `self.table.set_row_spacings(5)` `self.table.set_col_spacings(5)` `self.__add_row(0, '<b>Status</b>:', status)` `self.__add_row(1, '<b>Last-Commit-Revision</b>:', str(rev))` `self.__add_row(2, '<b>Last-Commit-Description</b>:', description)` `self.__add_row(3, '<b>Last-Commit-Date</b>:', date)` `self.__add_row(4, '<b>Last-Commit-User</b>:', user)` `if tags:` `self.__add_row(5, '<b>Tags</b>:', tags)` `if branch != 'default':` `self.__add_row(6, '<b>Branch</b>:', branch)` `self.table.show()` `return nautilus.PropertyPage("MercurialPropertyPage::status",` `self.property_label, self.table),`

Change 1 of 3 Show Changes Only Show Entire File Loading... tortoise/menuthg.py Stacked
117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 261 262 263 264 265 266 267 268 269 270 275 276 277 278	117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 257 258 259 260 261 262 263 264 265 270 271 272	@@ -117,142 +117,138 @@ `'synch', icon="menusynch.py"))` `return thgmenu` -`def get_commands(self, files):`+`def get_norepo_commands(self, cwd, files):`+`thgmenu = []`+`menu = TortoiseSubmenu(self.name, "Mercurial", [], icon="hg.ico")`+`menu.append(TortoiseMenu(_("Clone a Repository"),`+`_("clone a repository"),`+`'clone', icon="menuclone.ico"))`+`menu.append(TortoiseMenu(_("Create Repository Here"),`+`_("create a new repository in this directory"),`+`'init', icon="menucreaterepos.ico"))`+`menu.append(TortoiseMenu(_("Global Settings"),`+`_("Configure user wide settings"),`+`'userconfig', icon="settings_user.ico"))`+`menu.append(TortoiseMenuSep())`+`menu.append(TortoiseMenu(_("About"), _("About TortoiseHg"),`+`'about', icon="menuabout.ico"))`+`thgmenu.append(menu)`+`thgmenu.append(TortoiseMenuSep())`+`return thgmenu`++`def get_commands(self, repo, cwd, files):` `"""` `Get a list of commands valid for the current selection.` `Commands are instances of TortoiseMenu, TortoiseMenuSep or TortoiseMenu` `"""`-`# open repo`-`if type(files) != list:`-`files = [files]`-`if not files:`-`return []`-`rpath = files[0]`-`repo = open_repo(rpath)`- `thgmenu = []`--`if repo:`-`thgmenu.append(TortoiseMenu(_("HG Commit..."),`-`_("Commit changes in repository"),`-`'commit', icon="menucommit.ico"))`+`thgmenu.append(TortoiseMenu(_("HG Commit..."),`+`_("Commit changes in repository"),`+`'commit', icon="menucommit.ico"))` `menu = TortoiseSubmenu(self.name, "Mercurial", [], icon="hg.ico")`+`canannotate = len(files) > 0`+`hashgignore = False`+`for f in files:`+`if not os.path.isfile(f):`+`canannotate = False`+`if f.endswith('.hgignore'):`+`hashgignore = True` -`if repo is None:`-`menu.append(TortoiseMenu(_("Clone a Repository"),`-`_("clone a repository"),`-`'clone', icon="menuclone.ico"))`-`if os.path.isdir(rpath):`-`menu.append(TortoiseMenu(_("Create Repository Here"),`-`_("create a new repository in this directory"),`-`'init', icon="menucreaterepos.ico"))`-`else:`-`canannotate = len(files) > 0`-`hashgignore = False`-`for f in files:`-`if not os.path.isfile(f):`-`canannotate = False`-`if f.endswith('.hgignore'):`-`hashgignore = True`+`if hashgignore: # needs ico`+`menu.append(TortoiseMenu(_("Edit Ignore Filter"),`+`_("Edit repository ignore filter"),`+`'hgignore', icon="general.ico"))` -`if hashgignore: # needs ico`-`menu.append(TortoiseMenu(_("Edit Ignore Filter"),`-`_("Edit repository ignore filter"),`-`'hgignore', icon="general.ico"))`--`menu.append(TortoiseMenu(_("View File Status"),`-`_("Repository status"),`-`'status', icon="menushowchanged.ico"))`+`menu.append(TortoiseMenu(_("View File Status"),`+`_("Repository status"),`+`'status', icon="menushowchanged.ico"))` -`menu.append(TortoiseMenu(_("Shelve Changes"),`-`_("Shelve or unshelve repository changes"),`-`'shelve', icon="general.ico")) # needs ico`+`menu.append(TortoiseMenu(_("Shelve Changes"),`+`_("Shelve or unshelve repository changes"),`+`'shelve', icon="general.ico")) # needs ico` -`# Visual Diff (any extdiff command)`-`has_vdiff = repo.ui.config('tortoisehg', 'vdiff', '') != ''`-`if has_vdiff:`-`menu.append(TortoiseMenu(_("Visual Diff"),`+`# Visual Diff (any extdiff command)`+`has_vdiff = repo.ui.config('tortoisehg', 'vdiff', '') != ''`+`if has_vdiff:`+`menu.append(TortoiseMenu(_("Visual Diff"),` `_("View changes using GUI diff tool"),` `'vdiff', icon="TortoiseMerge.ico"))` -`if len(files) == 0: # needs ico`-`menu.append(TortoiseMenu(_("Guess Renames"),`-`_("Detect renames and copies"),`-`'guess', icon="general.ico"))`-`elif len(files) == 1: # needs ico`-`menu.append(TortoiseMenu(_("Rename File"),`-`_("Rename file or directory"),`-`'rename', icon="general.ico"))`+`if len(files) == 0: # needs ico`+`menu.append(TortoiseMenu(_("Guess Renames"),`+`_("Detect renames and copies"),`+`'guess', icon="general.ico"))`+`elif len(files) == 1: # needs ico`+`menu.append(TortoiseMenu(_("Rename File"),`+`_("Rename file or directory"),`+`'rename', icon="general.ico"))` -`if len(files):`-`menu.append(TortoiseMenu(_("Add Files"),`-`_("Add files to Hg repository"),`-`'add', icon="menuadd.ico"))`-`menu.append(TortoiseMenu(_("Remove Files"),`-`_("Remove selected files on the next commit"),`-`'remove', icon="menudelete.ico"))`-`menu.append(TortoiseMenu(_("Undo Changes"),`-`_("Revert selected files"),`-`'revert', icon="menurevert.ico"))`+`if len(files):`+`menu.append(TortoiseMenu(_("Add Files"),`+`_("Add files to Hg repository"),`+`'add', icon="menuadd.ico"))`+`menu.append(TortoiseMenu(_("Remove Files"),`+`_("Remove selected files on the next commit"),`+`'remove', icon="menudelete.ico"))`+`menu.append(TortoiseMenu(_("Undo Changes"),`+`_("Revert selected files"),`+`'revert', icon="menurevert.ico"))` -`# we can only annotate file but not directories`-`if canannotate:`-`menu.append(TortoiseMenu(_("Annotate Files"),`+`# we can only annotate file but not directories`+`if canannotate:`+`menu.append(TortoiseMenu(_("Annotate Files"),` `_("show changeset information per file line"),`-`'annotate', icon="menublame.ico"))`+`'datamine', icon="menublame.ico"))` -`menu.append(TortoiseMenuSep())`-`menu.append(TortoiseMenu(_("Update To Revision"),`-`_("update working directory"),`-`'update', icon="menucheckout.ico"))`+`menu.append(TortoiseMenuSep())`+`menu.append(TortoiseMenu(_("Update To Revision"),`+`_("update working directory"),`+`'update', icon="menucheckout.ico"))` -`canmerge = len(repo.heads()) > 1 and \`-`len(repo.changectx(None).parents()) < 2`-`if canmerge:`-`menu.append(TortoiseMenu(_("Merge Revisions"),`-`_("merge working directory with another revision"),`-`'merge', icon="menumerge.ico"))`+`if len(repo.changectx(None).parents()) < 2:`+`menu.append(TortoiseMenu(_("Merge Revisions"),`+`_("merge working directory with another revision"),`+`'merge', icon="menumerge.ico"))` -`inmerge = len(repo.changectx(None).parents()) > 1`-`if inmerge:`-`menu.append(TortoiseMenu(_("Undo Merge"),`-`_("Undo merge by updating to revision"),`-`'unmerge', icon="menuunmerge.ico"))`+`inmerge = len(repo.changectx(None).parents()) > 1`+`if inmerge:`+`menu.append(TortoiseMenu(_("Undo Merge"),`+`_("Undo merge by updating to revision"),`+`'merge', icon="menuunmerge.ico"))`++`menu.append(TortoiseMenuSep())`++`menu.append(TortoiseMenu(_("View Changelog"),`+`_("View revision history"),`+`'history', icon="menulog.ico"))`++`if len(files) == 0:`+`menu.append(TortoiseMenu(_("Search Repository"),`+`_("Search revisions of files for a text pattern"),`+`'grep', icon="menurepobrowse.ico"))` `menu.append(TortoiseMenuSep())` -`menu.append(TortoiseMenu(_("View Changelog"),`-`_("View revision history"),`-`'history', icon="menulog.ico"))`+`menu.append(TortoiseMenu(_("Synchronize..."),`+`_("Synchronize with remote repository"),`+`'_synch', icon="menusynch.ico"))`+`menu.append(TortoiseMenu(_("Recovery..."),`+`_("General repair and recovery of repository"),`+`'recovery', icon="general.ico"))`+`menu.append(TortoiseMenu(_("Web Server"),`+`_("start web server for this repository"),`+`'serve', icon="proxy.ico"))` -`if len(files) == 0:`-`menu.append(TortoiseMenu(_("Search Repository"),`-`_("Search revisions of files for a text pattern"),`-`'grep', icon="menurepobrowse.ico"))`--`menu.append(TortoiseMenuSep())`--`menu.append(TortoiseMenu(_("Synchronize..."),`-`_("Synchronize with remote repository"),`-`'_synch', icon="menusynch.ico"))`-`menu.append(TortoiseMenu(_("Recovery..."),`-`_("General repair and recovery of repository"),`-`'recovery', icon="general.ico"))`-`menu.append(TortoiseMenu(_("Web Server"),`-`_("start web server for this repository"),`-`'serve', icon="proxy.ico"))`--`menu.append(TortoiseMenuSep())`-`menu.append(TortoiseMenu(_("Create Clone"),`-`_("Clone a repository here"),`-`'clone', icon="menuclone.ico"))`-`caninit = repo.root != rpath and os.path.isdir(rpath)`-`if caninit:`-`menu.append(TortoiseMenu(_("Create Repository Here"),`-`_("create a new repository in this directory"),`-`'init', icon="menucreaterepos.ico"))`+`menu.append(TortoiseMenuSep())`+`menu.append(TortoiseMenu(_("Create Clone"),`+`_("Clone a repository here"),`+`'clone', icon="menuclone.ico"))`+`if repo.root != cwd:`+`menu.append(TortoiseMenu(_("Create Repository Here"),`+`_("create a new repository in this directory"),`+`'init', icon="menucreaterepos.ico"))` `# config settings menu` `menu.append(TortoiseMenuSep())`@@ -261,10 +257,9 @@ `optmenu.add_menu(_("Global"),` `_("Configure user wide settings"),` `'userconfig', icon="settings_user.ico")`-`if repo:`-`optmenu.add_menu(_("Repository"),`-`_("Configure settings local to this repository"),`-`'repoconfig', icon="settings_repo.ico")`+`optmenu.add_menu(_("Repository"),`+`_("Configure settings local to this repository"),`+`'repoconfig', icon="settings_repo.ico")` `menu.append(optmenu)` `# add common menu items`@@ -275,4 +270,3 @@ `thgmenu.append(menu)` `thgmenu.append(TortoiseMenuSep())` `return thgmenu`-

Diff Options

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

Diff to 283fe96bcb86

Attach a Trello Card

Add a tag

Your session has expired