Changes between Version 7 and Version 8 of UsingPidginMercurial

Timestamp:

Jun 14, 2012, 12:50:09 PM (12 years ago)

Author:

John Bailey

Comment:

Add some info about configuring hg via hgrc

UsingPidginMercurial

@@ -9 +9 @@
 
 == Developers ==
+
+=== Configure Mercurial ===
+Mercurial uses an rc file to control its configuration.  There are several that will affect your use.  One set of them is in `/etc/mercurial` and will be controlled by your package manager.  The others are entirely under your control.  Each repository has its own `hgrc` file in `repository/.hg/hgrc` which can be used to configure mercurial's behavior when interacting with that repository.  Finally, there is `~/.hgrc`, which will configure mercurial's behavior for any repository your user account touches.
+
+When working with Pidgin's mercurial repositories, we expect that you will have at least a minimum configuration that gives your name in the 'First Last <email@address.tld>' format.  To do that, two simple lines need to be inserted into an appropriate `hgrc` (I believe most people will want to do this in `~/.hgrc`):
+{{{
+[ui]
+username = First Last <email@address.tld>
+}}}
+
+Other useful options that can be set in the `[ui]` section of an `hgrc` are the merge tool and to make mercurial verbose or not:
+{{{
+[ui]
+username = First Last <email@address.tld>
+verbose = True
+merge = meld
+}}}
+
+Git diffs can be useful too, and making `hg log -v` the default behavior for `hg log` can be helpful:
+{{{
+[diff]
+git = 1
+
+[defaults]
+log = -v
+}}}
 
 === Configure SSH For Access (Developers/CPW's/SoC Students Only) ===
@@ -106 +132 @@
  * [http://hg.pidgin.im/util/hg_hooks/file/tip/notify.py notify.py] slightly tweaked version of the built-in hg hook to facilitate using a separate repo for driving the notifications
   * This is registered in the `/srv/mercurial-server/notification-repo/` (which isn't served anywhere)
- * [[http://hg.pidgin.im/util/hg_hooks/file/tip/hgcia.py hgcia.py] slightly tweaked version of the built-in hg hook for CIA bot notification
+ * [http://hg.pidgin.im/util/hg_hooks/file/tip/hgcia.py hgcia.py] slightly tweaked version of the built-in hg hook for CIA bot notification
   * This is registered in the `/srv/mercurial-server/notification-repo/` (which isn't served anywhere)