Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 36636:c6061cadb400

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: extract all date-related utils in utils/dateutil module With this commit, util.py lose 262 lines Note for extensions author, if this commit breaks your extension, you can pull the step-by-step split here to help you more easily pinpoint the renaming that broke your extension: hg pull https://bitbucket.org/octobus/mercurial-devel/ -r ac1f6453010d Differential Revision: https://phab.mercurial-scm.org/D2282
author Boris Feld <boris.feld@octobus.net>
date Thu, 15 Feb 2018 17:18:26 +0100
parents aa3294027936
children 2dce0049176c
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Thu Feb 08 23:27:24 2018 +0530
+++ b/mercurial/cmdutil.py	Thu Feb 15 17:18:26 2018 +0100
@@ -47,6 +47,7 @@
     util,
     vfs as vfsmod,
 )
+from .utils import dateutil
 stringio = util.stringio
 
 # templates of common command options
@@ -1530,7 +1531,7 @@
     write("# HG changeset patch\n")
     write("# User %s\n" % ctx.user())
     write("# Date %d %d\n" % ctx.date())
-    write("#      %s\n" % util.datestr(ctx.date()))
+    write("#      %s\n" % dateutil.datestr(ctx.date()))
     if branch and branch != 'default':
         write("# Branch %s\n" % branch)
     write("# Node ID %s\n" % hex(node))
@@ -1629,7 +1630,7 @@
 def finddate(ui, repo, date):
     """Find the tipmost changeset that matches the given date spec"""
 
-    df = util.matchdate(date)
+    df = dateutil.matchdate(date)
     m = scmutil.matchall(repo)
     results = {}
 
@@ -1642,7 +1643,7 @@
         rev = ctx.rev()
         if rev in results:
             ui.status(_("found revision %s from %s\n") %
-                      (rev, util.datestr(results[rev])))
+                      (rev, dateutil.datestr(results[rev])))
             return '%d' % rev
 
     raise error.Abort(_("revision matching date not found"))
@@ -2261,7 +2262,7 @@
     '''commit the specified files or all outstanding changes'''
     date = opts.get('date')
     if date:
-        opts['date'] = util.parsedate(date)
+        opts['date'] = dateutil.parsedate(date)
     message = logmessage(ui, opts)
     matcher = scmutil.match(repo[None], pats, opts)
 
@@ -2326,7 +2327,7 @@
         date = opts.get('date') or old.date()
 
         # Parse the date to allow comparison between date and old.date()
-        date = util.parsedate(date)
+        date = dateutil.parsedate(date)
 
         if len(old.parents()) > 1:
             # ctx.files() isn't reliable for merges, so fall back to the