hg commit: user and date options

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hg commit: user and date options

- From Ted Ts'o

manifest hash: f6ce29eed387664c6f0631b666158eb930876cb3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCrHx4ywK+sNU5EO8RAp/uAKCEGhvm1tpBJ9Bub8BlalWaIpMeqgCfUejo
IoevMbk4cjxQ5P3Zo2pSFs8=
=Ibp3
-----END PGP SIGNATURE-----

mercurial/commands.py

@@ -178,7 +178,7 b' def commit(ui, repo, *files, **opts):'
         try: text = open(opts['logfile']).read()
         except IOError: pass
 
-    repo.commit(relpath(repo, files), text)
+    repo.commit(relpath(repo, files), text, opts['user'], opts['date'])
 
 def debugaddchangegroup(ui, repo):
     data = sys.stdin.read()
@@ -524,7 +524,9 b' table = {'
     "cat|dump": (cat, [], 'hg cat <file> [rev]'),
     "commit|ci": (commit,
                   [('t', 'text', "", 'commit text'),
-                   ('l', 'logfile', "", 'commit text file')],
+                   ('l', 'logfile', "", 'commit text file'),
+                   ('d', 'date', "", 'data'),
+                   ('u', 'user', "", 'user')],
                   'hg commit [files]'),
     "debugaddchangegroup": (debugaddchangegroup, [], 'debugaddchangegroup'),
     "debugchangegroup": (debugchangegroup, [], 'debugchangegroup [roots]'),

mercurial/hg.py

@@ -462,7 +462,7 b' class localrepository:'
         n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
         tr.close()
 
-    def commit(self, files = None, text = ""):
+    def commit(self, files = None, text = "", user = None, date = None):
         commit = []
         remove = []
         if files:
@@ -529,7 +529,7 b' class localrepository:'
                 return 1
             text = edittext
 
-        n = self.changelog.add(mn, new, text, tr, p1, p2)
+        n = self.changelog.add(mn, new, text, tr, p1, p2, user, date)
         tr.close()
 
         self.dirstate.setparents(n)

mercurial/mdiff.py

@@ -67,7 +67,11 b' def diff(a, b, sorted=0):'
     for i in a: p.append(p[-1] + len(i))
 
     if sorted:
-        d = sortdiff(a, b)
+        try:
+            d = sortdiff(a, b)
+        except:
+            print a, b
+            raise
     else:
         d = difflib.SequenceMatcher(None, a, b).get_matching_blocks()
     la = 0