Thomas Arendsen Hein <thomas@intevation.de> [Wed, 25 Oct 2006 17:20:39 +0200] rev 3508
Corrected help text for bundle.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 25 Oct 2006 08:11:17 +0200] rev 3507
Corrected synopsis of hg heads
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 25 Oct 2006 02:51:27 -0300] rev 3506
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 24 Oct 2006 23:00:43 -0300] rev 3505
revlog.py: always return tuples from parents and parentrevs
There's at least one place doing parentrevs(rev) != (rev-1, -1),
which is always true with revlog v0, since parentrevs returns a list
in this case.
Matt Mackall <mpm@selenic.com> [Tue, 24 Oct 2006 17:22:07 -0500] rev 3504
Remove [-b] options from help syntax lines
Matt Mackall <mpm@selenic.com> [Tue, 24 Oct 2006 17:07:11 -0500] rev 3503
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com> [Tue, 24 Oct 2006 16:49:36 -0500] rev 3502
add branch and branches commands
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 24 Oct 2006 17:49:48 -0300] rev 3501
test-mq-caches: look up a revision that does not exist to force cache creation
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 13:42:21 -0700] rev 3500
Merge with mpm
Matt Mackall <mpm@selenic.com> [Tue, 24 Oct 2006 13:46:04 -0500] rev 3499
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 23 Oct 2006 17:12:20 -0500] rev 3498
localrepo: add separate methods for manipulating repository data
This change adds new methods sjoin and sopener for accessing the
following elements:
- changelog
- manifest
- data/
- journal and undo log
- repo lock
This will simplify sharing this data and escaping paths
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 22:38:23 -0500] rev 3497
Minor tags optimization
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 14:14:59 -0500] rev 3496
Use file contexts in tags code
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 14:06:48 -0500] rev 3495
filecontext: report False for missing files
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 11:44:56 -0500] rev 3494
Only look up tags and branches as a last resort
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 13:31:01 -0700] rev 3493
hgweb: add heads to gitweb summary
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 13:17:41 -0700] rev 3492
zsh: cache hg help output
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 13:09:09 -0700] rev 3491
zsh: complete according to the -R option if specified
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 11:10:04 -0700] rev 3490
zsh: add view opts
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 11:10:04 -0700] rev 3489
zsh: add --style and --template opts
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 11:10:04 -0700] rev 3488
zsh: add -r to parents
Brendan Cully <brendan@kublai.com> [Tue, 24 Oct 2006 11:10:04 -0700] rev 3487
zsh: expand tags lazily
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 23 Oct 2006 23:32:56 -0300] rev 3486
make mq play nicely with the branch cache
- if no patches are applied, don't do anything different
- if the cache includes valid data from one of the patch revisions,
use the cache, but don't save anything new
- if the cache has data from before the patch revisions only,
save what the list of branches would be without the patch revisions
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 23 Oct 2006 23:32:56 -0300] rev 3485
Split branchtags into two additional functions.
This makes it easier to override only parts of the cache saving process.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 23 Oct 2006 14:56:51 +0200] rev 3484
Commit username: Better error message, abort on empty name, fix documentation.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 21:47:37 -0300] rev 3483
hgweb: make #motd# available for all templates
Brendan Cully <brendan@kublai.com> [Sat, 21 Oct 2006 23:51:36 -0700] rev 3482
zsh completion: basic mq support
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:02:13 -0300] rev 3481
bash_completion: qguard
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:02:06 -0300] rev 3480
bash_completion: allow overriding completion for arguments that start with "-"
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:02:00 -0300] rev 3479
bash_completion: qfold, qrename, qheader, qclone and qselect
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:01:52 -0300] rev 3478
bash_completion: email --bcc
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:01:45 -0300] rev 3477
bash_completion: qdelete --rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:01:42 -0300] rev 3476
bash_completion: make export fall back to tags when there's no mq patch applied
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 01:01:03 -0300] rev 3475
bash_completion: don't complete export with "garbage" when mq is not around
The "garbage" is the output of hg help printed when a command is not found.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Oct 2006 20:51:24 +0200] rev 3474
Fix "templater object got multiple values for keyword argument 'motd'"
caused by adding motd to the call to the index template (2896ce093ec4)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 21 Oct 2006 20:19:46 +0200] rev 3473
Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.
Brendan Cully <brendan@kublai.com> [Thu, 19 Oct 2006 16:15:01 -0700] rev 3472
gitweb: add revision numbers to annotate changeset links
Brendan Cully <brendan@kublai.com> [Thu, 19 Oct 2006 16:12:43 -0700] rev 3471
gitweb: add revision numbers to filerevision changeset links
Brendan Cully <brendan@kublai.com> [Thu, 19 Oct 2006 15:58:43 -0700] rev 3470
hgweb: add revision numbers to changeset parent/child links
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 19 Oct 2006 16:55:34 +0200] rev 3469
fix errors spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 19 Oct 2006 14:16:51 +0200] rev 3468
use xrange instead of range
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 19 Oct 2006 14:03:41 +0200] rev 3467
use xrange instead of range
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Oct 2006 13:00:02 +0200] rev 3466
Corrected SSH configuration example in pull help.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 19 Oct 2006 10:23:27 +0200] rev 3465
revlog.children: use parentrevs instead of parents
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 18 Oct 2006 18:47:50 -0300] rev 3464
Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 18 Oct 2006 18:44:23 -0300] rev 3463
Update tests output
Brendan Cully <brendan@kublai.com> [Wed, 18 Oct 2006 14:24:38 -0700] rev 3462
Add --rev option to status
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Oct 2006 22:24:03 +0200] rev 3461
makes username mandatory
Brendan Cully <brendan@kublai.com> [Wed, 18 Oct 2006 10:37:34 -0700] rev 3460
patch: return list of modified files even when an exception is raised
The file list is passed in as an argument and updated in place.
This fixes issue399.
Brendan Cully <brendan@kublai.com> [Wed, 18 Oct 2006 10:37:34 -0700] rev 3459
mq: test case for issue399
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 18:10:21 +0200] rev 3458
Extended templating test for new branches and extra changeset info.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 18:09:32 +0200] rev 3457
Added extra changeset info to templater and map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 17:58:51 +0200] rev 3456
Add new branch info to templater and use it in map-cmdline.default.
The template currently shows old (hg log -b style) branch tags, too,
but not in the same way as the built in changeset_printer.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 12:26:12 +0200] rev 3455
Don't show empty list of files in hg log -v.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 12:17:02 +0200] rev 3454
Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 11:55:32 +0200] rev 3453
Show extra changeset info for log/tip/heads/... --debug
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 10:46:51 -0500] rev 3452
If we can't write the branch cache, fail quietly.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Oct 2006 10:35:14 +0200] rev 3451
Add test for invalid branch cache (fixed by 27ebe4efe98e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Oct 2006 09:26:23 +0200] rev 3450
invalidate the branch cache when sanity check fails
Eric Hopper <hopper@omnifarious.org> [Wed, 18 Oct 2006 02:14:26 -0500] rev 3449
Testing the new changegroupsubset remote function in the ssh
and http protocols.
Eric Hopper <hopper@omnifarious.org> [Sat, 09 Sep 2006 18:25:07 -0700] rev 3448
Stop erroring out pull -r and clone -r if repository isn't local.
Eric Hopper <hopper@omnifarious.org> [Sat, 09 Sep 2006 18:25:06 -0700] rev 3447
sshrepo: add passing of lookup exceptions
Eric Hopper <hopper@omnifarious.org> [Sat, 09 Sep 2006 18:25:06 -0700] rev 3446
Adding changegroupsubset and lookup to ssh protocol so pull -r and
clone -r can be supported.
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 02:08:36 -0500] rev 3445
httprepo: add support for passing lookup exception data
Eric Hopper <hopper@omnifarious.org> [Sat, 09 Sep 2006 18:25:06 -0700] rev 3444
Adding changegroupsubset and lookup to web protocol so pull -r and
clone -r can be supported.
Matt Mackall <mpm@selenic.com> [Wed, 18 Oct 2006 02:08:33 -0500] rev 3443
Improve branch cache sanity check for mq
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 22:59:01 -0500] rev 3442
merge: fix branch setting
(and remove debugging message)
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 22:34:43 -0500] rev 3441
imported patch foo
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 22:26:14 -0500] rev 3440
commit: read branch with workingctx
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 22:09:56 -0500] rev 3439
branchtags: use changectx
setting self.branchcache on entry avoids recursions in lookup
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 22:07:54 -0500] rev 3438
revlog.lookup tweaks
- fast path for binary node ids
- direct lookup for full hex ids
- silly change to bin_id
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 19:04:13 -0500] rev 3437
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:54:37 -0500] rev 3436
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:48:41 -0500] rev 3435
Add some basic branch name tests
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:32:00 -0500] rev 3434
Add branch support to commit
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:31:56 -0500] rev 3433
Make lookup aware of branch labels
adjust precedence order slightly:
- '.'
- tags
- branch labels
- revlog order
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:31:18 -0500] rev 3432
Add branchtags function with cache
- cache stores tipmost node and rev and node,label pairs
- if cache is out of date, scan new changesets
- write new cache out after scan
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:30:20 -0500] rev 3431
Update branch on checkout/update
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:30:19 -0500] rev 3430
Report branch for hg id
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:30:18 -0500] rev 3429
Report branch for hg log and friends
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:30:12 -0500] rev 3428
Add branch method to contexts
Matt Mackall <mpm@selenic.com> [Tue, 17 Oct 2006 18:01:14 -0500] rev 3427
imported patch b1
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Oct 2006 17:04:26 -0300] rev 3426
use ui.readsections in the acl extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Oct 2006 17:04:26 -0300] rev 3425
use ui.readsections in the bugzilla extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Oct 2006 17:04:25 -0300] rev 3424
use ui.readsections in the notify extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Oct 2006 16:59:24 -0300] rev 3423
add ui.readsections
Given a file name and a set of sections, this function reads the file
and adds only the specified sections to the configuration data.
Lee Cantey <lcantey@gmail.com> [Tue, 17 Oct 2006 11:01:10 -0700] rev 3422
Default editor for Windows installer is now notepad. [Issue 256]
Lee Cantey <lcantey@gmail.com> [Tue, 17 Oct 2006 10:21:54 -0700] rev 3421
Document the change in MacPython distutils installation location
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Oct 2006 11:46:53 +0200] rev 3420
Added *.bin to MANIFEST.in to include binfile.bin
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Oct 2006 20:38:04 -0300] rev 3419
bundlerepo: avoid exception in __del__ when the bundle doesn't exist
$ hg -R bundle://foo.hg
abort: No such file or directory: foo.hg
Exception exceptions.AttributeError: "'bundlerepository' object has no attribute 'bundlefile'" in <bound method bundlerepository.__del__ of <mercurial.bundlerepo.bundlerepository object at 0xa7ab9fac>> ignored
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Oct 2006 18:01:25 -0300] rev 3418
portability fixes for some tests
Apparently the ls on OS X 10.3.9 exits with success even if the file
given on the command line doesn't exist
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 Oct 2006 22:44:44 +0200] rev 3417
Explicitly use "tip" in revision navigation.
Rationale: the tip revision is a moving target and if somebody wants tip,
it should be delivered.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Oct 2006 15:38:53 -0300] rev 3416
Add a test for the acl extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Oct 2006 15:38:53 -0300] rev 3415
Use a case-sensitive version of SafeConfigParser everywhere
This change has the potential to break existing setups, but the current
behaviour (the keys in configuration files are always lower-cased) can
bite us in a few places:
- no way to use a Command in [defaults]
- hgext.Extension doesn't work in [extensions]
- you can't use an Upper/case/PATH in the [paths] section of hgweb.config
- you can't (easily) protect paths with upper-case letters with the
acl extension
- you can't specify a /Path/TO/a/rEPO in the [reposubs] section for
the notify extension
Brendan Cully <brendan@kublai.com> [Mon, 16 Oct 2006 11:36:57 -0700] rev 3414
Fix test-oldcgi after navbar update
Brendan Cully <brendan@kublai.com> [Mon, 16 Oct 2006 11:18:06 -0700] rev 3413
Fix RSS URLs (closes issue396)
Brendan Cully <brendan@kublai.com> [Mon, 16 Oct 2006 11:02:11 -0700] rev 3412
Convert changenav bar from revisions to hashes (closes issue189)
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.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3347
ui.py: untangle updateopts
The code in ui.updateopts that handles ui.quiet, ui.verbose and
ui.debugflag is too smart, making it somewhat hard to see what
are the exact constraints placed on the values of these variables,
hiding some buglets.
This patch makes these constraints more explicit, fixing these
buglets and changing the behaviour slightly. It also adds a test
to make sure things work as expected in the future.
The buglets:
- setting ui.debug = True in a hgrc wouldn't turn on verbose mode
- additionally, setting ui.quiet = True or using --quiet would give
you a "quiet debug" mode.
The behaviour change:
- previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e.
the final result would be quiet mode), but --verbose wins against
--quiet
- now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet.
As a consequence, using -qv always gives you normal mode (unless
debug mode was turned on somewhere)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3346
call ui.updateopts only after changing directories
This corrects --config paths.foo=bar when it's used with --cwd
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3345
ui.py: normalize settings every time the configuration changes
Previously, we would normalize settings (e.g. turn relative paths into
absolute ones) only after reading a config file.
Now "--config paths.foo=bar" will use the cwd to make "bar" an absolute
path.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3344
move the parsing of --config options to commands.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3343
ui.py: use the overlay to hold --config data
This allows the ui class to know that these items have a higher priority
without further help from commands.py.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3342
ui.py: change the overlay from a dict to a SafeConfigParser.
This also fixes what's probably a bug - configitems was ignoring the overlay.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3341
ui.py: don't query parentui.cdata when looking up config items.
We copied the contents of parentui.cdata on initialization.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3340
ui.py: make walkconfig use configitems
Also make it sort the available config sections while we're at it.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3339
ui.py: move common code out of config and configbool
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3338
ui.py: remove revlogopts and (unused) diffcache variables
This should make the [revlog] section in a .hg/hgrc file be respected
when there's still no changelog.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3337
ui.py: don't let parent and child ui objects share header and prev_header
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3336
ui.py: use correct parentui while copying readhooks
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 13:56:35 -0700] rev 3335
changectx: search manifest delta for filenode
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 13:34:12 -0700] rev 3334
context: check self.__dict__ instead of using hasattr
hasattr implicitly calls getattr, instantiating the field it is
checking for.
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 12:06:14 -0700] rev 3333
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 3332
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 11:30:59 -0700] rev 3331
hgweb: globally default to tip if no revision is specified
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 09:27:57 -0700] rev 3330
Support buffer interface in base85 codec
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:41:52 +0200] rev 3329
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:35:09 +0200] rev 3328
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 3327
Don't generate git diff header for empty diffs
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:54:22 -0700] rev 3326
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 3325
NWI base URL detection fixes
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 11:47:19 +0200] rev 3324
merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 03:39:44 -0500] rev 3323
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 3322
merge: update some docstrings
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 09:30:05 +0200] rev 3321
merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:15:20 -0500] rev 3320
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 3319
context: change workingctx str() from . to <node>+
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:43:58 -0500] rev 3318
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:16:06 -0500] rev 3317
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 3316
context: add cmp for filectxs
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:54:00 -0500] rev 3315
merge: pull file copy/move out of filemerge
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:41:55 -0500] rev 3314
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:32:30 -0500] rev 3313
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:22:03 -0500] rev 3312
merge: finish removing nodes from action list
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:07:46 -0500] rev 3311
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:46:05 -0500] rev 3310
hgweb: remove obsolete listfiles function
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:23:25 -0500] rev 3309
merge: eliminate nodes from action list
- eliminate my and other from merge and copy
- eliminate node from get
- use mctx for get
- fix bug flag = a[2:]
- pass mctx to recordupdates
- use new filectx.size in recordupdates
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:20:48 -0500] rev 3308
filectx: add size method
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:08:41 -0500] rev 3307
run-tests: add --first switch to exit on first error
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:05:11 -0500] rev 3306
run-tests: add --retest switch
-r reruns tests for which a .err file exists
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:27:04 -0500] rev 3305
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:04:25 -0500] rev 3304
fix workingfilectx parents and ancestor functions
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 20:32:03 -0500] rev 3303
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 18:13:38 -0500] rev 3302
merge: don't call hooks for revert
- don't call hooks for revert
- use extra variables to avoid swapping contexts
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 16:07:19 -0500] rev 3301
merge: use contexts for manifestmerge
- take ma, backwards, and copy out of update
- move findcopies call inside manifestmerge
- pass repo rather than ui
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 14:02:01 -0500] rev 3300
commit: unify file-level commit code
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 10 Oct 2006 00:02:30 +0200] rev 3299
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 3298
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:22:55 +0200] rev 3297
merge with upstream
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 20:18:59 -0500] rev 3296
Use filelog.cmp in checkfilemerge
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 19:57:45 -0500] rev 3295
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:52:37 +0200] rev 3294
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:44:20 +0200] rev 3293
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 3292
fix bash completion of debug commands; add test for debugcomplete
The debugconfig -> showconfig renaming broke things.
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sat, 07 Oct 2006 15:16:47 -0400] rev 3291
[patchbomb] prepend leading zeros in the "[PATCH N of M]" string
Without this patch, if one tries to send a patch bomb with more than 9
patches, the resulting subjects are not easily alphabetically sortable.
For example:
...
[PATCH 9 of 10]
[PATCH 10 of 10]
This patch prepends as many leading zeros as necessary. E.g.,
[PATCH 09 of 10]
or
[PATCH 009 of 100]
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Oct 2006 10:56:21 +0200] rev 3290
merged now fully working base85 codec, though currently unused.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Oct 2006 10:55:11 +0200] rev 3289
merge with upstream
Matt Mackall <mpm@selenic.com> [Sat, 07 Oct 2006 17:30:26 -0500] rev 3288
Fix undetected change bug in rename tests
Brendan Cully <brendan@kublai.com> [Sat, 07 Oct 2006 16:21:33 -0700] rev 3287
Handle odd-sized base85 input and output
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Oct 2006 22:11:02 +0200] rev 3286
Put in backslash again, it was needed to disable an asciidoc macro.
Backed out changeset c05b0cc6b1485bb240e118a2be9e1d52bb25fd65
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Oct 2006 22:02:56 +0200] rev 3285
Corrected typo in date format, found by Rob Landley.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Oct 2006 18:14:03 +0200] rev 3284
Make test-bundle-r executable.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Jul 2006 19:25:11 +0200] rev 3283
add -r/--rev and --base option to bundle
--rev is used to specify a target rev (like pull or clone)
--base REV is used to specify a base instead of a target repo
the target repo is assumed to have all the rev specified in --base
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 17:14:50 -0500] rev 3282
Update test output
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 17:14:18 -0500] rev 3281
Merge with crew
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 16:55:11 -0500] rev 3280
merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
Brendan Cully <brendan@kublai.com> [Fri, 06 Oct 2006 13:01:54 -0700] rev 3279
Add a base85 codec
Brendan Cully <brendan@kublai.com> [Fri, 06 Oct 2006 12:58:50 -0700] rev 3278
hgweb: fix filerevision raw URL
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 06 Oct 2006 19:21:43 +0200] rev 3277
disallow commands on non local repository
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 06 Oct 2006 18:38:32 +0200] rev 3276
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 06 Oct 2006 18:28:50 +0200] rev 3275
hgweb: Search templates in templatepath/style/map, too, using a common function.
This allows for web templates to be self-contained in a directory, which makes
copying and modifying them easier.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 06 Oct 2006 16:24:14 +0200] rev 3274
ssh: make the error message more clear, add a testcase
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 15:36:53 -0700] rev 3273
hgweb: be more conservative about expanding SCRIPT_NAME
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 15:04:15 -0700] rev 3272
Add {getentries} to default style
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 14:45:15 -0700] rev 3271
hgweb: fix NWI parsing when hgwebdir isn't at /
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 14:27:14 -0700] rev 3270
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 14:27:14 -0700] rev 3269
hgweb: provide means for handling query parameters