Matt Mackall <mpm@selenic.com> [Mon, 24 Jul 2006 17:06:39 -0500] rev 2658
Merge with crew
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Jul 2006 13:47:29 -0700] rev 2657
make convert-repo deal with git symbolic refs.
Problem noticed by Sébastien Pierre
Matt Mackall <mpm@selenic.com> [Mon, 24 Jul 2006 11:35:04 -0500] rev 2656
Merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:22:47 -0700] rev 2655
util.getuser: better comments
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:19:25 -0700] rev 2654
util.getuser: raise exception if win32api not available.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:12:16 -0700] rev 2653
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 24 Jul 2006 09:11:26 -0700] rev 2652
fix windows username problem.
Matt Mackall <mpm@selenic.com> [Sun, 23 Jul 2006 14:00:29 -0500] rev 2651
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 20 Jul 2006 21:58:25 -0700] rev 2650
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 2649
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 2648
spelling fix
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 21 Jul 2006 01:40:07 +0200] rev 2647
change 'hg tag' to tag the parent rev instead of tip
Matt Mackall <mpm@selenic.com> [Wed, 19 Jul 2006 14:22:08 -0500] rev 2646
merge with tonfa-experimental
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 02:09:35 +0200] rev 2645
fix 'hg cat' broken by
156fb1feab62
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 02:00:49 +0200] rev 2644
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 2643
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 2642
correct the handling of linkrev with nullid
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 17 Jul 2006 01:58:50 +0200] rev 2641
lookup should allow -1 to represent nullid (if passed an int as arg)
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.