Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 608:d2994b5298fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add username/merge/editor to .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add username/merge/editor to .hgrc These take priority over the equivalent environment vars Deprecate HGMERGE, HGUSER, and HGEDITOR in docs Add ui section to docs Remove undocumented HG_OPTS Raise username code out of changelog class Make tests ignore ~/.hgrc manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr qwGFd+WaNqTepZ0wun5g9Uc= =QEBu -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Jul 2005 21:51:09 -0800
parents 0c3bae18403b
children 2acf1f5df2e6
line wrap: on
line diff
--- a/mercurial/hg.py	Sun Jul 03 21:14:40 2005 -0800
+++ b/mercurial/hg.py	Sun Jul 03 21:51:09 2005 -0800
@@ -161,12 +161,6 @@
 
     def add(self, manifest, list, desc, transaction, p1=None, p2=None,
                   user=None, date=None):
-        user = (user or
-                os.environ.get("HGUSER") or
-                os.environ.get("EMAIL") or
-                (os.environ.get("LOGNAME",
-                               os.environ.get("USERNAME", "unknown"))
-                 + '@' + socket.getfqdn()))
         date = date or "%d %d" % (time.time(), time.timezone)
         list.sort()
         l = [hex(manifest), user, date] + list + ["", desc]
@@ -592,6 +586,7 @@
                     pass
 
         mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
+        user = user or self.ui.username()
         n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
         tr.close()
         if update_dirstate:
@@ -675,6 +670,7 @@
                 return 1
             text = edittext
 
+        user = user or self.ui.username()
         n = self.changelog.add(mn, new, text, tr, p1, p2, user, date)
 
         if not self.hook("commit", node=hex(n)):
@@ -1303,7 +1299,8 @@
         self.ui.debug("file %s: other %s ancestor %s\n" %
                               (fn, short(other), short(base)))
 
-        cmd = os.environ.get("HGMERGE", "hgmerge")
+        cmd = self.ui.config("ui", "merge") or \
+              os.environ.get("HGMERGE", "hgmerge")
         r = os.system("%s %s %s %s" % (cmd, a, b, c))
         if r:
             self.ui.warn("merging %s failed!\n" % fn)