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
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 12 Jul 2006 23:52:13 +0200] rev 2605
HGcommand.vim : suppress CVS relief
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 12 Jul 2006 23:52:08 +0200] rev 2604
HGcommand.vim : doc review.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Wed, 12 Jul 2006 23:50:34 +0200] rev 2603
HGcommand.vim : doc integration
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 12 Jul 2006 15:44:51 -0700] rev 2602
contrib/hgsh: make to work with remote clone over ssh.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 12 Jul 2006 08:59:20 -0700] rev 2601
move most of tag code to localrepository class.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 12 Jul 2006 08:28:00 -0700] rev 2600
clean up trailing white space.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Jul 2006 09:01:10 +0200] rev 2599
Added tests for local and remote init.
This tests the changes done in edb66cb05ded and b898afee9d0d.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Jul 2006 08:57:18 +0200] rev 2598
Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out.
The only user visible change is that 'hg init' now accepts this options, too.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 11 Jul 2006 16:18:53 -0700] rev 2597
clone: move code into hg module. make doc better.
api in commands module is still same, but version in hg is best for
calling within python now.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 11 Jul 2006 15:52:56 -0700] rev 2596
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 11 Jul 2006 15:52:36 -0700] rev 2595
parse url schemes more strictly.
previous code mistook repo named "hg" for scheme named "hg".
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 11 Jul 2006 15:51:16 -0700] rev 2594
add missed tests for diff -b/-B
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 11 Jul 2006 13:47:51 -0700] rev 2593
merge with crew.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Mon, 10 Jul 2006 23:45:16 +0200] rev 2592
Vim script: Adaptation from CVS to Mercurial
"Mathieu Clabaut <mathieu.clabaut@gmail.com>" [Mon, 10 Jul 2006 23:39:08 +0200] rev 2591
Addition of CVScommand vim script as a base for HGcommand
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Jul 2006 22:36:52 +0200] rev 2590
Additional information about URLs in pull/push/clone/init:
- clone to ssh://
- init via ssh://
- example for pull from an absolute directory via ssh://
- push to http:// and https://
"Aurelien Jacobs <aurel@gnuage.org>" [Tue, 11 Jul 2006 22:19:49 +0200] rev 2589
disambiguate help about url syntax
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 10 Jul 2006 09:36:56 -0700] rev 2588
merge with crew.
Sébastien Pierre <sebastien@xprima.com> [Mon, 10 Jul 2006 12:19:37 -0400] rev 2587
darcs2hg: pause and resume support, date extraction from commit hash, does not break on empty commits
Sébastien Pierre <sebastien@xprima.com> [Mon, 10 Jul 2006 09:24:04 -0700] rev 2586
darcs2hg: improved logging
Nils Decker <mercurial@ndecker.de> [Sun, 09 Jul 2006 21:41:00 -0700] rev 2585
darcs2hg.py: use darcs patch hash as patch identifier
The use of the patch name is dangerous when duplicate names exist.
In case of a duplicate name the second patch and all its dependancies
are merged into a single mercurial patch.
The patch identifier (hash) is always unique.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 09 Jul 2006 14:42:18 +0200] rev 2584
merge with crew
Valentino Volonghi aka dialtone <dialtone@divmod.com> [Sun, 09 Jul 2006 14:12:19 +0200] rev 2583
adding local_hostname option to smtp configuration
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 07 Jul 2006 14:33:51 -0300] rev 2582
Respect "Connection: close" headers sent by HTTP clients.
A HTTP client can indicate that it doesn't support (or doesn't want)
persistent connections by sending this header.
This not only makes the server more compliant with the RFC, but also
reduces the run time of test-http-proxy when run with python 2.3 from
~125s to ~5s (it doesn't affect it with python 2.4, which was already
~5s).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 09 Jul 2006 11:10:11 +0200] rev 2581
allow use of extensions in python hooks
extensions are loaded with hgext_ prefix, try to use them if
the module is not found in the normal path
Haakon Riiser <haakon.riiser@fys.uio.no> [Thu, 29 Jun 2006 15:16:25 +0200] rev 2580
diff: add -b/-B options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 09 Jul 2006 01:30:30 +0200] rev 2579
use __contains__, index or split instead of str.find
str.find return -1 when the substring is not found, -1 evaluate
to True and is a valid index, which can lead to bugs.
Using alternatives when possible makes the code clearer and less
prone to bugs. (and __contains__ is faster in microbenchmarks)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 08 Jul 2006 16:55:49 +0200] rev 2578
coding style: use spaces instead of tabs
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 07 Jul 2006 15:02:55 -0700] rev 2577
bdiff: improve worst case behavior by 100x.
on 5.8MB (244.000 lines) text file with similar lines, hash before
this change made diff against empty file take 75 seconds. this change
improves performance to 0.6 seconds. result is that clone of smallish
repo (137MB) with some files like this takes 1 minute instead of 10
minutes.
common case of diff is 10% slower now, probably because of worse cache
locality. but diff does not affect overall performance in common case
(less than 1% of runtime is in diff when it is working ok), so this
tradeoff looks good.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Jul 2006 11:23:53 +0200] rev 2576
Changed default timeout for run-tests.py from 30 to 180 seconds.
As e.g. test-http-proxy already takes quite some time (about a minute here)
and tests usually should clean up after themselves, the timeout should only be
hit in case of other problems.
Lee Cantey <lcantey@gmail.com> [Thu, 06 Jul 2006 09:26:31 -0700] rev 2575
Redirect MacPython link to point to python.org
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 15:04:10 -0700] rev 2574
merge with mpm.
Matt Mackall <mpm@selenic.com> [Thu, 06 Jul 2006 14:15:24 -0500] rev 2573
Fix annotate breakage
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 15:03:34 -0700] rev 2572
fix problems with external module handling. found by benoit boissinot.
first fix is to not store module objects in commands.external dict,
instead use module names for key into sys.modules. this prevents circular
reference during cleanup of aborted transaction.
second is to get name right during import of external module.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 11:49:19 -0700] rev 2571
tests: record few more daemon pids to be safe
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 11:45:34 -0700] rev 2570
tests: add timeouts, make run-tests.py clean up dead daemon processes
test timeout feature is needed for test with python 2.5 beta. if test
does not complete in time (30 seconds is default), it is killed.
some times daemon process used in test can be alive after the test
is killed by user or by timeout. tests now record daemon pids into
$DAEMON_PIDS and run-tests.py kills all living daemons after every test.
final little change is to add newline to end of pid file printed by
"hg serve", else "cat hg.pid >> $DAEMON_FILES" gives garbage.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 10:09:24 -0700] rev 2569
run-tests.py: make tests use same python interpreter as test harness.
this is wanted because some tests run python interpreter directly.
must use same python interpreter in tests as in main harness or problems
will happen because of e.g. different python abi if run-tests.py run
with python 2.5 but system python is 2.4.
fix is to see if system python is used and is named python. if no,
put symlink called python at front of shell search path.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 06 Jul 2006 03:14:55 -0300] rev 2568
HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available
The urllib2 differences between python 2.3 and 2.4 are hidden by
using keepalive.py, which also gives us support for persistent
connections.
Support for HTTPS is enabled only if there's a HTTPSHandler class in
urllib2.
It's not possible to have separate classes as handlers for HTTP and
HTTPS: to support persistent HTTPS connections, we need a class that
inherits from both keepalive.HTTPHandler and urllib2.HTTPSHandler. If
we try to pass (an instance of) this class and (an instance of) the
httphandler class to urllib2.build_opener, this function ends up getting
confused, since both classes are subclasses of the HTTPHandler default
handler, and raises an exception.
Matt Mackall <mpm@selenic.com> [Wed, 05 Jul 2006 13:28:25 -0500] rev 2567
Merge context patches
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:42:17 -0500] rev 2566
Convert hg annotate to context api
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:11:42 -0500] rev 2565
convert hg cat to new context api
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:08:10 -0500] rev 2564
Add context helper functions to localrepo
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:07:46 -0500] rev 2563
Add context.py: changeset and file revision contexts
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:06:56 -0500] rev 2562
simplify make_filename, fix hg cat bug
hg cat was using file-level rev/node ids for generating filename
templates. This simplifies make_filename to only use changeset
rev/node ids.
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 16:52:42 -0500] rev 2561
revlog: make lookup handle binary nodes
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 15:49:33 -0500] rev 2560
revlog: handle integer arguments to lookup
Brendan Cully <brendan@kublai.com> [Tue, 04 Jul 2006 15:36:05 -0700] rev 2559
templater.firstline should handle empty strings
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Jul 2006 00:33:19 -0300] rev 2558
hgweb: fix unbundle.
After the WSGI changes, even if a push over HTTP succeeds, apache
complains about "Premature end of script headers: hgwebdir.cgi" and
returns a "HTTP Error 500: Internal Server Error", making the local hg
abort.
The change to either of the files touched by this patch is enough to fix
this, but I think changing both is a more robust solution.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Jul 2006 00:23:58 -0300] rev 2557
Fix push over https.
Without this patch, python gives me a
TypeError: write() argument 1 must be string or read-only buffer, not file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Jul 2006 00:23:56 -0300] rev 2556
Allow http://user@example.com URLs (i.e. without passwords)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 02 Jul 2006 22:39:39 -0300] rev 2555
hg.py: move exception handling code to try to avoid hiding errors
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Jul 2006 14:30:38 -0700] rev 2554
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Jul 2006 14:30:24 -0700] rev 2553
help: make "hg help EXTENSION" work
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 03 Jul 2006 19:28:31 +0200] rev 2552
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Jul 2006 10:19:09 -0700] rev 2551
merge with crew.
Raphael Marmier <raphael@marmier.net> [Mon, 03 Jul 2006 10:18:46 -0700] rev 2550
Disable automatic line endings conversion on windows
The rationale behind this is that such conversion implies a particular
situation in which all files in the repo are terminated by only LF. This
is documented nowhere and it bit me sharply when I upgraded.
Furthermore, it works on the assumption that a file containing no NULL
characters are actually a text file. Therefore it cannot guarantee that
no binary file will be harmed in the process.
Currently, if a file already contains CRLF line endings when it is
copied to the working dir from the repo, then the version in the working
dir will be corrupted by an extra CR.
I'm working on a patch that will turn this into a warning. But as a side
effect, committing such a file back will strip it from its CR.
In all case, unrequested data modification can occur under the feet of
the user, which is bad(tm), ihmo.
Sean Meiners <sean.meiners@linspire.com> [Fri, 30 Jun 2006 19:24:02 -0700] rev 2549
Added ability to clone from a local repository to a (new) remote one.
Rearranged the clone command a good bit to make sure it validates that
the source does exist and that the destination doesn't before doing anything.
Before I moved the source repo check it would create the destination
repository before it verified the source existed.
Moved the responsibility for creating the destination repo root directory
entirly into the localrepo class so that local to local cloning doesn't break.
This also simplifies the code a bit since it's no longer being done in both
clone and init.
Changed the names of the 'repo' and 'other' variables to 'dest_repo' and
'src_repo' to maintain my sanity.
Passes 82/83 tests. The only failure is the version number test, which I
suspect is supposed to fail since it comes from a generated file.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 03 Jul 2006 19:14:29 +0200] rev 2548
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 30 Jun 2006 22:04:02 -0700] rev 2547
test-webraw: do not store hostname in test output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 23:02:08 +0200] rev 2546
str.rsplit does not exist in python 2.3
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 22:09:43 +0200] rev 2545
Merge with crew.