Matt Mackall <mpm@selenic.com> [Fri, 27 Oct 2006 12:09:33 -0500] rev 3565
Simplify ignore logic in dirstate.walk
- kill blockignore hack
- pull pconvert out of imatch
- skip imatch when not ignoring
Matt Mackall <mpm@selenic.com> [Fri, 27 Oct 2006 11:30:20 -0500] rev 3564
shortname: truncate at '.' too
Matt Mackall <mpm@selenic.com> [Fri, 27 Oct 2006 11:24:10 -0500] rev 3563
improve walk docstrings
Matt Mackall <mpm@selenic.com> [Fri, 27 Oct 2006 00:38:42 -0500] rev 3562
convert dict(zip(x,x)) to dict.fromkeys(x)
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 23:59:21 -0500] rev 3561
minor hg grep simplification
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 23:54:24 -0500] rev 3560
simplify dirstate walking
- kill walkhelper
- stop passing dc around
- remove unused stat arg from statmatch (renamed imatch)
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 18:43:57 -0500] rev 3559
kill makewalk function
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 17:45:03 -0500] rev 3558
Pull getchange out of walkchangerevs
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 17:27:07 -0500] rev 3557
Make revrange return a list of ints so that callers don't have to convert
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 17:15:55 -0500] rev 3556
simplify revrange and revpair
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 14:09:15 -0500] rev 3555
lookup(str(x)) -> lookup(x)
Matt Mackall <mpm@selenic.com> [Thu, 26 Oct 2006 14:04:58 -0500] rev 3554
Fixups for hg grep
- kill trimuser function
- remove ucache
- simplify descending logic
- fix files with matches logic
- correct tests
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 27 Oct 2006 19:24:57 +0200] rev 3553
Turn bundle file into a string for http push, for urllib2 over proxies.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 27 Oct 2006 18:30:53 +0200] rev 3552
Force the content-length header to be a string in httprepo.unbundle.
(Needed for Python2.3 compatibility)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 27 Oct 2006 18:20:28 +0200] rev 3551
Use the new UnexpectedOutput exception in httprepo, too.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 27 Oct 2006 18:17:12 +0200] rev 3550
New UnexpectedOutput exception to catch server errors in localrepo.stream_in
If the unexpected is a string, the empty string will be mentioned, and long
strings are cut to at most 400 chars.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 27 Oct 2006 15:56:34 +0200] rev 3549
Some clarifications for pull/push protocols:
- List file:// and static-http://
- Mention that you can pull from bundle files
- List http and https as valid push targets, but emphasize that this
feature has to be enabled.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 27 Oct 2006 15:02:27 +0200] rev 3548
httprepo: record the url after a request, makes pull + redirect works
POST+redirect doesn't work in python, as a workaround we record the url
from the previous GETs so that when we do a POST it uses the redirected url
fix issue327
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 27 Oct 2006 10:24:19 +0200] rev 3547
add AIX to the list of compilers that don't have inline keyword
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 22:28:33 -0700] rev 3546
zsh: support remote URLs
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 17:33:24 -0700] rev 3545
zsh: suppress mq completion error messages outside of repository
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 17:28:12 -0700] rev 3544
zsh: suppress error message for status completion outside of repository
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Oct 2006 19:25:45 +0200] rev 3543
Turn of "Not trusting file" logging when running hgweb and hgwebdir
(hg serve still shows the warning)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Oct 2006 19:25:45 +0200] rev 3542
use untrusted settings in hgwebdir
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Oct 2006 19:25:45 +0200] rev 3541
use untrusted settings in hgweb
The only exceptions are web.static and web.templates, since they can
be used to get any file that is readable by the user running the CGI
script.
Other options can be (ab)used to increase the use of the cpu
(allow_bz2) or of the bandwidth (server.uncompressed), but they're
trusted anyway.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Oct 2006 19:25:45 +0200] rev 3540
add untrusted argument to patch.diffopts
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Oct 2006 19:25:45 +0200] rev 3539
add --untrusted to showconfig
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Oct 2006 19:25:45 +0200] rev 3538
save settings from untrusted config files in a separate configparser
This untrusted configparser is a superset of the trusted configparser,
so that interpolation still works.
Also add an "untrusted" argument to ui.config* to allow querying
ui.ucdata.
With --debug, we print a warning when we read an untrusted config
file, and when we try to access a trusted setting that has one value
in the trusted configparser and another in the untrusted configparser.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Oct 2006 19:25:44 +0200] rev 3537
Only read .hg/hgrc files from trusted users/groups
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.
Global hgrc files are always read.
On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.
This is essentially the same patch that was previously applied as
revision 494521a3f142.
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 10:06:12 -0700] rev 3536
zsh: add revrange completion
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 09:46:08 -0700] rev 3535
zsh: add qbase and qtip to qapplied completions
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 09:44:03 -0700] rev 3534
zsh: use standard tags where possible
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 09:40:20 -0700] rev 3533
mq: support qimport -
Christian Ebert <blacktrash@gmx.net> [Wed, 25 Oct 2006 20:59:50 +0200] rev 3532
hgcommand.vim: doc install delete into "black hole", g: prefix global vars.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Oct 2006 09:29:42 +0200] rev 3531
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Oct 2006 09:22:10 +0200] rev 3530
Corrected hg synopsis.
Brendan Cully <brendan@kublai.com> [Thu, 26 Oct 2006 00:27:19 -0700] rev 3529
zsh: complete qguard with +/- guard prefixes
Christian Ebert <blacktrash@gmx.net> [Wed, 25 Oct 2006 21:01:00 +0200] rev 3528
hgcommand.vim: remove deprecated -b option from hg parents.
Brendan Cully <brendan@kublai.com> [Wed, 25 Oct 2006 19:31:42 -0700] rev 3527
zsh: complete qapplied, qdiff, qfold, qguard, qimport, qnext, qprev
as well as qrename, qselect, qseries, qunapplied and qtop.
Brendan Cully <brendan@kublai.com> [Wed, 25 Oct 2006 17:09:22 -0700] rev 3526
Merge with mpm
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 18:31:49 -0500] rev 3525
Update tests for removed commands
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 18:29:54 -0500] rev 3524
Remove update -m, deprecated for 0.9.1
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 17:53:24 -0500] rev 3523
Remove the undo command, deprecated pre-0.9
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 17:47:53 -0500] rev 3522
Remove forget command, deprecated pre-0.9
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 17:45:35 -0500] rev 3521
Fix excessive complaining from hg log -b
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 17:40:03 -0500] rev 3520
Remove some more deprecated options from help syntax summaries
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 17:38:17 -0500] rev 3519
Hide deprecated flags in help unless verbose
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 16:45:39 -0500] rev 3518
Remove old fish-merge test
Brendan Cully <brendan@kublai.com> [Wed, 25 Oct 2006 16:35:35 -0700] rev 3517
zsh: make option lists more compact
Brendan Cully <brendan@kublai.com> [Wed, 25 Oct 2006 15:10:30 -0700] rev 3516
Merge with mpm
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 16:42:52 -0500] rev 3515
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 16:30:45 -0500] rev 3514
Some README updates
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 16:25:44 -0500] rev 3513
Remove some old documentation that belongs on the wiki
Matt Mackall <mpm@selenic.com> [Wed, 25 Oct 2006 16:24:28 -0500] rev 3512
Move rewrite-log to contrib
Brendan Cully <brendan@kublai.com> [Wed, 25 Oct 2006 15:08:40 -0700] rev 3511
zsh: rewrite
This version of zsh completion handles global options more correctly,
completes options for command abbreviations, and does much more lazy
evaluation.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 25 Oct 2006 18:45:18 +0200] rev 3510
Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 25 Oct 2006 18:22:04 +0200] rev 3509
fix graph traversal in commands.bundle (it wasn't O(n))
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
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 20:03:38 +0200] rev 3268
Some versions of sed don't support .\+, so use ..* instead.
Reported by Christian Ebert for MacOS X.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 15:51:54 +0200] rev 3267
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 11:57:38 +0200] rev 3266
hgweb: Added safety net for PATH_INFO starting with double slash.
This happens e.g. when using the following apache config:
RewriteRule (.*) /hgwebdir/$1 [PT]
instead of the less readable (but more correct):
RewriteRule (.*) /hgwebdir$1 [PT]
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 10:15:22 +0200] rev 3265
merged NewWebInterface
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3264
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3263
Rename default style to old
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3262
hgweb: support for generating and parsing NWI URLs
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3261
Teach hgwebdir about new interface
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3260
hgweb: extract raw prefix from NWI commands
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3259
hgweb: accept NewWebInterface URLs
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 10:07:40 +0200] rev 3258
merge with upstream
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 19:08:04 -0500] rev 3257
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 17:59:27 -0500] rev 3256
Make status -C work with merge+rename
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 15:43:27 -0500] rev 3255
merge: add rename following
Currently disabled by default, enable with
[merge]
followcopies = 1
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:33:22 -0500] rev 3254
merge: reduce manifest copying
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 05 Oct 2006 00:14:21 +0200] rev 3253
merge with crew
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:22 +0200] rev 3252
Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:18 +0200] rev 3251
util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:14 +0200] rev 3250
util.strdate: compute timestamp using UTC, not local timezone
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 22:07:03 +0200] rev 3249
merge with upstream
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:09:26 -0500] rev 3248
merge: reorder dirstate update slightly for correctness
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 12:39:51 -0700] rev 3247
patchbomb: update --attach to use cmdutil.make_filename
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 11:14:33 -0700] rev 3246
hgweb: fix manifest link in gitweb summary
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 18:43:40 +0200] rev 3245
Corrected install location of manpages.
(man/manSECTION/ instead of man/man.SECTION/)
Wojciech Milkowski <wmilkowski@interia.pl> [Wed, 04 Oct 2006 18:06:03 +0200] rev 3244
Fix static file serving over HTTP on Windows.
Files to be served should be opened in binary mode.
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 16:36:40 -0700] rev 3243
mq: update qfold to call delete correctly
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 12:28:27 -0700] rev 3242
Make changectx.filenode raise repo.LookupError on failure
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 12:14:33 -0700] rev 3241
Merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 03 Oct 2006 01:21:46 -0500] rev 3240
merge: use new working context object in update
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 22:03:14 -0500] rev 3239
contexts: add working dir and working file contexts
add workingctx
add workingfilectx
extend filectx.annotate for rev=None
extend filectx.ancestor
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:28:44 -0500] rev 3238
context: simplify repr methods
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:17:59 -0500] rev 3237
contexts: use __getattr__ rather than try/except in changectx
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:02:28 -0500] rev 3236
context: make filectx remember changectx in changectx.filectx
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 14:23:38 -0500] rev 3235
Make filectx lazier
Lazy opening of filelog, lazy lookup of filenode and changeid
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 12:06:33 -0500] rev 3234
merge: remove old merge function
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 12:04:48 -0500] rev 3233
merge: extend file merge function for renames
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:54:11 +0200] rev 3232
Fix minor indentation problem in template-vars.txt
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:53:35 +0200] rev 3231
Install all files/subdirectories below templates.
This is needed because styles are now in their own subdirectory.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:30:59 +0200] rev 3230
Applied coding style to setup.py
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:59:39 -0700] rev 3229
Use parentrevs shortcut in filectx.annotate
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:37:57 -0700] rev 3228
Move raw theme into subdirectory
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:35:41 -0700] rev 3227
Move RSS theme into subdirectory
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:30:45 -0700] rev 3226
Move gitweb theme into subdirectory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 22:35:52 +0200] rev 3225
[extendedchangelog] add extra metadata in the changelog entry
- add a third item in the date field that holds arbitrary
key:value items
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 22:35:37 +0200] rev 3224
[extendedchangelog] encode/decode function
encode '\n', '\r' and '\0'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 21:10:31 +0200] rev 3223
fix warnings from pychecker
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 09:58:03 -0700] rev 3222
Fix gitweb index archive link
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 08:40:26 +0200] rev 3221
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 08:36:29 +0200] rev 3220
test-merge-revert2 solaris fix
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 13:44:08 -0700] rev 3219
Make filectx.__init__ use LookupError
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 12:56:58 -0700] rev 3218
hgweb: add methods to get contexts from request
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 12:42:50 -0700] rev 3217
Raise LookupError in changectx.filectx if filenode can't be found
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 11:58:55 -0700] rev 3216
Add hg.LookupError
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 01 Oct 2006 19:26:33 +0200] rev 3215
Whitespace/Tab cleanup
Edouard Gomez <ed.gomez@free.fr> [Thu, 21 Sep 2006 21:24:53 +0200] rev 3214
Add gitweb style hgwebdir
Edouard Gomez <ed.gomez@free.fr> [Thu, 21 Sep 2006 21:24:26 +0200] rev 3213
Add style support to hgwebdir
Brendan Cully <brendan@kublai.com> [Sat, 30 Sep 2006 21:32:29 -0700] rev 3212
hgweb: use contexts in more handlers
Brendan Cully <brendan@kublai.com> [Sat, 30 Sep 2006 20:56:26 -0700] rev 3211
filelog.annotate is now obsolete
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Sep 2006 15:15:59 +0200] rev 3210
correctly find the type of 'id' in revlog.lookup
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 12:34:31 +0200] rev 3209
merged brendan's hgweb cleanups
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3208
hgweb: teach siblings and callers to use contexts
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3207
Add lookup method to filectx
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3206
hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3205
hgweb: kill #manifest#
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 10:29:57 +0200] rev 3204
Remove duplicate walkopts + dryrunopts from addremove.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 09:46:03 +0200] rev 3203
Merge with upstream
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 17:50:59 -0500] rev 3202
merge: minor nullid cleanup
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 17:47:51 -0500] rev 3201
context: add __nonzero__ methods
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:39:38 -0500] rev 3200
merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:29:44 -0500] rev 3199
Add str methods to contexts
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:01:46 -0500] rev 3198
Add equality operators to changectx and filectx
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 15:56:36 -0500] rev 3197
localrepo.parents: return null context for no parents
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 15:48:16 -0500] rev 3196
Add localrepo.parents to get parent changectxs.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 09:39:44 +0200] rev 3195
Remove unneeded (and bashismic) export HGMERGE=true.
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 18:17:29 -0700] rev 3194
Templater expects an iterable copies variable (fixes notify).
Stephen Darnell <stephen@darnell.plus.com> [Thu, 28 Sep 2006 21:00:01 +0100] rev 3193
Remove single character equivalent of --nodates (was -D)
Stephen Darnell <stephen@darnell.plus.com> [Tue, 26 Sep 2006 00:05:24 +0100] rev 3192
Add -D/--nodates options to hg diff/export that removes dates from diff headers
and replace uses of sed in the tests with --nodates.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 23:14:22 +0200] rev 3191
Documentation clarification for --update option to pull and unbundle
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:01:19 -0700] rev 3190
Show copies in hg log.
The format is:
copies: destination (source)...
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:54 -0700] rev 3189
Abstract manifest block parsing.
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:36 -0700] rev 3188
Make hg.repository work with no path argument
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 21:24:45 +0200] rev 3187
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 21:24:15 +0200] rev 3186
Make "hg log --style=changelog > changelog" work (issue338)
Style files in templates/ now take precedence over current directory.
This can be overridden with --style=./changelog if really neeeded.
Added test for issue338.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 19:43:07 +0200] rev 3185
Clarify precedence for template/style in commands.show_changeset():
Display format will be the first non-empty hit of:
1. option 'template'
2. option 'style'
3. [ui] setting 'logtemplate'
4. [ui] setting 'style'
If all of these values are either the unset or the empty string,
regular display via changeset_printer() is done.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 20:00:24 +0200] rev 3184
add remoteopts to bundle command
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 19:59:06 +0200] rev 3183
factor opts: remote repo access options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:49 +0200] rev 3182
factor opts: --dry-run option
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:32 +0200] rev 3181
factor opts: walk options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Sep 2006 18:39:08 +0200] rev 3180
factor opts: move globalopts to a more logical place
we will put other options at the same place
Brendan Cully <brendan@kublai.com> [Thu, 28 Sep 2006 11:41:33 -0700] rev 3179
mq: raise util.Abort instead of using sys.exit(1)
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 14:50:20 -0700] rev 3178
mq: don't write applied patches into series twice in restore
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 14:32:53 -0700] rev 3177
mq: bail out if a patch appears more than once in the series file.
Closes: #379.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 13:34:20 -0700] rev 3176
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
This moves most of the queue display code into qseries.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 21:44:20 +0200] rev 3175
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 21:43:45 +0200] rev 3174
Documentation fixes for addremove.
- It is no longer deprecated, but the short help still included (DEPRECATED).
- Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
TK Soh <teekaysoh@yahoo.com> [Wed, 27 Sep 2006 08:27:16 -0500] rev 3173
hgk: fix mixup of --limit and REVRANGE in hgk call
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 12:08:33 -0700] rev 3172
gitweb: cosmetic fixes.
Fix the padding around the changelog description.
Alternate row colours for the changeset file list.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 12:08:32 -0700] rev 3171
hgweb: yield filenode as well as node in annotate, use filenode in annotateline
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 12:08:30 -0700] rev 3170
hgweb: fix changeset link in annotate view.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 27 Sep 2006 20:34:52 +0200] rev 3169
shortuser should stop before the first space character.
Examples:
"Foo Bar <foo.bar AT example DOT com>" -> "foo.bar"
(instead of "foo.bar AT example DOT com>" as it was before.)
"Foo Bar" -> "Foo"
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:31 -0700] rev 3168
hgweb: make annotate line revisions point to annotation for that rev
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:29 -0700] rev 3167
hgweb: fix annotate bugs
The parent and child links were broken.
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:28 -0700] rev 3166
hgweb: use filectx.annotate instead of filelog
Brendan Cully <brendan@kublai.com> [Wed, 27 Sep 2006 09:10:21 -0700] rev 3165
Refactor annotate copy support.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 27 Sep 2006 09:35:53 +0200] rev 3164
merge with mainline
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 16:21:52 -0500] rev 3163
merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 16:04:07 -0500] rev 3162
merge: move findcopies after workingmanifest
Matt Mackall <mpm@selenic.com> [Tue, 26 Sep 2006 15:58:51 -0500] rev 3161
findcopies: shortcut for empty working dir
TK Soh <teekaysoh@yahoo.com> [Tue, 26 Sep 2006 14:40:21 -0500] rev 3160
do not disclose proxy user and password in debug messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Sep 2006 13:58:58 +0200] rev 3159
fix users of dirstate.copies broken by b1f10d3223c1
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 22:26:54 -0500] rev 3158
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 20:31:05 -0500] rev 3157
findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 17:53:17 -0500] rev 3156
dirstate: add copies function
rename copies to copymap
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 16:45:31 -0500] rev 3155
Add core copy detection algorithm
This adds findcopies, which detects merge-relevant copies between
files in a pair of manifests back to the merge ancestor.
While the merge code invokes the copy detection routine, it does not
yet use the result.
Matt Mackall <mpm@selenic.com> [Mon, 25 Sep 2006 16:43:21 -0500] rev 3154
context: change filectx repr to use @
Avoids confusion with rev:nodeid syntax used elsewhere
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Sep 2006 13:52:27 +0200] rev 3153
optimize revlog.lookup when passed hex(node)[:...]
Instead of converting each node from the filenode to a hex form,
convert the arg to a bin form.
For a revlog with 26711 entries, doing 100 lookup:
before: ~18s
after : ~13s
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Sep 2006 13:52:25 +0200] rev 3152
cleanups in revlog.lookup
- add comments
- do a clean separation of the different cases
- don't use a list of each possible node when
doing the lookup, just keep the previous entry
Matt Mackall <mpm@selenic.com> [Fri, 22 Sep 2006 16:12:39 -0500] rev 3151
context: add __repr__ methods
Matt Mackall <mpm@selenic.com> [Fri, 22 Sep 2006 16:01:14 -0500] rev 3150
filectx: lazy linkrev usage
Matt Mackall <mpm@selenic.com> [Fri, 22 Sep 2006 15:34:02 -0500] rev 3149
restore filectx.changectx() method
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Sep 2006 18:29:04 +0200] rev 3148
fix newline in error message
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Sep 2006 17:58:22 +0200] rev 3147
add comments in cachefunc
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3146
filectx.annotate: return filectx for each line instead of rev
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3145
Add cachefunc to abstract function call cache
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3144
Make filectx lazier - some users never use filenode
Brendan Cully <brendan@kublai.com> [Fri, 22 Sep 2006 08:19:25 -0700] rev 3143
context: handle fileid or changeid == 0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Sep 2006 08:48:56 +0200] rev 3142
merge with crew
Brendan Cully <brendan@kublai.com> [Tue, 19 Sep 2006 10:22:30 -0700] rev 3141
mq: Add --rev argument to qimport, to adopt existing changesets.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Sep 2006 22:26:47 +0200] rev 3140
manifest.py: remove unnecessary method
Matt Mackall <mpm@selenic.com> [Thu, 21 Sep 2006 18:15:44 -0500] rev 3139
Switch revlog.ancestor to use revisions rather than nodeids
Matt Mackall <mpm@selenic.com> [Thu, 21 Sep 2006 16:16:39 -0500] rev 3138
mpatch: Fix for malloc corner case on AIX
Matt Mackall <mpm@selenic.com> [Thu, 21 Sep 2006 16:15:39 -0500] rev 3137
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 20 Sep 2006 16:50:50 -0500] rev 3136
Abstract ancestor algorithm into generic function
Make depth calculation non-recursive
Add simple shortcut for linear ancestry
Convert context to use ancestor function
make memoized parents function
Convert revlog to use ancestor function
Matt Mackall <mpm@selenic.com> [Tue, 19 Sep 2006 15:28:13 -0500] rev 3135
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 19 Sep 2006 14:58:54 -0500] rev 3134
filectx: add rename-aware ancestor algorithm
This code works but may trigger recursion depth issues
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:59:33 -0500] rev 3133
changectx: add ancestor function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:58:11 -0500] rev 3132
filectx: allow passing filelog in init to avoid opening new filelogs
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:38:06 -0500] rev 3131
filelog: make metadata method private
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:20:44 -0500] rev 3130
filectx: add rename traversal for parents()
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 20 Sep 2006 21:44:35 +0200] rev 3129
tests: add new test; test-mq-qrefresh
Brendan Cully <brendan@kublai.com> [Tue, 19 Sep 2006 08:45:39 -0700] rev 3128
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com> [Fri, 15 Sep 2006 15:23:52 -0700] rev 3127
Move defaultrev into changectx
This also causes tag on a repository with no working directory
to default to tip.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:43:31 +0200] rev 3126
fix warnings spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:32:28 +0200] rev 3125
hgweb: fix errors spotted by pychecker
TK Soh <teekaysoh@yahoo.com> [Mon, 18 Sep 2006 12:01:32 +0200] rev 3124
extdiff: use the default option only if the default program is used
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 11:55:38 +0200] rev 3123
Merge with mainline
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:27:30 -0500] rev 3122
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:11:26 -0500] rev 3121
merge: simplify local created logic
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:43:06 -0500] rev 3120
merge: simplify prompt code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:38:02 -0500] rev 3119
merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:18:27 -0500] rev 3118
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:10:54 -0500] rev 3117
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:00:14 -0500] rev 3116
merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:54:01 -0500] rev 3115
merge: eliminate redundant security check
duplicated in applyupdates
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:53:19 -0500] rev 3114
merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 18:28:50 -0500] rev 3113
merge: remove no longer possible clause
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:39:19 -0500] rev 3112
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:13:02 -0500] rev 3111
merge: remove linear variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:07:44 -0500] rev 3110
merge: simplify hook code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:50:17 -0500] rev 3109
merge: linear_path -> linear
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:47:33 -0500] rev 3108
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:34 -0500] rev 3107
merge: remove now unused umap dict
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:03 -0500] rev 3106
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:02:09 -0500] rev 3105
Merge with mainline
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:59:59 -0500] rev 3104
merge: move set_exec to actions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:54:51 -0500] rev 3103
merge: add forget to action list
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:24:00 -0500] rev 3102
merge: add codes to action list, eliminate None elements
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 15:10:56 -0500] rev 3101
merge: convert actions to list
Matt Mackall <mpm@selenic.com> [Fri, 15 Sep 2006 16:01:16 -0500] rev 3100
Merge with backout
Matt Mackall <mpm@selenic.com> [Fri, 15 Sep 2006 16:00:16 -0500] rev 3099
Back out trusted hgrc change for now
Backed out changeset 494521a3f1425
Matt Mackall <mpm@selenic.com> [Fri, 15 Sep 2006 15:22:45 -0500] rev 3098
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 21:02:25 -0500] rev 3097
merge: fold umap and added into m1 manifest
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 19:39:54 -0500] rev 3096
merge: make unresolved a counter
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 19:32:16 -0500] rev 3095
merge: use context code to retrieve manifests
Mathieu Clabaut <mathieu.clabaut@systerel.fr> [Fri, 15 Sep 2006 22:55:17 +0200] rev 3094
Update [extdiff] configuration sample for vimdiff,
taking acount cmd.xxx and opts.xxx configurations item.
Matt Doar <matt@xensource.com> [Wed, 13 Sep 2006 13:14:08 -0700] rev 3093
Add support for diffstat in commit emails, and move diffstat from
patchbomb to patch
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 19:24:00 -0700] rev 3092
cat: default to working dir parent instead of tip
This introduces a defaultrev function that chooses
the working dir parent if a revision isn't specified,
and uses it in several places.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Sep 2006 00:51:27 +0200] rev 3091
merge with brendan
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 18:24:58 -0700] rev 3090
hgk: add --limit, and revranges
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 13:50:28 -0700] rev 3089
hgk: add revision numbers
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 22:52:47 +0200] rev 3088
mq: handle patch names containing ":"
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 11:19:35 -0700] rev 3087
Move revision parsing into cmdutil.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Sep 2006 14:37:51 -0300] rev 3086
Avoid negative block sizes in lazyparser.
This fixes a bug introduced by changeset baa3873eb387 .
Brendan Cully <brendan@kublai.com> [Thu, 14 Sep 2006 15:35:55 +0200] rev 3085
mq: add qdelete --forget option
This removes an applied patch from the series and status files without
popping it. It is useful when an mq patch has been applied upstream.
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 16:41:03 -0700] rev 3084
mq: do not update an empty working directory after strip.
Closes #296.
Brendan Cully <brendan@kublai.com> [Tue, 12 Sep 2006 11:11:19 -0700] rev 3083
mq: Add --git option to qrefresh
john.levon@sun.com [Wed, 13 Sep 2006 21:46:36 +0200] rev 3082
Add the -s option to `hg help qseries`.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 13 Sep 2006 19:57:40 +0200] rev 3081
sshrepo: don't try to validate when creating the repo
- This removes the "repo not found" error when cloning or init-ing a remote
repo.
- Since the remote hg will abort if the repo already exists we don't need to
validate it.
Brendan Cully <brendan@kublai.com> [Wed, 13 Sep 2006 08:57:08 -0700] rev 3080
Make qrename handle directory targets; closes #333.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Sep 2006 17:27:41 +0200] rev 3079
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Sep 2006 17:26:20 +0200] rev 3078
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 11 Sep 2006 10:23:23 +0200] rev 3077
Fixed OSError "No such file or directory: None" and make IOError consistent.
The None error occurs when the current working directory is no longer
available, e.g. because it was removed in another shell.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 11 Sep 2006 10:08:30 +0200] rev 3076
If local repository is missing, make error message clearer.
Faheem Mitha suggested finding a better error message.
The nice error message is taken from cogito.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 10 Sep 2006 19:15:08 -0300] rev 3075
don't let lazyparser read more data than it can handle
This should fix issue368.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Sep 2006 12:56:08 +0200] rev 3074
document changelog format
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Sep 2006 12:51:05 +0200] rev 3073
merge with brendan
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 15:13:45 -0700] rev 3072
strip: strip changelog before manifest
TK Soh <teekaysoh@yahoo.com> [Mon, 28 Aug 2006 16:30:48 -0500] rev 3071
extdiff: do not shell-quote options to new commands
revert a change introduced by 453097750fbf
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Sep 2006 10:01:45 +0200] rev 3070
Include section name and parameter name (if available) in config errors.
Added tests for this.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Sep 2006 09:36:18 +0200] rev 3069
Never apply string formatting to generated errors with util.Abort.
Otherwise error messages containing % chars yield errors or worse.
Fixed (hopefully) all users of util.Abort.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Sep 2006 02:16:16 +0200] rev 3068
hg merge: fix lookup of branch
add some tests for branch usage
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Sep 2006 01:07:21 +0200] rev 3067
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Sep 2006 00:56:37 +0200] rev 3066
hgk.py: fix for a bug introduced in 32fd512ca7c0
TK Soh <teekaysoh@yahoo.com> [Thu, 07 Sep 2006 13:53:20 -0500] rev 3065
allow shell-quoting in command defaults
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 07 Sep 2006 14:13:01 +0200] rev 3064
hgk.py: use mercurial.patch functions when possible
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 07 Sep 2006 14:12:39 +0200] rev 3063
git --diff: fix traceback when getting mode change
- use the manifest instead of the mode in the working dir
if the diff is against two revisions
- add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 07 Sep 2006 14:01:00 +0200] rev 3062
hgk.py: use nullid instead of a constant
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 06 Sep 2006 02:15:33 +0200] rev 3061
hgk.py: fix warnings from pychecker
- unused variables
- usage of undefined variables (opts and filterfiles)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 06 Sep 2006 02:13:08 +0200] rev 3060
hgk.py: add an optional file list to debug-diff-tree
this solves a problem when hgk was trying to display merges diff
Mikhail Sobolev <mss@mawhrin.net> [Tue, 27 Jun 2006 01:41:07 +0300] rev 3059
really treat the right side of acl.{allow,deny} as a list of users
the current implementation seems to expect only user per pattern, which
contradicts the documentation available at the file beginning.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 05 Sep 2006 11:33:47 +0200] rev 3058
merge crew with hg-churn
Shun-ichi GOTO <shunichi.goto@gmail.com> [Tue, 05 Sep 2006 12:40:45 +0900] rev 3057
Fix for Python 2.3 compatibility.
Note: Name of comparing function of sort() is "cmpfunc" in Python 2.3
and "cmp" in Python 2.4.
TK Soh <teekaysoh@yahoo.com> [Thu, 24 Aug 2006 16:12:23 -0500] rev 3056
hgk: use short changeset hashes
this fixes the missing tags on hgk window
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 05 Sep 2006 01:15:46 +0200] rev 3055
merge with brendan
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 05 Sep 2006 01:11:14 +0200] rev 3054
unlink temporary patch files even when an exception is raised
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 13:42:57 -0700] rev 3053
Remove temporary git patch files
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 13:12:26 -0700] rev 3052
Fix git patch application when cwd != repo.root
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 12:55:10 -0700] rev 3051
Detect git patches in patchbomb makepatch function
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 04 Sep 2006 23:27:14 +0200] rev 3050
merge with hg-churn
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Mon, 04 Sep 2006 16:02:25 -0400] rev 3049
[churn] Moved churn extension from hgext to contrib
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sun, 03 Sep 2006 18:41:16 -0400] rev 3048
[churn] Fix progress bar not incrementing when merge cset is encountered
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sun, 03 Sep 2006 16:30:07 -0400] rev 3047
[churn] progress meter
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sun, 03 Sep 2006 16:25:41 -0400] rev 3046
[churn] Ignore merge csets
Merge changesets attributed a large number of lines to people that didn't
actually develop it, but simply merged the code. By ignoring merges, we get
a more accurate picture of how much code everyone changed.
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sun, 03 Sep 2006 16:23:18 -0400] rev 3045
[churn] repo.changes was renamed to repo.status
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sun, 03 Sep 2006 06:06:02 -0400] rev 3044
Merge with mpm
Josef "Jeff" Sipek <jeff@josefsipek.net> [Sat, 19 Aug 2006 15:20:54 -0400] rev 3043
Merge with Brendan Cully
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 22:08:48 -0700] rev 3042
Add revision range support
Josef "Jeff" Sipek <jeff@josefsipek.net> [Sat, 19 Aug 2006 14:47:31 -0400] rev 3041
[churn] Fixed churn ignoring the first commit
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 15 Aug 2006 06:15:06 -0400] rev 3040
[churn] Trivial cleanup
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 15 Aug 2006 05:48:49 -0400] rev 3039
[churn] Trivial cleanup suggested by Thomas
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 08 Aug 2006 15:29:33 -0400] rev 3038
[churn] Cleanup suggestions from tonfa
Use demandload
Be smarter about the final list creation
Josef "Jeff" Sipek <jeff@josefsipek.net> [Wed, 26 Jul 2006 19:42:56 -0400] rev 3037
Churn extension
TK Soh <teekaysoh@yahoo.com> [Sat, 02 Sep 2006 20:24:53 +0800] rev 3036
add document on command defaults
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 03 Sep 2006 02:28:39 +0200] rev 3035
do not enable verbose output if quiet is specified in the cmdline
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 02 Sep 2006 23:26:10 +0200] rev 3034
clone: simplifying dest repo creation
since creating a repo raises an exception if the repo already
exists, there's no need to try to create one.
add some test for repo creation when the destination exists
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 02 Sep 2006 23:14:35 +0200] rev 3033
sshrepo: when creating a repo, raise an error if it already exists
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 02 Sep 2006 23:06:47 +0200] rev 3032
localrepo: move the repo creation code, fail if the repo exists
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 02 Sep 2006 21:08:54 +0200] rev 3031
sshrepo: flush stderr before connecting to the hg server
TK Soh <teekaysoh@yahoo.com> [Thu, 31 Aug 2006 12:51:02 -0500] rev 3030
gitweb: add file links to filelog page
TK Soh <teekaysoh@yahoo.com> [Thu, 31 Aug 2006 12:31:55 -0500] rev 3029
gitweb: add annotate links to changeset page
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 10:21:02 -0700] rev 3028
Merge with crew
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 10:17:35 -0700] rev 3027
Add --git support to hg email
Brendan Cully <brendan@kublai.com> [Wed, 30 Aug 2006 10:08:56 -0700] rev 3026
Add --git to hg export
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 30 Aug 2006 19:58:54 +0200] rev 3025
merge with brendan
Brendan Cully <brendan@kublai.com> [Tue, 29 Aug 2006 17:08:55 -0700] rev 3024
Call patch.diff directly instead of printdiff - this also saves an
extra walk of the working directory.
Brendan Cully <brendan@kublai.com> [Tue, 29 Aug 2006 17:08:42 -0700] rev 3023
Remove dates from git export file lines - they confuse git-apply
Will Maier <willmaier@ml1.net> [Fri, 28 Jul 2006 13:46:19 -0500] rev 3022
Find the system's MD5 binary.
Different binaries calculate MD5 checksums on different systems. Try
a couple known programs and only calculate and verify the checksum
if they exist. This should silence warnings on eg OpenBSD.
TK Soh <teekaysoh@yahoo.com> [Tue, 29 Aug 2006 14:04:54 -0500] rev 3021
gitweb: fix annotate page display problem on IE (6.0)
Bad support of "white-space: pre" property.
TK Soh <teekaysoh@yahoo.com> [Tue, 29 Aug 2006 14:01:11 -0500] rev 3020
gitweb: fix file page display problem on IE (6.0)
Bad support of "white-space: pre" property.
TK Soh <teekaysoh@yahoo.com> [Tue, 29 Aug 2006 13:28:38 -0500] rev 3019
gitweb: fix issue 349
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 29 Aug 2006 19:26:58 +0200] rev 3018
Document the fact that revert might overwrite .orig files
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 29 Aug 2006 19:02:57 +0200] rev 3017
Add a hint for revert --all when aborting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 28 Aug 2006 21:49:02 +0200] rev 3016
fix incorrect warning when walking on a particular rev
when a directory was given instead of a file it reported
incorrectly 'No such file or directory in rev <rev>'
we test if the file is a prefix directory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 26 Aug 2006 11:19:00 +0200] rev 3015
fix errors reported by pychecker
mercurial/merge.py:174: No global (mode) found
mercurial/merge.py:253: No global (errno) found
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 24 Aug 2006 15:19:56 -0700] rev 3014
Fixed an exception in notify extension (b2a_hex argument incorrect)
Detailed messages was - incoming.notify hook raised an exception: b2a_hex() argument 1 must be string or read-only character buffer, not stringio
TK Soh <teekaysoh@yahoo.com> [Tue, 22 Aug 2006 12:20:24 -0500] rev 3013
minor docstring fix for revert
Lee Cantey <lcantey@gmail.com> [Mon, 21 Aug 2006 10:46:58 -0700] rev 3012
Allow for MB/sec transfer rates in test-http-proxy and test-ssh.
Also make the test more specific in test-http.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 22 Aug 2006 22:49:30 -0300] rev 3011
load extensions only after the ui object has been completely initialized
This fixes a traceback printed when hg tries to print another traceback
after an extension fails to be loaded. Add a test for that.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 22 Aug 2006 20:45:03 -0300] rev 3010
Only read .hg/hgrc files from trusted users/groups
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.
Global hgrc files are always read.
On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.
Edouard Gomez <ed.gomez@free.fr> [Wed, 23 Aug 2006 00:19:24 +0200] rev 3009
Fix hgk extension due to 4ec58b157265 refactoring
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 23 Aug 2006 08:42:21 -0700] rev 3008
merge.
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 19:12:09 -0500] rev 3007
merge: add remove to the action hash
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 18:06:17 -0500] rev 3006
merge: combine merge and get lists
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:42:55 -0500] rev 3005
merge: remove redundant if
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:26:44 -0500] rev 3004
merge: eliminate mw manifestdict, do everything with m1
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:20:09 -0500] rev 3003
merge: eliminate usage of m1 after working manifest creation
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 17:08:38 -0500] rev 3002
merge: simplify working dir manifest generation
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 16:47:27 -0500] rev 3001
merge: simplify some update logic
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 16:23:29 -0500] rev 3000
merge: hoist partial code out of manifest loops
Matt Mackall <mpm@selenic.com> [Tue, 22 Aug 2006 16:12:54 -0500] rev 2999
merge: minor simplification
Matt Mackall <mpm@selenic.com> [Mon, 21 Aug 2006 14:25:56 -0500] rev 2998
merge: rename mysterious variable
Matt Mackall <mpm@selenic.com> [Mon, 21 Aug 2006 14:21:42 -0500] rev 2997
merge: add backwards variable
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 17:01:24 -0700] rev 2996
mq.el: Add comment to mq-edit-finish.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:59:22 -0700] rev 2995
mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:59:09 -0700] rev 2994
qheader: exit withh meaningful error code.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:04:58 -0700] rev 2993
Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 16:03:55 -0700] rev 2992
MQ: Make more commands return meaningful errors.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 15:15:52 -0700] rev 2991
mercurial.el: deal with more vagaries of "hg status".
If we run "hg status" on a file that does not exist, it prints an error
message. Attempt to extract the name of the file.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 15:14:35 -0700] rev 2990
qrefresh: exit with status 1 if no patches applied.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 14:03:10 -0700] rev 2989
mercurial.el: add hg-cwd
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 14:02:43 -0700] rev 2988
mercurial.el: speed up mode line updates.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 11:37:18 -0700] rev 2987
mercurial.el: add hg-status.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 11:36:58 -0700] rev 2986
mercurial.el: use parents in modeline, not tip
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 11:24:59 -0700] rev 2985
mercurial.el: fix hg-chomp.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 08:54:19 -0700] rev 2984
mercurial.el: fix calls to goto-char.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 22 Aug 2006 08:53:37 -0700] rev 2983
mercurial.el: get rid of unportable, unperformant use of replace-regexp.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 22 Aug 2006 07:55:10 -0700] rev 2982
merge.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Thu, 10 Aug 2006 16:59:58 +0200] rev 2981
Support the demandload syntax "@" in packagescan
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 22 Aug 2006 07:32:54 -0700] rev 2980
merge.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Tue, 22 Aug 2006 14:31:56 +0900] rev 2979
Support foo@bar notation as demandload module spec.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 10:20:21 +0200] rev 2978
Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 10:18:40 +0200] rev 2977
Merge with tah
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 10:08:42 +0200] rev 2976
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
and add documentation for this.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 22 Aug 2006 09:55:14 +0200] rev 2975
Clear contents of global hgrc for tests before running each test.
This fixes running test-mq-qdiff after test-mq, because of changed settings.
Matt Mackall <mpm@selenic.com> [Sun, 20 Aug 2006 23:52:52 -0500] rev 2974
tag: shorten hash in default commit message
Move default message to commands.py
Pass node in binary for consistency
Remove default arguments
Fix up tests
Matt Mackall <mpm@selenic.com> [Sun, 20 Aug 2006 22:51:56 -0500] rev 2973
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com> [Sun, 20 Aug 2006 21:59:51 -0500] rev 2972
Demote a pull note to a debug message
Bryan O'Sullivan <bos@serpentine.com> [Mon, 21 Aug 2006 21:59:29 -0700] rev 2971
Add ui.strict config item.
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.
This fixes issue 314.
Lee Cantey <lcantey@gmail.com> [Mon, 21 Aug 2006 17:47:02 -0700] rev 2970
Ignore .DS_Store directories
These are used by Finder on OS X.
Lee Cantey <lcantey@gmail.com> [Mon, 21 Aug 2006 16:33:43 -0700] rev 2969
Allow for MB/sec transfer rates in test-http
Danek Duvall <danek.duvall@sun.com> [Mon, 21 Aug 2006 14:13:27 -0700] rev 2968
patch queue: portability.notes
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 21 Aug 2006 13:59:17 -0700] rev 2967
mq: fix bad interaction between demandload and update of commands.norepo
problem was that commands.norepo was not updated properly.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 21 Aug 2006 11:05:43 -0700] rev 2966
revert: add -a as alias for --all
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 21 Aug 2006 09:44:52 -0700] rev 2965
revert: require --all to revert all files.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 02:21:59 -0300] rev 2964
fix typo in mail.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 02:21:51 -0300] rev 2963
fix incoming -p
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 01:13:11 -0300] rev 2962
dirstate.py: when comparing mtimes, use only the integer part.
Python 2.5 can return timestamps with subsecond resolution.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 00:44:54 -0300] rev 2961
localrepo.status: detect clean files even when the mtime has changed
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 20 Aug 2006 00:44:53 -0300] rev 2960
Avoid Python 2.5 warning
demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6
TK Soh <teekaysoh@yahoo.com> [Thu, 17 Aug 2006 15:30:45 -0500] rev 2959
extdiff: make new diff commands pick up their options correctly
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 22:13:58 -0700] rev 2958
addremove: add -s/--similarity option
progress on issue 295.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:18:01 -0700] rev 2957
fix comment.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:17:28 -0700] rev 2956
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 23 Jul 2006 09:04:14 -0700] rev 2955
addremove: do not deprecate.
command is too useful to drop.
is also best place to try autodetect of rename/copy by content similarity.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:04:10 -0700] rev 2954
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 21:03:29 -0700] rev 2953
fix issue 322.
do not allow to add files that shadow files or directories already in dirstate.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 17:02:38 -0700] rev 2952
merge.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 17 Aug 2006 21:13:35 +0300] rev 2951
add missing import of errno
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 15:53:30 -0700] rev 2950
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 15:53:14 -0700] rev 2949
add other dir/file case to test for issue322.
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 14:59:18 -0700] rev 2948
Teach annotate to follow copies.
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 15:03:16 -0700] rev 2947
Add self to contributors
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 14:49:12 -0700] rev 2946
add test for issue 322.
no .out file because issue is still live.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 14:13:44 -0700] rev 2945
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 14:13:24 -0700] rev 2944
load extensions from every hgrc.
before this change only extensions in global hgrc files were loaded.
now extensions in per-repo hgrc are loaded.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 11 Aug 2006 16:12:14 -0700] rev 2943
refactor extension loading.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 18 Aug 2006 13:01:40 -0700] rev 2942
merge with brendan.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:55:42 -0700] rev 2941
mq: fix appliedname
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:53:42 -0700] rev 2940
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:53:01 -0700] rev 2939
Add qnew -e option.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:52:21 -0700] rev 2938
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:51:39 -0700] rev 2937
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:50:50 -0700] rev 2936
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:50:21 -0700] rev 2935
sed portability fixes
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:49:45 -0700] rev 2934
Teach mq about git patches
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 19:46:18 -0700] rev 2933
Move import's working dir update code into patch.updatedir
Danek Duvall <danek.duvall@sun.com> [Fri, 18 Aug 2006 10:24:04 -0700] rev 2932
Solaris portability fixes
Brendan Cully <brendan@kublai.com> [Fri, 18 Aug 2006 10:05:44 -0700] rev 2931
Fix bug #345.
The last hit for a file might have been before the last window, so we
can't clear copies. To reduce the load, we only store real copy
entries instead of storing hashes for every revision.
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 11:03:45 -0700] rev 2930
patchbomb: import new mail module
Brendan Cully <brendan@kublai.com> [Wed, 16 Aug 2006 11:03:32 -0700] rev 2929
mail: fix connect
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 18 Aug 2006 13:07:35 +0200] rev 2928
merge with tah
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 18 Aug 2006 13:06:38 +0200] rev 2927
Fix hgweb's patch display in changeset view.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 23:37:37 +0300] rev 2926
hgext: more patchbomb documentation
+ Add a description of how to enable this extension
+ Note which command it provides (it's not very easy to guess
that "hgext.patchbomb" enables the "email" command, unless one
can read Python sources)
+ Expand the descriptions of the -n and -m options of "hg email".
+ Mention that formail is (commonly) part of the procmail package.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:53:01 -0700] rev 2925
make new tests executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:49:49 +0300] rev 2924
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 21:22:26 +0300] rev 2923
tests: new test for "hg annotate"
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:42 -0700] rev 2922
override previous merge with mpm.
merge at ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:52:19 -0700] rev 2921
redo merge with mpm.
previous merge at ef8ee4477019 was bad.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 16 Aug 2006 10:46:24 -0700] rev 2920
merge with mpm.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 23:17:06 -0500] rev 2919
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 22:46:35 -0500] rev 2918
merge: use file size stored in revlog index
Add size method to filelog to handle nodes with renames
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:30:21 -0500] rev 2917
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:12:36 -0500] rev 2916
trivial bool() cleanup
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:28:00 -0500] rev 2915
filelog.cmp: return 0 for equality
spotted by Alexis Carvalho
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:27:19 -0500] rev 2914
merge: hoist some working manifest logic out of merge loop
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:12:51 -0500] rev 2913
merge: working manifest new/changed
To remove dependence on m1 during manifest comparison, we distinguish between
new and changed states in mw.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:58:10 -0500] rev 2912
merge: factor out exec bit merge function
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:45:45 -0500] rev 2911
Use revlog hash comparison technique in merge
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:18:13 -0500] rev 2910
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:06:50 -0500] rev 2909
Move ui.sendmail to mail.connect/sendmail
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 11:34:08 -0500] rev 2908
Move ui.diffopts to patch.diffopts where it belongs
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 11:28:50 -0700] rev 2907
Unify mq and hg patch invocation.
This makes patch a little less verbose by default, so the tests
had to be updated.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:43:31 -0700] rev 2906
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:42:50 -0700] rev 2905
make test-mq-qdiff executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 20:59:55 +0300] rev 2904
tests: new test for mq qdiff command
`hg qdiff .' is supposed to work but it is currently broken.
This test should help us verify when it gets fixed.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:38:07 -0700] rev 2903
merge with other head by default, not tip.
fixes issue 339.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 09:37:58 -0700] rev 2902
merge with mpm.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 15 Aug 2006 18:14:58 +0300] rev 2901
Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences
* Add an example for GNU diff(1) 'context diff' mode.
* Explain the requirement for separate cmd.xxx and opts.xxx
options in .hgrc, which hopefully will guard against users
trying to add:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff -Nprc5
which fails for recent crew builds with:
$ hg cdiff .
making snapshot of 1 files from rev 07dc4a569f4e
making snapshot of 1 files from working dir
diff -Nprc5: not found
The correct way to do this is by separating the cmd.cdiff and
opts.cdiff parts like this:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff
opts.cdiff = -Nprc5
so add it as a new example and explicitly describe it in the
extdiff comments.
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 15:07:00 -0500] rev 2900
filelog: add hash-based comparisons
For status, rather than reconstruct full file versions from revlog for
comparison, compare hashes.
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 14:42:15 -0500] rev 2899
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 14 Aug 2006 14:14:08 -0500] rev 2898
merge: minor simplification
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 16:04:47 +0200] rev 2897
Fixed test-extdiff.
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 00:03:48 -0700] rev 2896
A fix for --prune.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:47:17 +0200] rev 2895
Adjusted test to changed help output.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Aug 2006 11:22:29 +0200] rev 2894
merge with jeffpc
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 15 Aug 2006 05:12:27 -0400] rev 2893
Use demandload in hgk
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 22:48:03 -0700] rev 2892
Add diff --git option
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 14 Aug 2006 15:51:35 -0700] rev 2891
extdiff: fix bugs. add test.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:41:08 -0700] rev 2890
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:24:19 -0700] rev 2889
Replace qdel/qfold -f option with -k/--keep.
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:10:21 -0700] rev 2888
Properly shell-quote arguments in extdiff
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 11:07:15 -0700] rev 2887
Update extdiff for recent refactoring
Brendan Cully <brendan@kublai.com> [Mon, 14 Aug 2006 10:27:02 -0700] rev 2886
Test for log --prune.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 14 Aug 2006 16:06:37 +0300] rev 2885
hgweb: partially revert 4ec58b157265
The change from self.repo.ui.diffopts() to ui.diffopts() causes a
traceback when the diff of a changeset should be displayed in the
web interface. Revert to self.repo.ui.diffopts() for now.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 17:03:33 -0700] rev 2884
cmdutil.matchpats: allow include/exclude to be optional.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 17:03:03 -0700] rev 2883
add default values to arguments of walk etc.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 16:57:45 -0700] rev 2882
move commands.addremove_lock to cmdutil.addremove
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 16:11:22 -0700] rev 2881
move walk and matchpats from commands to cmdutil.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 15:24:30 -0700] rev 2880
fix patch.patch.filterfiles.
now test-diff-subdir passes.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 13 Aug 2006 15:03:48 -0700] rev 2879
make test-diff-subdir executable.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 13 Aug 2006 23:00:18 +0300] rev 2878
tests: new test for hg diff of a subdirectory only
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 13 Aug 2006 18:35:24 +0300] rev 2877
Make clear that hg pull -r REV pulls "up to" a revision.
The existing message was a bit confusing, making the reader
believe that only the specific revision is pulled.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 13 Aug 2006 20:21:13 +0300] rev 2876
Use cached hg-root-dir instead of rediscovering
by a second call to (hg-root). We have the path
we need already as the value of hg-root-dir.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 13 Aug 2006 18:01:44 +0300] rev 2875
hgweb: repo.changes() is now called repo.status()
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 16:40:12 -0700] rev 2874
remove localrepository.changes.
use localrepository.status instead.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 16:13:27 -0700] rev 2873
refactor text diff/patch code.
rename commands.dodiff to patch.diff.
rename commands.doexport to patch.export.
move some functions from commands to new mercurial.cmdutil module.
turn list of diff options into mdiff.diffopts class.
patch.diff and patch.export now has clean api for call from 3rd party
python code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 16:05:09 -0700] rev 2872
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 16:04:49 -0700] rev 2871
manifest.execf is now a function.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 15:43:38 -0700] rev 2870
merge.
Brendan Cully <brendan@kublai.com> [Sat, 12 Aug 2006 15:01:46 -0700] rev 2869
grep: add --follow support.
Brendan Cully <brendan@kublai.com> [Sat, 12 Aug 2006 13:51:14 -0700] rev 2868
grep: display correct user/revision for --all in reverse.
Also handle multiple occurrences of the same line by storing
linestates in an array instead of a dict, and using difflib
to compute the difference between linestates.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 15:41:26 -0700] rev 2867
util: qualify name properly.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 14:15:23 -0700] rev 2866
mq: demandload more
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 13:16:48 -0700] rev 2865
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 12:47:18 -0700] rev 2864
merge git patch code.
Brendan Cully <brendan@kublai.com> [Fri, 11 Aug 2006 16:56:31 -0700] rev 2863
Tests for git import
Brendan Cully <brendan@kublai.com> [Fri, 11 Aug 2006 16:55:48 -0700] rev 2862
Remove debugging line
Brendan Cully <brendan@kublai.com> [Fri, 11 Aug 2006 16:30:24 -0700] rev 2861
Fix bad merge with crew
Brendan Cully <brendan@kublai.com> [Fri, 11 Aug 2006 15:50:16 -0700] rev 2860
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com> [Fri, 11 Aug 2006 15:50:07 -0700] rev 2859
Teach import to understand git diff extensions.
Vanilla patch chokes on git patches that include files that are copied
or renamed, then modified. So this code detects that case and rewrites
the patch if necessary.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 12:30:02 -0700] rev 2858
update copyrights.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 12:12:23 -0700] rev 2857
merge.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 12 Aug 2006 08:53:23 -0300] rev 2856
Fix some bugs introduced during the manifest refactoring
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 12 Aug 2006 09:24:04 -0300] rev 2855
Fix "hg qnew -f foo" without -m
The refresh method assumes it has a string.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 12 Aug 2006 11:53:12 -0700] rev 2854
merge with mpm.
Matt Mackall <mpm@selenic.com> [Fri, 11 Aug 2006 11:00:38 -0500] rev 2853
Remove manifest.readflags
Matt Mackall <mpm@selenic.com> [Fri, 11 Aug 2006 10:57:42 -0500] rev 2852
Change remaining users of manifest flags
Matt Mackall <mpm@selenic.com> [Thu, 10 Aug 2006 22:38:56 -0500] rev 2851
Switch to simpler manifestdict
Matt Mackall <mpm@selenic.com> [Wed, 09 Aug 2006 22:07:13 -0500] rev 2850
Merge: use single objects for tracking manifests
Matt Mackall <mpm@selenic.com> [Wed, 09 Aug 2006 17:11:01 -0500] rev 2849
Merge: save away mode bit so that we don't need manifest later
Matt Mackall <mpm@selenic.com> [Wed, 09 Aug 2006 15:03:46 -0500] rev 2848
Merge manifest refactor work
Matt Mackall <mpm@selenic.com> [Wed, 09 Aug 2006 14:53:03 -0500] rev 2847
Combine manifest dict and flags dict into a single object
This gets rid of the need to track two objects and might save memory.
This might be faster implemented as a subclassed dict with auxiliary
functions to access a sparse flags dict.
Matt Mackall <mpm@selenic.com> [Wed, 19 Jul 2006 19:11:50 -0500] rev 2846
manifestflags: eliminate remaining users of direct dict access
Matt Mackall <mpm@selenic.com> [Sun, 16 Jul 2006 03:22:05 -0500] rev 2845
Use strings for manifestflags to allow storing multiple flags
Matt Mackall <mpm@selenic.com> [Sun, 16 Jul 2006 03:14:17 -0500] rev 2844
Start using manifestflags methods
Matt Mackall <mpm@selenic.com> [Sun, 16 Jul 2006 02:59:20 -0500] rev 2843
Add manifestflags class
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 11 Aug 2006 14:50:41 -0700] rev 2842
import: get lock and wlock one time
this makes import of many patches 6x faster in kernel repo.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 11 Aug 2006 09:11:54 +0200] rev 2841
Adjusted documentation for hgrc's "[smtp] host" for change in 9f745d3675d4.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 17:37:57 -0700] rev 2840
fix test output
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 17:33:08 -0700] rev 2839
mq: only add mq attribute to local repo
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 17:18:55 -0700] rev 2838
mq: apply patch is any posative guard matches
this is like guards command from quilt package.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 17:02:11 -0700] rev 2837
fetch: fix test fail
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 16:10:59 -0700] rev 2836
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 15:44:05 -0700] rev 2835
call reposetup functions of extension modules whenever repo created
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 15:02:18 -0700] rev 2834
mq: test commit in repo with patches applied
Brendan Cully <brendan@kublai.com> [Thu, 10 Aug 2006 11:18:48 -0700] rev 2833
Disallow commit over an applied mq patch.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 10 Aug 2006 14:58:10 -0700] rev 2832
qselect: add --pop, --reapply options
Danek Duvall <danek.duvall@sun.com> [Wed, 09 Aug 2006 12:05:40 -0700] rev 2831
Fix some tests for portability.
Matt Mackall <mpm@selenic.com> [Wed, 09 Aug 2006 13:55:18 -0500] rev 2830
Merge with crew, fix most tests
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:56:48 -0500] rev 2829
Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:35:19 -0500] rev 2828
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:26:00 -0500] rev 2827
Merge: refactor err and failedmerge -> unresolved
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:19:20 -0500] rev 2826
Refactor update locking slightly
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:11:16 -0500] rev 2825
Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:53:04 -0500] rev 2824
Rename merge.allow -> merge.branchmerge
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:18:16 -0500] rev 2823
Use demandload @ syntax
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:54:33 -0500] rev 2822
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:35:36 -0500] rev 2821
Teach demandload how to import as
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 20:54:03 -0500] rev 2820
Factor doupdate into _lookup + hg.update
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 17:26:09 -0500] rev 2819
Fix extensions for merge change
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 09 Aug 2006 09:38:11 -0700] rev 2818
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 17:11:36 -0700] rev 2817
mq: drop qversion command
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 17:08:59 -0700] rev 2816
fetch: hold lock and wlock across all operations
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 09 Aug 2006 02:04:49 -0700] rev 2815
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:40:08 -0700] rev 2814
fetch: lock repo across pull and commit
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:37:41 -0700] rev 2813
fetch: drop commands.doupdate
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:23:02 -0700] rev 2812
test-fetch: make output stable
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:09:26 -0700] rev 2811
fetch: fix breakage from mpm.
add test so will not break again.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 21:42:50 -0700] rev 2810
mq: new commands qselect, qguard
implement quilt-style guards for mq.
guards allow to control whether patch can be pushed.
if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed. if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.
use qguard to set/list guards on patches. use qselect to set/list
active guards.
also "qseries -v" prints guarded patches with "G" now.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 18:14:03 -0700] rev 2809
fix permission of test-mq-qsave
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 18:12:48 -0700] rev 2808
mq: add join method
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:59:32 -0700] rev 2807
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:24 -0700] rev 2806
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:18 -0700] rev 2805
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:12:03 -0700] rev 2804
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 16:47:06 -0500] rev 2803
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 16:27:09 -0500] rev 2802
Move repo.verify
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 21:24:19 -0500] rev 2801
revlog.lookup optimization
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 20:06:05 -0500] rev 2800
Remove **opts arg from commands.doupdate
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 15:24:41 -0500] rev 2799
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 13:07:57 -0500] rev 2798
Add a doc string
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 19:08:55 -0700] rev 2797
fetch: add missing import.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:33:14 -0700] rev 2796
fetch: do not fetch if working dir modified
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:27:38 -0700] rev 2795
new extension: fetch -> combine pull and merge/update
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:23:04 -0700] rev 2794
commands.logmessage: simplify calling.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:22:17 -0700] rev 2793
localrepo.update: allow to suppress commit reminder.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:27:05 +0200] rev 2792
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:24:13 +0200] rev 2791
mq: codingstyle
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:20:51 +0200] rev 2790
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:18:53 +0200] rev 2789
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 16:42:36 +0200] rev 2788
util.patch: use shellquote
Brendan Cully <brendan@kublai.com> [Sat, 05 Aug 2006 14:59:47 -0700] rev 2787
mq: use more portable util.parse_patch_output instead of handrolled version.
Brendan Cully <brendan@kublai.com> [Sat, 05 Aug 2006 15:23:26 -0700] rev 2786
Add portable shell-quoting function; teach mq to use it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 16:03:02 +0200] rev 2785
mailbomb: add a comment and remove the bcc in a more pythonic way
Brendan Cully <brendan@kublai.com> [Fri, 04 Aug 2006 14:36:03 -0700] rev 2784
Add '.' as a shortcut revision name for the working directory parent.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 05 Aug 2006 02:00:09 -0700] rev 2783
make error better.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 04 Aug 2006 10:38:17 -0700] rev 2782
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 04 Aug 2006 10:37:40 -0700] rev 2781
fix output of test-backout.
Brendan Cully <brendan@kublai.com> [Thu, 03 Aug 2006 15:12:15 -0700] rev 2780
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com> [Thu, 03 Aug 2006 11:48:56 -0700] rev 2779
Add log option --follow-first to follow only the first parent of
merges.
This can be useful to extract a single line of development.
Brendan Cully <brendan@kublai.com> [Thu, 03 Aug 2006 13:29:31 -0700] rev 2778
Make log --follow revision range start default to working dir parent.
Brendan Cully <brendan@kublai.com> [Thu, 03 Aug 2006 11:06:09 -0700] rev 2777
Make log --follow without a file list follow a single head.
This includes all the parents or children (depending on the direction
of the revision range).
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 03 Aug 2006 11:12:02 -0700] rev 2776
merge with brendan.
Brendan Cully <brendan@kublai.com> [Thu, 03 Aug 2006 11:09:12 -0700] rev 2775
Use StatusEntry class instead of repeated status line parsing.
This small cleanup abstracts out repeated instances of
(rev, name) = applied[x].split(':'), making it easier to use
applied or change the status file format.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 02 Aug 2006 21:06:12 -0700] rev 2774
mq: make queue.unapplied useful as api
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 02 Aug 2006 09:29:17 +0200] rev 2773
Import say a file is not tracked after patching : test case
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 02 Aug 2006 20:33:57 -0700] rev 2772
mq: simplify save_dirty
Brendan Cully <brendan@kublai.com> [Wed, 02 Aug 2006 15:07:37 -0700] rev 2771
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com> [Wed, 02 Aug 2006 14:48:59 -0700] rev 2770
Clean up qnew help text.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 02 Aug 2006 13:04:36 -0700] rev 2769
tests: fix output for test-backout
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 02 Aug 2006 12:46:00 -0700] rev 2768
allow None for path of hg.repository
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 02 Aug 2006 10:48:34 -0700] rev 2767
mq: rename read_series as parse_series, make simpler and faster
Bryan O'Sullivan <bos@serpentine.com> [Wed, 02 Aug 2006 09:18:56 -0700] rev 2766
fix call to commands.setremoteconfig
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 02 Aug 2006 06:36:27 -0700] rev 2765
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 01 Aug 2006 19:58:34 -0700] rev 2764
clone: replace long help string of inaky with doc comment.
Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> [Tue, 01 Aug 2006 11:12:34 -0700] rev 2763
Breakup clone -r extra text help to fit in 80 columns
Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> [Tue, 01 Aug 2006 09:50:30 -0700] rev 2762
Expand clone help with hardlink information
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Aug 2006 03:17:06 +0200] rev 2761
fix hg backup option recommendation for auto-merge
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 01 Aug 2006 15:51:13 -0700] rev 2760
import: make patch apply if run in subdir
fix is same as for mq patch. patch apply code should be merged.
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Aug 2006 00:20:28 +0200] rev 2759
hgcommand.vim: requirements & doc self-install more consistent; cosmetics
Check for availability of builtin system().
Set 'compatible' while sourcing script.
File operation during doc self-install:
Escape spaces in ex-commands.
Use quotes in system calls.
Incremented revision number(s).
Size of patch is due to cosmetic cleanups:
Removal of spaces at line endings.
<SID>Prefix to functions when called.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 01 Aug 2006 15:40:54 -0700] rev 2758
fix mq test output.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 01 Aug 2006 15:40:28 -0700] rev 2757
merge patches from brendan cully that did not apply clean against tip.
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 15:24:18 -0700] rev 2756
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 14:56:54 -0700] rev 2755
Check for parent/mod as well as parent.mod in findext.
Debian/Ubuntu ship a system-wide hgrc that loads extensions using
the syntax hgext/extension=, rather than hgext.extension=. Although
the extensions work correctly, hg help <extension> doesn't
understand this form without this patch.
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 15:24:12 -0700] rev 2754
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 15:24:11 -0700] rev 2753
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 12:21:55 -0700] rev 2752
Add -f option to qdelete, to remove patch file.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 01 Aug 2006 10:57:28 -0700] rev 2751
mq: add qmv as alias for qrename
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 10:55:06 -0700] rev 2750
New self-explanatory command qrename.
Sébastien Pierre <sebastien@xprima.com> [Tue, 01 Aug 2006 09:51:36 -0400] rev 2749
[darcs2hg] Windows compatibilty patct
Originally submitted by Daiju Kito
1. single quote didn't work in several cases
2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.
Brendan Cully <brendan@kublai.com> [Mon, 31 Jul 2006 20:33:56 -0700] rev 2748
New mq command qfold: Merge patches into the current patch.
Patches should be in the series file but not yet applied.
Brendan Cully <brendan@kublai.com> [Mon, 31 Jul 2006 18:39:31 -0700] rev 2747
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com> [Mon, 31 Jul 2006 17:55:43 -0700] rev 2746
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com> [Mon, 31 Jul 2006 18:47:43 -0700] rev 2745
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com> [Tue, 01 Aug 2006 02:23:05 -0700] rev 2744
Remove pointless reposetup hook from hgk.py
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 31 Jul 2006 12:02:13 -0700] rev 2743
import: switch from application/x-patch to text/x-diff
christian ebert says his mailer was broken.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 31 Jul 2006 14:22:17 -0300] rev 2742
mq: correct the use of super
The first argument passed to super is supposed to be the class where
it's being used, not self.__class__ - the two can be different when
there's inheritance involved.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 31 Jul 2006 07:31:31 -0700] rev 2741
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 31 Jul 2006 07:11:12 -0700] rev 2740
clean up hg.py: move repo constructor code into each repo module
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 30 Jul 2006 22:52:34 -0700] rev 2739
merge with mpm.
Matt Mackall <mpm@selenic.com> [Mon, 31 Jul 2006 00:47:43 -0500] rev 2738
Kill ui.setconfig_remoteopts
This brought too much knowledge about command line particulars into
the ui code. Moved to commands.py.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 30 Jul 2006 21:46:38 -0700] rev 2737
pull: allow to pull from bundle file without need for bundle: syntax
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 30 Jul 2006 09:37:08 +0300] rev 2736
avoid calling (cd ...) with `nil' as a directory name
When (hg-root) cannot determine the current Mercurial root, print an
error message instead of trying to evaluate (cd nil).
Christian Ebert <blacktrash@gmx.net> [Sat, 29 Jul 2006 18:15:08 +0200] rev 2735
fix output file format %r
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 28 Jul 2006 21:20:41 -0300] rev 2734
hbisect.py: don't rely on __del__ to write the current state.
This is yet another page of the "Thou shalt not do too much inside
__del__ methods" book, in the "demandload and __del__ don't go well
together" chapter.
The bisect extension is broken in 0.9.1:
$ hg bisect init
$ hg bisect bad
Fatal Python error: Interpreter not initialized (version mismatch?)
Aborted
(yes, I tripled checked my instalation to make sure the problem is not
there)
It's been broken since revision fe1689273f84 moved the import of the
binascii module into a demandload.
(In details: the first time that "hg bisect bad" (or good) is called,
there are still no revisions saved in .hg/bisect/*, so bisect.__init__
doesn't call hg.bin on anything. So, when we reach __del__, the
binascii module still hasn't been imported and we get that "nice"
message above.)
Christian Ebert <blacktrash@gmx.net> [Sat, 29 Jul 2006 01:58:12 +0200] rev 2733
hgcommand.vim: cleanup of doc self-install code
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 30 Jul 2006 21:24:06 -0700] rev 2732
import: allow application/x-patch for funny patch from christian ebert
Christian Ebert <blacktrash@gmx.net> [Sat, 29 Jul 2006 10:27:54 +0200] rev 2731
patchbomb: do not write Bcc
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 30 Jul 2006 13:29:19 -0700] rev 2730
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 29 Jul 2006 11:14:32 -0700] rev 2729
mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 29 Jul 2006 11:05:39 -0700] rev 2728
mq: allow to apply patches in subdir of repo again
i broke it in 35caf437a201.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 29 Jul 2006 08:11:41 +0200] rev 2727
merge with tah
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Jul 2006 08:59:06 +0200] rev 2726
Add test mq keeping a reference to localrepo which can't remove journal on exit.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Jul 2006 14:31:20 -0700] rev 2725
mq: update to handle repomap not longer used
Brendan Cully <brendan@kublai.com> [Fri, 28 Jul 2006 13:08:25 -0700] rev 2724
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com> [Fri, 28 Jul 2006 13:08:21 -0700] rev 2723
mq: do not hold a reference to repo in tags override
Instead, replace repo's class object with a subclass.
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Jul 2006 22:17:32 +0200] rev 2722
patchbomb: fix generation of message-id when sending attachments
node was set to bin(node) before message-id was created
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Jul 2006 10:47:02 -0700] rev 2721
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Jul 2006 10:46:41 -0700] rev 2720
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Jul 2006 10:46:25 -0700] rev 2719
hg.py: add islocal() and defaultdest() functions, refactor
islocal tells if a repo or url is local.
defaultdest returns default path for clone if explicit path not given.
clone can now take repo or url as source
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Jul 2006 18:46:02 +0200] rev 2718
makes 'hg diff' diff the file in sorted order
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Jul 2006 09:01:13 +0200] rev 2717
merge with tonfa
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Jul 2006 19:26:01 +0200] rev 2716
reupdate the options after loading the repo
local .hgrc could possibly override them, command line take priority
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Jul 2006 09:00:59 +0200] rev 2715
merge with upstream
Matt Mackall <mpm@selenic.com> [Thu, 27 Jul 2006 15:20:35 -0500] rev 2714
Fix test permission
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Jul 2006 09:00:30 +0200] rev 2713
Fix test-mq-qnew-twice exit code and output.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 18:24:59 -0700] rev 2712
mq: fix queue.apply to not call os.chdir()
call to os.chdir broke "hg -R dirname qpush".
instead pass -d (change directory) option to patch command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 16:41:59 -0700] rev 2711
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 16:08:56 -0700] rev 2710
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 15:53:08 -0700] rev 2709
run-tests.py: skip tests that should not run.
print message when any test is skipped.
count skipped tests.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 15:31:04 -0700] rev 2708
make mq test more portable.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 15:19:58 -0700] rev 2707
patchbomb: add content-disposition to make display inline and add filename
if rev being emailed has tag that ends in .patch or .diff then use that as
filename. else make up filename from name of repo.
Christian Ebert <blacktrash@gmx.net> [Thu, 27 Jul 2006 22:28:03 +0200] rev 2706
patchbomb: optionally send patches as inline attachments
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 12:36:17 -0700] rev 2705
merge with crew.
Christian Ebert <blacktrash@gmx.net> [Thu, 27 Jul 2006 21:25:39 +0200] rev 2704
make introductory message of patch series text/plain
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 21 Jul 2006 01:51:17 -0300] rev 2703
run-tests.py: fix diff output when test-foo.out doesn't exist.
Previously, if test-foo.out doesn't exist and test-foo outputs
something, the first line of the diff will look like this:
-+changeset: 0:0acdaf898367
(note the leading "-")
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 21 Jul 2006 01:51:17 -0300] rev 2702
Allow tests that end in .py and .bat
Revision 6ed46bad9530 disallowed tests that have a '.' in the name, but
that also disallows tests that end in .py and .bat, even though run-tests.py
has some code to special case them.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Jul 2006 18:53:31 +0200] rev 2701
Merged backout head.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Jul 2006 18:53:10 +0200] rev 2700
Backed out changeset 2ab464771b7d15c60014996d2853efc92cdb8465
- it always runs chmod
- uses chmod in an unsafe way
- if somebody does a clone of a repo, runs 'make tests', everything is fine,
so he can assume the original repo is fine, too, but it is not.
Chris Mason <mason@suse.com> [Thu, 27 Jul 2006 09:27:45 -0700] rev 2699
mq: strip should not blow away local changes
This changes the mq strip command to abort if there are any changes in
the working directory.
Chris Mason <mason@suse.com> [Thu, 27 Jul 2006 09:27:42 -0700] rev 2698
mq: fix qnew and qimport to deal with series file comments
qnew and qimport did not take comments into account when deciding where
to place new patches in the series file.
Chris Mason <mason@suse.com> [Thu, 27 Jul 2006 09:27:39 -0700] rev 2697
mq: qpop should act like quilt pop
qpop patchname would pop the named patch off the stack. This is slightly
different from how quilt pop works. quilt pop pops everything up to the
named patch.
Chris Mason <mason@suse.com> [Thu, 27 Jul 2006 09:27:35 -0700] rev 2696
mq: patch naming shortcuts
This adds some more options to the mq lookup routine. It allows
you to use shortcuts in naming patches to push or pop. You
can now use:
1) a full patch name
2) a number to indicate an offset in the series file
3) a unique substring of the patch name
4) patchname[-+]num to indicate an offset from a given patch.
For case #3 substrings are allowed. qtip and qbase are aliases for
the top and bottom of the applied patch queue, unless they are already
in the series file as patch names.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 26 Jul 2006 20:15:31 +0200] rev 2695
Improve bash_completion for patches in MQ
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 26 Jul 2006 20:11:54 +0200] rev 2694
MQ: uniformise message and logfile option.
Possibility to change message in qrefresh option
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Jul 2006 09:14:53 -0700] rev 2693
merge with crew.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 26 Jul 2006 21:01:36 +0200] rev 2692
Makefile do a chmod +x on test sceanrios
Christian Ebert <blacktrash@gmx.net> [Thu, 27 Jul 2006 13:18:21 +0200] rev 2691
email: reflect that recipients are specified as comma-separated list
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Jul 2006 12:34:02 +0200] rev 2690
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Jul 2006 12:33:33 +0200] rev 2689
MANIFEST.in fixes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Jul 2006 02:57:49 +0200] rev 2688
merge with gitweb
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Wed, 26 Jul 2006 20:57:00 -0400] rev 2687
[hgweb] links to shortlog for the default templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Wed, 26 Jul 2006 20:26:52 -0400] rev 2686
[hgweb] Shortlog template for default theme
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Jul 2006 02:37:04 +0200] rev 2685
merge gitweb with crew
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Mon, 24 Jul 2006 20:56:30 -0400] rev 2684
[hgweb] Implemented shortlog (gitweb templates only)
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Mon, 24 Jul 2006 20:10:04 -0400] rev 2683
[hgweb] Fixed up gitweb templates
Now the gitweb templates have archive links
Brendan Cully <brendan@kublai.com> [Wed, 26 Jul 2006 12:22:04 -0700] rev 2682
Add mq patch names to tagscache instead of overriding lookup.
This makes mq patch names visible in hg log and hg tags. It also
resolves the names only once, rather than on every lookup.
Lee Cantey <lcantey@gmail.com> [Tue, 25 Jul 2006 17:15:44 -0700] rev 2681
Update Windows and Mac installers to 0.9.1 release
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Jul 2006 14:42:17 +0200] rev 2680
added documentation for to, cc, and bcc addressing
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Jul 2006 14:39:33 +0200] rev 2679
optionally send blind carbon copies
Bcc recipients may be set via long `--bcc' or hgrc only, no prompt.
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Jul 2006 15:21:20 +0200] rev 2678
fix reference to "smtp" section
documentation for "method" has reference to "mail" section.
"mail" section doesn't exist, changed to "smtp".
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 26 Jul 2006 01:03:33 +0200] rev 2677
mq: uniform verbose display of patche[s].
In verbose mode, display:
"index patchname" for unapplied patches
"index cset:patchnames" for applied patches
"index status patchname" in the serie listing.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Jul 2006 08:42:20 +0200] rev 2676
Fixed confused directory changing in test-http.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Tue, 25 Jul 2006 23:10:11 +0200] rev 2675
extdiff : add comment on how to use vim for doing directoy diff
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 25 Jul 2006 13:50:52 -0700] rev 2674
merge.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 25 Jul 2006 13:50:32 -0700] rev 2673
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
all repository classes now have url() method that returns url of repo.
Will Maier <willmaier@ml1.net> [Tue, 25 Jul 2006 10:29:43 -0500] rev 2672
Provide a relevant description for --timeout.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Jul 2006 21:22:56 +0200] rev 2671
self.root == '/': prefix length computation out of the loop
- put the computation out of the loop
- change the variable to a more meaningful name
Gil <gil@fooplanet.com> [Tue, 25 Jul 2006 11:09:17 -0700] rev 2670
Fix dirstate.walkhelper removing first char of nd when self.root == '/'.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Jul 2006 17:54:58 +0200] rev 2669
Include all tests/*.py files in the MANIFEST so tests won't fail on tarballs.
This fixes failing test-http-proxy and test-webraw.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 22 Jul 2006 23:35:16 +0900] rev 2668
Emacs: apply "expand-filename" on "default-directory".
"default-directory" may has home directory("~") relative path in some
runtime environment(or emacs revision ?), so expand-filename is
required.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 22 Jul 2006 23:30:19 +0900] rev 2667
Emacs: apply kill-local-variable instead of make-local-variable to FORGET
Frank Kingswood <frank@kingswood-consulting.co.uk> [Mon, 24 Jul 2006 23:06:05 -0700] rev 2666
hgweb: Configurable zebra stripes
With this change, you can set
[web]
stripes=3
to get stripes every three lines (a-la fanfold paper), instead of every
line on source and directory listings. The default behaviour is stripes=1
which generates output similar to current, and you can also turn stripes
off by setting it to 0.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Jul 2006 01:23:31 +0200] rev 2665
prune unwanted files from MANIFEST (backups, object files, etc)
Brendan Cully <brendan@kublai.com> [Thu, 20 Jul 2006 11:52:28 -0700] rev 2664
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com> [Thu, 20 Jul 2006 11:52:28 -0700] rev 2663
Mq: modify repo.lookup to resolve applied patches too.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 14:36:32 -0700] rev 2662
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 20 Jul 2006 16:21:07 -0700] rev 2661
status: add -c (clean) and -A (all files) options
also add new localrepo.status what is more uniform than localrepo.changes.
localrepo.changes is deprecated and will go away soon.
Matt Mackall <mpm@selenic.com> [Mon, 24 Jul 2006 17:17:07 -0500] rev 2660
Added signature for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9
Matt Mackall <mpm@selenic.com> [Mon, 24 Jul 2006 17:13:58 -0500] rev 2659
Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9
Matt Mackall <mpm@selenic.com> [Mon, 24 Jul 2006 17:06:39 -0500] rev 2658
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 24 Jul 2006 11:35:04 -0500] rev 2657
Merge with crew
Matt Mackall <mpm@selenic.com> [Sun, 23 Jul 2006 14:00:29 -0500] rev 2656
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 19 Jul 2006 14:22:08 -0500] rev 2655
merge with tonfa-experimental
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 02:09:35 +0200] rev 2654
fix 'hg cat' broken by 156fb1feab62
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 02:00:49 +0200] rev 2653
allow specifying a file to hg parents, change the syntax to use -r/--rev
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 01:59:06 +0200] rev 2652
fix filectxt to really work
- use a context instead of changelog.read
- changectx._id is not necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 01:58:59 +0200] rev 2651
correct the handling of linkrev with nullid
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 01:58:50 +0200] rev 2650
lookup should allow -1 to represent nullid (if passed an int as arg)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Jul 2006 13:47:29 -0700] rev 2649
make convert-repo deal with git symbolic refs.
Problem noticed by Sébastien Pierre
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:22:47 -0700] rev 2648
util.getuser: better comments
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:19:25 -0700] rev 2647
util.getuser: raise exception if win32api not available.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:12:16 -0700] rev 2646
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:11:26 -0700] rev 2645
fix windows username problem.
Brendan Cully <brendan@kublai.com> [Thu, 20 Jul 2006 21:58:25 -0700] rev 2644
Make hgweb threads into daemon threads.
This fixes the problem that an interrupted hg serve will not terminate
until the next request has been received.
Brendan Cully <brendan@kublai.com> [Fri, 21 Jul 2006 02:36:17 +0200] rev 2643
Preserve multibyte UTF-8 characters when obfuscating.
This version uses the unicode 'replace' option, so non-UTF-8
encodings will still be mangled. Luckily, there aren't any
of those.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 21 Jul 2006 02:31:59 +0200] rev 2642
spelling fix
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 21 Jul 2006 01:40:07 +0200] rev 2641
change 'hg tag' to tag the parent rev instead of tip
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Jul 2006 07:56:40 -0700] rev 2640
fix tests.
Brendan Cully <brendan@kublai.com> [Wed, 19 Jul 2006 07:52:16 -0700] rev 2639
Add an option '-C|--copies' to hg status to show the source of copied files.
Copied files are displayed in the form:
A newname
oldname
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Jul 2006 07:51:56 -0700] rev 2638
merge
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 19 Jul 2006 09:28:59 +0200] rev 2637
HGcommand.vim : the status was read for the wrong file as we changed the current directory before
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Tue, 18 Jul 2006 18:35:47 +0200] rev 2636
Do not try to get revision and branch information for file which are not tracked
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Tue, 18 Jul 2006 18:35:47 +0200] rev 2635
Correction of commit with a log message in a file
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Tue, 18 Jul 2006 18:35:47 +0200] rev 2634
Test if file is below an HG root before doing anything
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Sat, 15 Jul 2006 13:09:46 +0200] rev 2633
[mq]: merge marker
Christian Ebert <blacktrash@gmx.net> [Wed, 19 Jul 2006 13:37:05 +0200] rev 2632
fix logfile option for HGFinishCommit
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Jul 2006 00:32:18 +0200] rev 2631
codingstyle: use spaces instead of tabs
Matt Mackall <mpm@selenic.com> [Mon, 17 Jul 2006 11:30:33 -0500] rev 2630
Merge with tonfa
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 16 Jul 2006 16:40:24 +0200] rev 2629
context.py: various fixes
- use a normal changeset instead of a context
- define _filenode instead of _node to match the else clause
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 16 Jul 2006 16:39:03 +0200] rev 2628
context.py: filectxs was using a keyword arg, add it to filectx
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 16 Jul 2006 16:39:02 +0200] rev 2627
context.py: self.repo is not defined, change to self._repo
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 16 Jul 2006 11:32:37 +0200] rev 2626
walkchangerevs: fix race in fast path
do not yield revs if the corresponding cl entry does not exists,
it avoids a race in the fastpath (where we walk in the filelog) with
an ongoing transaction.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 16 Jul 2006 00:02:05 +0200] rev 2625
mention the bts for bug reporting in traceback message
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 16 Jul 2006 00:01:41 +0200] rev 2624
expand the path if destination is not a directory
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 17 Jul 2006 07:43:15 -0700] rev 2623
fix problem with uncompressed clone and python 2.3.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 16 Jul 2006 10:04:16 -0700] rev 2622
rename stream hgrc option to compressed.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 15 Jul 2006 16:06:35 -0700] rev 2621
clone: disable stream support on server side by default.
enable in hgrc like this:
[server]
stream=True
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 15 Jul 2006 16:06:05 -0700] rev 2620
clone: change name of --stream to --uncompressed.
mpm asked for this.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 15 Jul 2006 09:19:40 -0700] rev 2619
update test-backout.out
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 15 Jul 2006 17:01:01 +0200] rev 2618
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 15 Jul 2006 17:00:23 +0200] rev 2617
fix bug introduced in b13a98bd078e
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 14 Jul 2006 23:20:08 -0700] rev 2616
merge.
Rafael Villar Burke <pachi@mmn-arquitectos.com> [Fri, 14 Jul 2006 22:38:21 -0700] rev 2615
contrib: add sample.hgrc
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 14 Jul 2006 23:19:15 -0700] rev 2614
backout: allow backout of merge changeset with --parent option.
--parent allows to choose which parent of merge to revert to.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 14 Jul 2006 14:51:36 -0700] rev 2613
clone: do not make streaming default. add --stream option instead.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 14 Jul 2006 11:17:22 -0700] rev 2612
add support for streaming clone.
existing clone code uses pull to get changes from remote repo. is very
slow, uses lots of memory and cpu.
new clone code has server write file data straight to client, client
writes file data straight to disk. memory and cpu used are very low,
clone is much faster over lan.
new client can still clone with pull, can still clone from older servers.
new server can still serve older clients.
Lee Cantey <lcantey@gmail.com> [Thu, 13 Jul 2006 09:50:51 -0700] rev 2611
Add merge to list of required tools.
Lee Cantey <lcantey@gmail.com> [Thu, 13 Jul 2006 11:19:35 -0700] rev 2610
Fix sed expression for OS X and Solaris 2.6.
Matches previous fixes in other tests.
Chris Mason <mason@suse.com> [Thu, 13 Jul 2006 09:40:01 -0700] rev 2609
util.parsedate should understand dates from hg export
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 12 Jul 2006 15:47:12 -0700] rev 2608
merge with mathieu clabaut.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Thu, 13 Jul 2006 00:02:26 +0200] rev 2607
HGcommand.vim : HGCommandEnableBufferSetup on by default
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 12 Jul 2006 23:52:13 +0200] rev 2606
HGcommand.vim : HGGetStatusLine accept to display an empty 'branch' value