Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Oct 2006 12:56:41 +0200] rev 3411
add footer to old style
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Oct 2006 12:49:11 +0200] rev 3410
fix rss template
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 Oct 2006 09:53:31 +0200] rev 3409
Fixed page overlap for file revision links in hgweb.
This is another step to fix issue189, but currently the file revision numbers
are read as changeset revision numbers, so the link will point to the wrong
revision.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 Oct 2006 09:23:26 +0200] rev 3408
merge with main
Matt Mackall <mpm@selenic.com> [Sun, 15 Oct 2006 16:18:09 -0500] rev 3407
merge: if filemerge skips merge, report as updated
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 23:51:28 -0700] rev 3406
hgweb: hoist changenav up, and use it in the filelog
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 21:20:15 -0700] rev 3405
hgweb: link to file parents in filediff, rather than changeset parents
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 20:57:30 -0700] rev 3404
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 18:43:46 -0700] rev 3403
Fix annotate where linkrev != rev without exporting linkrev
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 18:25:07 -0700] rev 3402
Back out d8eba1c3ce9b and a004164dbeef
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 17:38:07 -0700] rev 3401
Make annotate use linkrev instead of rev
Brendan Cully <brendan@kublai.com> [Sun, 15 Oct 2006 17:37:04 -0700] rev 3400
Add linkrev to filectx
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 15 Oct 2006 21:09:56 +0200] rev 3399
Catch python2.3's IndexError with bogus http proxy settings. (issue203)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 15 Oct 2006 20:56:38 +0200] rev 3398
Fixed contrib/hgdiff script to pass diffopts in the new format.
Aurelien Jacobs <aurel@gnuage.org> [Sun, 15 Oct 2006 16:35:47 +0200] rev 3397
document the diffstat option of the notify extension
Brendan Cully <brendan@kublai.com> [Sat, 14 Oct 2006 16:39:15 -0700] rev 3396
hgweb: add diff links in gitweb file revision page
Brendan Cully <brendan@kublai.com> [Sat, 14 Oct 2006 16:27:51 -0700] rev 3395
hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com> [Sat, 14 Oct 2006 16:20:22 -0700] rev 3394
hgweb: really fix parent/child rename links
Brendan Cully <brendan@kublai.com> [Sat, 14 Oct 2006 16:07:52 -0700] rev 3393
hgweb: better file rename links
Brendan Cully <brendan@kublai.com> [Sat, 14 Oct 2006 16:03:23 -0700] rev 3392
hgweb: fix parent/child links across renames
Brendan Cully <brendan@kublai.com> [Sat, 14 Oct 2006 15:28:45 -0700] rev 3391
hgweb: add changeset description to annotate page
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 14 Oct 2006 18:47:48 -0300] rev 3390
make revlog.addgroup pass its file handles to addrevision
This should fix issue255.
It looks like the problem there happens when addgroup calls addrevision
to add a full revision, and addrevision decides to split the index file
into a .i/.d pair. Since addgroup has an open file handle for the
index file, the renaming of the new .i file to its final name fails on
windows.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:53:29 +0200] rev 3389
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
(Test case created by Johannes Hofmann)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:39:40 +0200] rev 3388
merge with upstream
Matt Mackall <mpm@selenic.com> [Fri, 13 Oct 2006 17:58:04 -0500] rev 3387
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 13 Oct 2006 15:34:35 -0300] rev 3386
use short hashes with diff -v
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 11:17:17 -0700] rev 3385
Use manifest rev instead of changelog rev for linear manifest test
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 13 Oct 2006 19:35:08 +0200] rev 3384
Removed unused imports of mdiff and templater from ui.py
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 09:58:55 -0700] rev 3383
log --copies: use manifest.find instead of delta when manifest parent is not rev-1
This fixes issue391.
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 09:58:55 -0700] rev 3382
Test case for log --copies on non-linear manifests (issue391)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 13 Oct 2006 16:34:58 +0200] rev 3381
hgweb: fix path cleaning
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 13 Oct 2006 10:50:35 +0200] rev 3380
Merge with asak
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 12 Oct 2006 20:45:25 -0300] rev 3379
portability fix for test-ssh
The __del__ method of sshrepo reads the stderr of the remote process
until EOF and prints it.
If an exception is raised, this method ends up being called:
- on Linux: after the "abort: ..." message is printed
- on OS X: before the "abort: ..." message is printed
This patch explicitly flushes the stderr of the remote process before
raising a RepoError.
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 00:26:46 -0700] rev 3378
Merge with mpm
Matt Mackall <mpm@selenic.com> [Thu, 12 Oct 2006 14:49:19 -0500] rev 3377
merge: turn followcopies on by default
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 16:34:32 -0700] rev 3376
Add popen2 demandload to patch.py, required by diffstat
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 12 Oct 2006 19:26:06 -0300] rev 3375
rawcommit: add removed files to the changelog file list
patch by tonfa.
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 14:19:34 -0700] rev 3374
Update test-mq-qdelete to use qdel -r
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 14:02:41 -0700] rev 3373
mq: make qdelete without -k or a subrepository delete all patches
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 13:39:14 -0700] rev 3372
Use line length field when extracting git binary patches
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 13:24:09 -0700] rev 3371
mq: change qdel --forget to --rev; accept any revision symbol
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 12:15:56 -0700] rev 3370
mq.el: add mode-line hook
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 12 Oct 2006 14:04:11 -0300] rev 3369
python2.5 PyArg_ParseTuple fix
Python 2.5 doesn't like it when we mix str objects and the "t#" format
in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4
and 2.5.
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 09:17:16 -0700] rev 3368
Add test for git binary diff support
Brendan Cully <brendan@kublai.com> [Thu, 12 Oct 2006 09:17:16 -0700] rev 3367
Add git-1.4 binary patch support
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Oct 2006 17:48:09 +0200] rev 3366
gitweb: Fixed parent/child links when viewing a file revision.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Oct 2006 17:06:51 +0200] rev 3365
Keep session variables when linking from hgwebdir's index to repositories.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Oct 2006 16:37:03 +0200] rev 3364
Fixed typo in gitweb templates.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 11 Oct 2006 22:01:24 +0200] rev 3363
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 11 Oct 2006 20:59:37 +0200] rev 3362
hgweb: Keep session variables (currently only style) in HTML forms, too.
Adjusted default and gitweb template for this.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 11 Oct 2006 20:53:02 +0200] rev 3361
templater: Better exception for errors in foo%bar formatting.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 12 Oct 2006 11:40:26 +0200] rev 3360
nodesbetween: fix a bug with duplicate heads
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:56:41 -0700] rev 3359
hgweb: trap lookup errors
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:50:17 -0700] rev 3358
Add better error message for bad commands
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:49:53 -0700] rev 3357
gitweb: Add error text to error page
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:39:42 -0700] rev 3356
gitweb: fix link on file name in filenodelink
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:32:06 -0700] rev 3355
gitweb: fix last change field in summary
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:20:35 -0700] rev 3354
Merge with main
Matt Mackall <mpm@selenic.com> [Wed, 11 Oct 2006 17:37:48 -0500] rev 3353
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 11 Oct 2006 15:52:08 -0500] rev 3352
make manifest-merging test reproduceable
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 10 Oct 2006 21:03:24 +0300] rev 3351
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:
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:19:11 -0700] rev 3350
gitweb: add file diff view
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 23:31:05 +0200] rev 3349
merge with crew
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3348
update ui.quiet/verbose/debug/interactive every time the config changes
- ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata
settings
- the quiet, verbose, debug and interactive options from the [ui] section
from .hg/hgrc files are respected for commands that open the repo
- setting ui.quiet/verbose/debug/interactive with --config works
- the command line options always override the hgrc settings - previously
it wasn't possible to override a [ui] debug = True. --debug still
takes precedence over --quiet and --verbose.