Greg Ward <greg-hg@gerg.ca> [Thu, 27 Aug 2009 10:21:32 -0400] rev 9515
Add script to rewrite revlog to workaround lack of parent deltas.
Defaults to rewriting the manifest in the current repository.
Based on a patch to rewrite-log by Benoit Boissinot that I found here:
http://article.gmane.org/gmane.comp.version-control.mercurial.general/11908
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:11:37 +0900] rev 9514
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:30:24 +0900] rev 9513
cmdutil: service: add an optional runargs argument to pass the command to run
This would be necessary for inotify launching its server: the initial command
is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'
Sune Foldager <cryo@cyanite.org> [Thu, 17 Sep 2009 21:12:32 +0200] rev 9512
extdiff: add 3-way diff for merge changesets
This adds 3-way diff for merge changesets (using -c) and for diffing
the working directory context against two parents. To enable it, use
the new magic value '$parent2' in the argument line. In order to work,
your differ must support that the second parent argument is left out;
this will happen in 2-way mode. Default arguments are as before, without
enabling 3-way mode, ensuring backwards compatibility.
This also fixes a problem when diffing a merge changeset with a single
file change. Extdiff would sometimes do the wrong thing in that situation.
Kevin Bullock <kbullock@ringworld.org> [Wed, 23 Sep 2009 21:29:47 -0500] rev 9511
bash_completion: add completions for shelve extension
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 11:40:53 +0200] rev 9510
doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 17:17:52 +0200] rev 9509
dirstate: kill dirstate.granularity config option
The dirstate.granularity configuration parameter was never documented,
it only adds code complexity and it is unneeded.
Adding comments describing forced 'unset' entries.
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 21:42:51 -0500] rev 9508
Merge with -stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 18:47:33 -0500] rev 9507
subrepo: add auto-pull for merge
Greg Ward <greg-hg@gerg.ca> [Wed, 30 Sep 2009 16:08:11 -0400] rev 9506
streamclone: partially encode filename over the wire, not for local read (issue1847)
(Fixes issue1847, which was introduced by 810387f59696: stream clone
of a repo with directory named *.d failed: server raises exception
"IOError: [Errno 2] No such file or directory:
/tmp/test/.hg/store/data/foo.d.hg.hg/foo".)
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 13:15:18 -0500] rev 9505
Merge with i18n-stable
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:42:14 +0200] rev 9504
i18n-da: random small strings, only 499 strings left
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:23:01 +0200] rev 9503
Merge with main
Greg Ward <greg-hg@gerg.ca> [Thu, 17 Sep 2009 18:12:53 -0400] rev 9502
commands: tweak help for 'heads'.
- prefer "changeset" over "revision" for internal consistency
- clarify explanation of branch heads
- add a line break
- tighten some wording
Martin Geisler <mg@lazybytes.net> [Mon, 28 Sep 2009 00:23:44 +0200] rev 9501
i18n-da: translate addremove, branch, and cat
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 23:56:27 +0200] rev 9500
i18n-da: synchronized with 744cb8e93936
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 18:11:11 -0300] rev 9499
i18n-pt_BR: synchronized with f4f17d5695d2
Martin Geisler <mg@lazybytes.net> [Tue, 08 Sep 2009 22:58:28 +0200] rev 9498
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:11:16 +0200] rev 9497
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 10:26:17 -0300] rev 9496
i18n-pt_BR: synchronized with 73bec717b825
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 01:08:18 +0200] rev 9495
ui: guard against UnicodeDecodeErrors in ui.wrap
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 00:00:18 +0200] rev 9494
keyword: uppercase short option for kwfiles --all, like hg status -A
Deprecate kwfiles -a.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 23:59:03 +0200] rev 9493
keyword: make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 23:59:03 +0200] rev 9492
keyword: make kwfiles --all show unknown files too
More consistent and similar to hg status.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 22:39:56 +0200] rev 9491
keyword: kwfiles --unknown instead of --untracked
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
Brendan Cully <brendan@kublai.com> [Wed, 30 Sep 2009 14:43:22 -0700] rev 9490
convert: unbreak non-svn engines
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 26 Sep 2009 00:17:55 +0300] rev 9489
zeroconf: read actual description for repos in hgwebdir
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 26 Sep 2009 00:17:02 +0300] rev 9488
zeroconf: code cleanup, fixing variable names to be meaningful