OHASHI Hideya <ohachige at gmail.com> [Wed, 13 Jun 2007 18:18:06 +0900] rev 4690
Enable to select encoding in hgrc web section
This patch provides character encoding setting in each repository. After this
patch, You can use multi encoding repositories with one mercurial server.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 21:11:28 +0200] rev 4689
merge with main
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 14:02:41 -0500] rev 4688
archive: remove spurious flag_bits setting
This makes zip -T on resulting archives work. File permissions are
still retained.
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 13:33:45 -0500] rev 4687
convert: sometimes git forgets the author
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 21:10:55 +0200] rev 4686
hgk: Use $HG instead of hg (see 849f011dbf79)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:22:17 +0200] rev 4685
hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:21:10 +0200] rev 4684
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 12:05:00 +0200] rev 4683
Merge with main
Matt Mackall <mpm@selenic.com> [Fri, 22 Jun 2007 17:29:49 -0500] rev 4682
rollback: update help for issue316
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 20:44:40 -0300] rev 4681
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 19:43:29 -0300] rev 4680
transplant: fix locking order
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 19:06:04 -0300] rev 4679
git patches: correct handling of filenames with spaces
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 14:32:54 -0300] rev 4678
Work around urllib2 digest auth bug with Python < 2.5
This should fix issue570.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 23:42:06 -0300] rev 4677
dirstate.status: if a file is marked as copied, consider it modified
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 18:05:14 -0500] rev 4676
Merge with Eric Hopper
Eric Hopper <hopper@omnifarious.org> [Thu, 21 Jun 2007 10:40:09 -0700] rev 4675
Change branches to sort 'active' branches first, and add an option to show only active branches.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 18:02:03 -0500] rev 4674
merge: warn user about divergent renames
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jun 2007 22:19:41 +0200] rev 4673
Merge with crew
Marcos Chaves <marcos.nospam@gmail.com> [Thu, 21 Jun 2007 21:58:18 +0200] rev 4672
Handle CTRL+C in serve under Windows.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 13:09:01 -0500] rev 4671
identify: take a path to a remote repo
Rather than using -R, we take a path as an argument. This lets us use
url#branch syntaxes that may be in hgrc.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 13:09:00 -0500] rev 4670
dispatch: parse local hgrc for paths
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 19:38:44 +0200] rev 4669
hgweb_mod.archive(): Use 'key' instead of builtin 'id'.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 19:24:27 +0200] rev 4668
Remove useless variable assignments in util.opener.
The original idea might have been to prevent circular references, but
as this assignment would have created another reference, this makes
no difference.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:54:16 -0500] rev 4667
identify: work with remote repos
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:54:13 -0500] rev 4666
identify: add support for output flags
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:54:11 -0500] rev 4665
identify: accept a revision argument
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:42:39 -0500] rev 4664
identify: use contexts
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:42:39 -0500] rev 4663
context: add tags() method
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 11:42:39 -0500] rev 4662
identify: show nullid for empty repo
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 10:00:59 +0200] rev 4661
Backed out changeset cfa477946181824f4c769580ebf59710090ba08a
Only printenv was changed, not the actual execution of hooks.
And not setting an empty value might cause problems on platforms
which can't always remove variables from the environment.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 09:45:33 +0200] rev 4660
Adjust note about variables not being set for empty values.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 21 Jun 2007 09:25:49 +0200] rev 4659
Kill trailing spaces
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4658
mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4657
dirstate.invalidate: clear dirty flag
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4656
dirstate: fix typo
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 00:34:14 -0300] rev 4655
update the output of test-help and test-globalopts
Brendan Cully <brendan@kublai.com> [Wed, 20 Jun 2007 20:13:31 -0700] rev 4654
Fix dispatch error message when not in a repo
Brendan Cully <brendan@kublai.com> [Wed, 20 Jun 2007 19:20:37 -0700] rev 4653
archive: test md5 consistency
csaba.henk@creo.hu [Mon, 11 Jun 2007 19:09:01 +0200] rev 4652
timestamp of gzip archives taken from changeset context
Brendan Cully <brendan@kublai.com> [Wed, 20 Jun 2007 18:09:40 -0700] rev 4651
Test attempt to remove nonexistent tag
TK Soh <teekaysoh@yahoo.com> [Fri, 15 Jun 2007 14:48:21 -0500] rev 4650
tag: abort when trying to remove nonexistent tags
Brendan Cully <brendan@kublai.com> [Wed, 20 Jun 2007 17:53:11 -0700] rev 4649
Small fixes for 8e503fa54d2d (hg heads branch)
Eric Hopper <hopper@omnifarious.org> [Tue, 19 Jun 2007 08:37:43 -0700] rev 4648
Add option to heads to show only heads for current branch.
Eric Hopper <hopper@omnifarious.org> [Tue, 19 Jun 2007 08:37:41 -0700] rev 4647
Provide a version independent way to use the set datatype.
Patrick Mezard <pmezard@gmail.com> [Tue, 19 Jun 2007 17:03:31 +0200] rev 4646
Fix read mode when importing patch.
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 23:32:31 +0200] rev 4645
Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com> [Tue, 19 Jun 2007 17:02:07 +0200] rev 4644
patch: fix ui.patch regression introduced by 62019c4427e3.
The idea is ui.patch is either empty or wisely filled by user.
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 22:06:37 +0200] rev 4643
printenv: filter empty environment variables for portability.
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 22:05:43 +0200] rev 4642
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 21:35:41 +0200] rev 4641
Document empty environment variables not being passed to hooks under Windows.
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 00:22:51 +0200] rev 4640
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 00:10:21 +0200] rev 4639
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 00:10:21 +0200] rev 4638
Fix issue 589: "undelete" sequence leads to crash.
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 00:09:32 +0200] rev 4637
Add test for debugrename
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jun 2007 00:09:30 +0200] rev 4636
Fix debugrename --rev option
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 19 Jun 2007 08:51:34 +0200] rev 4635
Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 19 Jun 2007 08:17:55 +0200] rev 4634
Use printenv.py for pre/post-command-hooks (fixes tests on Solaris, too)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 19 Jun 2007 08:06:37 +0200] rev 4633
Cleanup of whitespace, indentation and line continuation.
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 21:30:27 -0500] rev 4632
dispatch: report failed imports nicely
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 19:43:26 -0500] rev 4631
demandimport: fix issue579 and add a test
fix suggested by Brendan
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 17:49:56 -0500] rev 4630
dispatch: add generic pre- and post-command hooks
Lee Cantey <lcantey@gmail.com> [Mon, 18 Jun 2007 15:21:02 -0700] rev 4629
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs.
Additional changes to remove local DLL flag on uninstall and set privilege level.
Lee Cantey <lcantey@gmail.com> [Mon, 18 Jun 2007 15:14:49 -0700] rev 4628
Fix for including hgext in Windows compiled version.
From Shun-ichi GOTO via Mercurial mailing list.
Lee Cantey <lcantey@gmail.com> [Mon, 18 Jun 2007 15:06:14 -0700] rev 4627
Merge with crew
Lee Cantey <lcantey@gmail.com> [Mon, 18 Jun 2007 15:03:55 -0700] rev 4626
Fix for demandimport.py and Windows compiled version.
From Shun-ichi Goto in BTS issue 457 http://www.selenic.com/mercurial/bts/msg2780
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 14:52:31 -0700] rev 4625
Work around heisenbug in Popen3.__del__
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 12:39:43 -0700] rev 4624
Merge with mpm
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4623
hooks: separate hook code into a separate module
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4622
dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4621
dirstate: pull ignore smarts out of ui
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4620
encoding: pull fallbackencoding out of localrepo into early parsing
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4619
extensions: kill ui readhooks
Move .hgrc extension loading into localrepo
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4618
extensions: pull extension-aware bits out of ui
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4617
dirstate: refactor checkinterfering
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4616
dirstate: hide some more internals
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4615
dirstate: hide internal vars
Add an __iter__ method so commands don't need to poke at _map.
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4614
localrepo and dirstate: rename reload to invalidate
We want to avoid actually reloading if possible.
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4613
dirstate: simplify dirty handling
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4612
dirstate: lazify and lambdafy _slash
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4611
dirstate: simplify state()
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4610
dirstate: move ignore to its own file
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4609
dirstate: replace clear()
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4608
dirstate: fold parse into read
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4607
dirstate: make reload lazy
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4606
dirstate: lazify initdirs
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4605
dirstate: lazify copymap, _branch, and _pl
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4604
dirstate: use getattr rather than lazyread
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 12:38:54 -0700] rev 4603
Make fast-forward merges full merges
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 11:13:16 -0700] rev 4602
Fix up tests for new branch message
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 10:44:43 -0700] rev 4601
Notify the user that hg branch does not create a branch until commit
Brendan Cully <brendan@kublai.com> [Sun, 17 Jun 2007 20:09:35 -0700] rev 4600
patchbomb: fix PAGER buglet introduced in 88fc92b0b821
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 20:35:43 +0200] rev 4599
patchbomb: page patchbomb messages only if PAGER is defined.
Paging is complicated under win32. It is just better to avoid it by default.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 20:35:32 +0200] rev 4598
cmdutil: add missing "time" import.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 20:08:06 +0200] rev 4597
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 19:40:02 +0200] rev 4596
patchbomb: flush ui before delegating to pager.
Patrick Mezard <pmezard@gmail.com> [Sun, 17 Jun 2007 19:39:47 +0200] rev 4595
test-patchbomb: fix non-existing --date parameter and filtering regexps.