Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

cmenu: initial attempt to integrate new dialogs

Changeset e15597258047…

Parent f9669ff287ac…

by Steve Borho

Changes to 2 files · Browse files at e15597258047 Showing diff from parent f9669ff287ac Diff from another changeset...

Change 1 of 3 Show Entire File hgproc.py Stacked
 
35
36
37
38
 
 
39
40
41
 
43
44
45
46
 
 
47
48
49
 
78
79
80
 
 
81
82
83
 
35
36
37
 
38
39
40
41
42
 
44
45
46
 
47
48
49
50
51
 
80
81
82
83
84
85
86
87
@@ -35,7 +35,8 @@
 # Map hgproc commands to dialog modules in hggtk/  from hggtk import commit, status, addremove, tagadd, tags, history, merge  from hggtk import diff, revisions, update, serve, clone, synch, hgcmd, about -from hggtk import recovery, thgconfig, datamine, hginit +from hggtk import recovery, thgconfig, datamine, hginit, shelve, rename +from hggtk import hgignore  _dialogs = { 'commit' : commit, 'status' : status, 'revert' : status,   'add' : addremove, 'remove' : addremove, 'tag' : tagadd,   'tags' : tags, 'log' : history, 'history': history, @@ -43,7 +44,8 @@
  'parents': revisions, 'heads' : revisions, 'update' : update,   'clone' : clone, 'serve' : serve, 'synch' : synch,   'about' : about, 'config' : thgconfig, 'recovery': recovery, - 'datamine': datamine, 'init' : hginit } + 'datamine': datamine, 'init' : hginit, 'shelve' : thgshelve, + 'hgignore': hgignore, 'rename' : rename }    def get_list_from_file(filename):   fd = open(filename, "r") @@ -78,6 +80,8 @@
  options['root'] = a   elif o in ("--cwd"):   options['cwd'] = a + elif o in ("--detect"): + options['detect'] = True     if listfile:   options['files'] = get_list_from_file(listfile)
Change 1 of 3 Show Entire File tortoise/​contextmenu.py Stacked
 
328
329
330
 
 
 
 
 
 
 
331
332
333
 
 
 
334
335
336
 
339
340
341
 
 
 
 
 
 
 
 
 
342
343
344
 
549
550
551
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
552
553
554
 
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
 
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
 
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
@@ -328,9 +328,19 @@
  self._init, icon="menucreaterepos.ico",   state=os.path.isdir(rpath)))   else: + for f in self._filenames: + if f.endswith('.hgignore'): + result.append(TortoiseMenu(_("Modify ignore filter"), + _("Modify repository ignore filter"), + self._hgignore, icon="general.ico")) # needs ico + break +   result.append(TortoiseMenu(_("View File Status"),   _("Repository status"),   self._status, icon="menushowchanged.ico")) + result.append(TortoiseMenu(_("(Un)Shelve Changes"), + _("Shelve repository changes"), + self._shelve, icon="general.ico")) # needs ico     # Visual Diff (any extdiff command)   has_vdiff = repo.ui.config('tortoisehg', 'vdiff', '') != '' @@ -339,6 +349,15 @@
  self._vdiff, icon="TortoiseMerge.ico",   state=has_vdiff))   + if len(self._filenames) == 0: + result.append(TortoiseMenu(_("Guess Renames"), + _("Detect renames and copies"), + self._guess_rename, icon="general.ico")) # needs ico + elif len(self._filenames) == 1: + result.append(TortoiseMenu(_("Rename file"), + _("Rename file or directory"), + self._rename, icon="general.ico")) # needs ico +   result.append(TortoiseMenu(_("Add Files"),   _("Add files to Hg repository"),   self._add, icon="menuadd.ico")) @@ -549,6 +568,22 @@
  def _init(self, parent_window):   self._run_dialog('init')   + def _shelve(self, parent_window): + self._run_dialog('shelve') + + def _hgignore(self, parent_window): + self._run_dialog('hgignore') + + def _rename(self, parent_window): + src = self._filenames[0] + root = self._folder + cmdopts = "--verbose" + open_dialog('rename', cmdopts, root, filelist=[src]) + + def _guess_rename(self, parent_window): + root = self._folder + open_dialog('rename', '--detect', root) +   def _status(self, parent_window):   self._run_dialog('status')