Commits

Yuya Nishihara committed 909fc6a

fin

Comments (0)

Files changed (2)

cmd-filediff.diff

-# HG changeset patch
-# Date 1382278380 -32400
-# Parent 35b394c382021612d256da109f5de50c101ab183
-filelog: add command-line option to open FileDiffDialog
-
-diff --git a/tortoisehg/hgqt/run.py b/tortoisehg/hgqt/run.py
---- a/tortoisehg/hgqt/run.py
-+++ b/tortoisehg/hgqt/run.py
-@@ -553,14 +553,19 @@ def email(ui, repoagent, *revs, **opts):
-     revs = scmutil.revrange(repo, revs)
-     return hgemail.EmailDialog(repoagent, revs)
- 
--@command('^filelog', [], _('thg filelog FILE'))
-+@command('^filelog',
-+    [('2', 'compare', False, _('side-by-side comparison of revisions'))],
-+    _('thg filelog [OPTIONS] FILE'))
- def filelog(ui, repoagent, *pats, **opts):
-     """show history of the specified file"""
-     from tortoisehg.hgqt import filedialogs
-     if len(pats) != 1:
-         raise util.Abort(_('requires a single filename'))
-     filename = hglib.canonpaths(pats)[0]
--    return filedialogs.FileLogDialog(repoagent, filename)
-+    if opts.get('compare'):
-+        return filedialogs.FileDiffDialog(repoagent, filename)
-+    else:
-+        return filedialogs.FileLogDialog(repoagent, filename)
- 
- @command('forget', [], _('thg forget [FILE]...'))
- def forget(ui, repoagent, *pats, **opts):
 cmd-filelog.diff
-cmd-filediff.diff
 graphdele-invalidate.diff
 graphdele-shadow-exp.diff
 graphdele-scene-exp.diff