Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

wctxactions: actually check in the bulk of 89b3d8350c4c

Ctrl-Enter in the new commit tool will unselect the hightlighted file if the
focus is in the file list (on the TODO list).

Changeset e37b2f017224…

Parent e9d7816035b0…

by Steve Borho

Changes to one file · Browse files at e37b2f017224 Showing diff from parent e9d7816035b0 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
53
54
55
56
57
 
 
 
 
 
 
 
 
 
 
 
 
58
59
60
 
100
101
102
 
 
 
 
103
104
105
 
53
54
55
 
 
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
 
110
111
112
113
114
115
116
117
118
119
@@ -53,8 +53,18 @@
  make(_('&Delete unversioned'), delete, frozenset('?I'))   if len(selrows) == 1:   menu.addSeparator() - make(_('&Copy...'), copy, frozenset('MC')) - make(_('Rename...'), rename, frozenset('MC')) + t, path = selrows[0] + wctx = repo[None] + if t & frozenset('?') and wctx.deleted(): + rmenu = QMenu(_('Was renamed from')) + for d in wctx.deleted()[:15]: + action = rmenu.addAction(hglib.tounicode(d)) + action.wrapper = lambda d=d: renamefromto(repo, d, path) + parent.connect(action, SIGNAL('triggered()'), action.wrapper) + menu.addMenu(rmenu) + else: + make(_('&Copy...'), copy, frozenset('MC')) + make(_('Rename...'), rename, frozenset('MC'))   menu.addSeparator()   make(_('Mark unresolved'), unmark, frozenset('r'))   make(_('Mark resolved'), mark, frozenset('u')) @@ -100,6 +110,10 @@
  os.chdir(cwd)   return notify   +def renamefromto(repo, deleted, unknown): + repo.remove([deleted]) # !->R + repo.copy(deleted, unknown) +  def vdiff(parent, ui, repo, files):   visdiff.visualdiff(ui, repo, files, {})