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

bookmark: preselect a bookmark name to be removed/renamed

Changeset 52294df5a37d…

Parent 6c6d7bb75825…

by Yuki KODAMA

Changes to 2 files · Browse files at 52294df5a37d Showing diff from parent 6c6d7bb75825 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​bookmark.py Stacked
 
77
78
79
80
 
81
82
83
 
84
85
86
87
88
89
90
 
93
94
95
 
 
 
 
96
97
98
 
77
78
79
 
80
81
82
 
83
84
85
86
 
87
88
89
 
92
93
94
95
96
97
98
99
100
101
@@ -77,14 +77,13 @@
  entry.connect('activate', self.entry_activated, type)     # prepare to show - self._refresh() + self._refresh(clear=False)   self._bookmarklistbox.grab_focus()   - def _refresh(self): + def _refresh(self, clear=True):   """ update display on dialog with recent repo data """   self.repo.invalidate()   self._bookmarkslist.clear() - self._bookmark_input.set_text('')     # add bookmarks to drop-down list   bookmarks = hglib.get_repo_bookmarks(self.repo) @@ -93,6 +92,10 @@
  if bookmarkname != 'tip':   self._bookmarkslist.append([bookmarkname])   + # clear bookmark name input + if clear: + self._bookmark_input.set_text('') +   def dialog_response(self, dialog, response_id):   # Add button   if response_id == RESPONSE_ADD:
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1851
1852
1853
 
 
 
 
 
 
 
 
1854
1855
 
1856
1857
1858
1859
1860
1861
1862
1863
1864
 
1865
1866
1867
 
 
1868
1869
1870
 
1874
1875
1876
1877
 
 
1878
1879
1880
1881
 
1882
1883
1884
1885
 
 
1886
1887
1888
1889
1890
 
1891
1892
1893
 
 
1894
1895
1896
1897
 
1898
1899
1900
1901
 
 
1902
1903
1904
 
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
 
 
 
 
 
 
1868
1869
1870
 
1871
1872
1873
1874
1875
 
1879
1880
1881
 
1882
1883
1884
1885
 
 
1886
1887
1888
 
 
1889
1890
1891
1892
1893
1894
 
1895
1896
1897
 
1898
1899
1900
1901
 
 
1902
1903
1904
 
 
1905
1906
1907
1908
1909
@@ -1851,20 +1851,25 @@
  self.reload_log()   self.changeview.clear()   + def get_rev_tag(self, rev, include=None, exclude=None): + for tag in self.repo.nodetags(self.repo[rev].node()): + if tag != 'tip' \ + and ((not include) or (include and tag in include)) \ + and ((not exclude) or (exclude and tag not in exclude)): + return tag + return '' +   def add_tag(self, menuitem):   # save tag info for detecting new tags added + bmarks = hglib.get_repo_bookmarks(self.repo)   oldtags = self.repo.tagslist()   oldlen = len(self.repo)   rev = str(self.currevid) - for t in self.repo.nodetags(self.repo[rev].node()): - if t != 'tip': - tag = t - break; - else: - tag = '' + tag = self.get_rev_tag(rev, exclude=bmarks)     def refresh(*args): - self.refresh_on_marker_change(oldlen, oldtags, self.repo.tagslist()) + self.refresh_on_marker_change(oldlen, oldtags, + self.repo.tagslist())     dialog = tagadd.TagAddDialog(self.repo, tag, rev)   dialog.connect('destroy', refresh) @@ -1874,31 +1879,31 @@
  # save bookmark info for detecting new bookmarks added   oldbookmarks = hglib.get_repo_bookmarks(self.repo)   oldlen = len(self.repo) - rev = self.currevid + rev = str(self.currevid) + bmark = self.get_rev_tag(rev, include=oldbookmarks)     def refresh(*args): - self.refresh_on_marker_change(oldlen, - oldbookmarks, + self.refresh_on_marker_change(oldlen, oldbookmarks,   hglib.get_repo_bookmarks(self.repo))   - dialog = bookmark.BookmarkDialog(self.repo, - type=bookmark.TYPE_ADDREMOVE, rev=str(rev)) + dialog = bookmark.BookmarkDialog(self.repo, bookmark.TYPE_ADDREMOVE, + bmark, rev)   dialog.connect('destroy', refresh)   self.show_dialog(dialog)     def rename_bookmark(self, menuitem): - # save bookmark info for detecting new bookmarks added + # save bookmark info for detecting bookmarks renamed   oldbookmarks = hglib.get_repo_bookmarks(self.repo)   oldlen = len(self.repo) - rev = self.currevid + rev = str(self.currevid) + bmark = self.get_rev_tag(rev, include=oldbookmarks)     def refresh(*args): - self.refresh_on_marker_change(oldlen, - oldbookmarks, + self.refresh_on_marker_change(oldlen, oldbookmarks,   hglib.get_repo_bookmarks(self.repo))   - dialog = bookmark.BookmarkDialog(self.repo, - type=bookmark.TYPE_RENAME, rev=str(rev)) + dialog = bookmark.BookmarkDialog(self.repo, bookmark.TYPE_RENAME, + bmark, rev)   dialog.connect('destroy', refresh)   self.show_dialog(dialog)