Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 12:06:14 -0700] rev 3335
Teach bdiff to support buffer objects
manifest.add gives revlog.addrevision a buffer object, which may
be cached and used for a second call in the same session (as mq does
when pushing multiple patches). The other option would be to cast the
buffer to str when caching it.
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 12:02:06 -0700] rev 3334
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 11:30:59 -0700] rev 3333
hgweb: globally default to tip if no revision is specified
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 09:27:57 -0700] rev 3332
Support buffer interface in base85 codec
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:41:52 +0200] rev 3331
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:35:09 +0200] rev 3330
fix traceback of extdiff after a merge
- files that comes from a different branch are marked as modified
but aren't present in the original manifest
- add a testcase for extdiff and for regular diff
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 14:48:26 -0700] rev 3329
Don't generate git diff header for empty diffs
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:54:22 -0700] rev 3328
Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:28:20 -0700] rev 3327
NWI base URL detection fixes
Matt Mackall <mpm@selenic.com> [Wed, 11 Oct 2006 15:52:08 -0500] rev 3326
make manifest-merging test reproduceable
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 10 Oct 2006 21:03:24 +0300] rev 3325
Revert changeset c67920d78248.
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 11:47:19 +0200] rev 3324
merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 09:30:05 +0200] rev 3323
merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 10 Oct 2006 00:02:30 +0200] rev 3322
fix localrepo.status when dealing with x-bit changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:48:44 +0200] rev 3321
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:22:55 +0200] rev 3320
merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:52:37 +0200] rev 3319
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:44:20 +0200] rev 3318
bundle --base: use the right set for the base
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 08 Oct 2006 20:27:23 -0300] rev 3317
fix bash completion of debug commands; add test for debugcomplete
The debugconfig -> showconfig renaming broke things.
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 03:39:44 -0500] rev 3316
merge: pull user messages out to hg.py
- add _update for shadowing in clone
- add _showstats helper
- remove update parameter defaults
- move stats message and merge help messages
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:31:02 -0500] rev 3315
merge: update some docstrings
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:15:20 -0500] rev 3314
merge: various tidying
update tests to handle corrected output and new workingctx display
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:11:59 -0500] rev 3313
context: change workingctx str() from . to <node>+
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:43:58 -0500] rev 3312
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:16:06 -0500] rev 3311
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:13:03 -0500] rev 3310
context: add cmp for filectxs
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:54:00 -0500] rev 3309
merge: pull file copy/move out of filemerge
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:41:55 -0500] rev 3308
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:32:30 -0500] rev 3307
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:22:03 -0500] rev 3306
merge: finish removing nodes from action list
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:07:46 -0500] rev 3305
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:46:05 -0500] rev 3304
hgweb: remove obsolete listfiles function