We are currently indexing your data, so search results may be incomplete until we finish.
rename: start to write rename guessing dialog
Changeset 731b993da49e…
Parent 8a850cae816d…
by
Changes to 3 files · Browse files at 731b993da49e Showing diff from parent 8a850cae816d Diff from another changeset...
|
@@ -216,6 +216,12 @@ pass
run(**opts)
+def guess(ui, *pats, **opts):
+ """guess previous renames or copies"""
+ from hggtk.rename import run
+ opts['detect'] = True
+ run(**opts)
+
def datamine(ui, *pats, **opts):
"""repository search and annotate tool"""
from hggtk.datamine import run
@@ -483,6 +489,7 @@ "^status|st": (status, [], _('hgtk status [FILE]...')),
"^userconfig": (userconfig, [], _('hgtk userconfig')),
"^repoconfig": (repoconfig, [], _('hgtk repoconfig')),
+ "^guess": (guess, [], _('hgtk guess')),
"^rename|mv": (rename, [], _('hgtk rename SOURCE [DEST]')),
"^serve":
(serve,
|
||
|
|
@@ -7,11 +7,15 @@ import os
import sys
import gtk
+import pango
import cStringIO
-from shlib import shell_notify
+import shlib
from dialog import error_dialog
-from mercurial import hg, ui, commands, util
-from mercurial.repo import RepoError
+from mercurial import hg, ui, cmdutil, match, util
+try:
+ from mercurial.repo import RepoError
+except ImportError:
+ from mercurial.error import RepoError
class DetectRenameDialog(gtk.Window):
""" Detect renames after they occur """
@@ -20,23 +24,144 @@ gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
self.root = root
- self.set_title('Detect Renames in %s' + os.path.basename(root))
+ self.set_title('Detect Copies and Renames in %s' % os.path.basename(root))
+ self.set_default_size(610, 400)
adjustment = gtk.Adjustment(50, 0, 100, 1)
- adjustment.connect('value-changed', self._adj_changed)
+ adjustment.connect('value-changed', self.adj_changed)
hscale = gtk.HScale(adjustment)
- self.add(mainvbox)
+ frame = gtk.Frame('Minimum Simularity Percentage')
+ frame.add(hscale)
+ topvbox = gtk.VBox()
+ topvbox.pack_start(frame, False, False, 2)
- def _adj_changed(self, adj):
- print adj.get_value()
+ unkmodel = gtk.ListStore(str)
+ unknowntree = gtk.TreeView(unkmodel)
+ col = gtk.TreeViewColumn('File', gtk.CellRendererText(), text=0)
+ unknowntree.append_column(col)
+ unknowntree.set_enable_search(True)
+ unknowntree.set_headers_visible(False)
+ scroller = gtk.ScrolledWindow()
+ scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ scroller.add(unknowntree)
-def run(fname='', target='', **opts):
- from dialog import entry_dialog
- title = 'Rename ' + fname
- dialog = entry_dialog(None, title, True, target or fname, rename_resp)
- dialog.orig = fname
- dialog.show_all()
- dialog.connect('destroy', gtk.main_quit)
+ vbox = gtk.VBox()
+ vbox.pack_start(scroller, True, True, 2)
+ fr = gtk.Button('Find Renames')
+ fr.connect('pressed', self.find_renames, unknowntree)
+ fc = gtk.Button('Find Copies')
+ fc.connect('pressed', self.find_copies, unknowntree)
+ hbox = gtk.HBox()
+ hbox.pack_start(fr, True, True, 2)
+ hbox.pack_start(fc, True, True, 2)
+ vbox.pack_start(hbox, False, False, 2)
+
+ unknownframe = gtk.Frame('Unrevisioned Files')
+ unknownframe.add(vbox)
+
+ # source, dest, percent match
+ cmodel = gtk.ListStore(str, str, str)
+ ctree = gtk.TreeView(cmodel)
+ col = gtk.TreeViewColumn('Source', gtk.CellRendererText(), text=0)
+ col.set_resizable(True)
+ ctree.append_column(col)
+ col = gtk.TreeViewColumn('Dest', gtk.CellRendererText(), text=1)
+ col.set_resizable(True)
+ ctree.append_column(col)
+ col = gtk.TreeViewColumn('%', gtk.CellRendererText(), text=2)
+ col.set_resizable(True)
+ ctree.append_column(col)
+ ctree.connect('row-activated', self.candidate_row_act)
+ scroller = gtk.ScrolledWindow()
+ scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ scroller.add(ctree)
+
+ vbox = gtk.VBox()
+ vbox.pack_start(scroller, True, True, 2)
+ ac = gtk.Button('Accept Match')
+ fr.connect('pressed', self.accept_match, ctree)
+ hbox = gtk.HBox()
+ hbox.pack_start(ac, False, False, 2)
+ vbox.pack_start(hbox, False, False, 2)
+
+ candidateframe = gtk.Frame('Candidate Matches')
+ candidateframe.add(vbox)
+
+ self.hpaned = gtk.HPaned()
+ self.hpaned.pack1(unknownframe, True, True)
+ self.hpaned.pack2(candidateframe, True, True)
+
+ self.settings = shlib.Settings('rename')
+ pos = self.settings.get_value('hpaned', None)
+ if pos:
+ self.hpaned.set_position(pos)
+
+ topvbox.pack_start(self.hpaned, True, True, 2)
+
+ diffframe = gtk.Frame('Differences from Source to Dest')
+ diffframe.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+ scroller = gtk.ScrolledWindow()
+ scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+ diffframe.add(scroller)
+
+ self.diffbuf = gtk.TextBuffer()
+ diffview = gtk.TextView(self.diffbuf)
+ diffview.set_wrap_mode(gtk.WRAP_NONE)
+ diffview.set_editable(False)
+ scroller.add(diffview)
+
+ vpaned = gtk.VPaned()
+ vpaned.pack1(topvbox, True, False)
+ vpaned.pack2(diffframe)
+ pos = self.settings.get_value('vpaned', None)
+ if pos:
+ self.vpaned.set_position(pos)
+
+ self.add(vpaned)
+ self.connect('map_event', self.on_window_map_event)
+
+ def on_window_map_event(self, event, param):
+ try:
+ repo = hg.repository(ui.ui(), self.root)
+ except RepoError:
+ return
+
+ matcher = match.always(repo.root, repo.root)
+ self.status = repo.status(node1=repo.dirstate.parents()[0], node2=None,
+ match=matcher, ignored=False, clean=True, unknown=True)
+ #(modified, added, removed, deleted, unknown, ignored, clean) = status
+
+ def find_renames(self, widget, unktree):
+ '''User pressed 'find renames' button'''
+ pass
+
+ def find_copies(self, widget, unktree):
+ '''User pressed 'find copies' button'''
+ pass
+
+ def accept_match(self, widget, ctree):
+ '''User pressed 'accept match' button'''
+ pass
+
+ def candidate_row_act(self, tree, path, column):
+ '''User activated row of candidate list'''
+ pass # accept copy or rename
+
+ def adj_changed(self, adj):
+ newvalue = adj.get_value()
+
+def run(fname='', target='', detect=True, root='', **opts):
+ if detect:
+ dialog = DetectRenameDialog(root)
+ dialog.show_all()
+ dialog.connect('destroy', gtk.main_quit)
+ else:
+ from dialog import entry_dialog
+ title = 'Rename ' + fname
+ dialog = entry_dialog(None, title, True, target or fname, rename_resp)
+ dialog.orig = fname
+ dialog.show_all()
+ dialog.connect('destroy', gtk.main_quit)
gtk.gdk.threads_init()
gtk.gdk.threads_enter()
gtk.main()
@@ -83,6 +208,10 @@
if __name__ == "__main__":
opts = {'fname' : sys.argv[1]}
- if len(sys.argv) == 3:
+ if '--detect' in sys.argv:
+ import hglib
+ opts['root'] = hglib.rootpath()
+ opts['detect'] = True
+ elif len(sys.argv) == 3:
opts['target'] = sys.argv[2]
run(**opts)
|
|
|
@@ -523,6 +523,9 @@ (modified, added, removed, deleted, unknown, ignored, clean) = status
self.modified = modified
+ if not self.opts.get('rev') and deleted and unknown:
+ print "Suggest to detect renames"
+
changetypes = (('modified', 'M', modified),
('added', 'A', added),
('removed', 'R', removed),
|
||
Add a tag
Loading...