Matt Mackall <mpm@selenic.com> [Mon, 25 Jun 2007 11:35:40 -0500] rev 4705
gitweb: hide email addresses in shortlog with |person
Matt Mackall <mpm@selenic.com> [Mon, 25 Jun 2007 11:35:14 -0500] rev 4704
Make shortlog the default page in hgweb
Matt Mackall <mpm@selenic.com> [Mon, 25 Jun 2007 11:30:05 -0500] rev 4703
hgweb: improve shortlog formatting
shorten author with |person
don't shrink font (default font is presumed to be preferred reading size)
set widths based on font ems rather than page percents.
Matt Mackall <mpm@selenic.com> [Mon, 25 Jun 2007 01:26:44 -0500] rev 4702
strip: move strip code to a new repair module
Matt Mackall <mpm@selenic.com> [Mon, 25 Jun 2007 01:22:45 -0500] rev 4701
strip: simplify bundle helper
Matt Mackall <mpm@selenic.com> [Sun, 24 Jun 2007 18:22:40 -0500] rev 4700
strip: pull core strip logic into its own function
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 24 Jun 2007 10:08:38 -0500] rev 4699
unbundle: accept multiple file arguments
update test-bundle for multiple unbundle support
Eric Hopper <hopper@omnifarious.org> [Sun, 24 Jun 2007 07:22:58 -0700] rev 4698
convert: handle new cvsps with Tags: and multiple tags.
Matt Mackall <mpm@selenic.com> [Sun, 24 Jun 2007 09:47:54 -0500] rev 4697
cat: return an error on failure
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 23 Jun 2007 22:43:46 -0500] rev 4696
tests: add merge test for changeset 9fe267f77f56
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
Emanuele Aina <em@nerd.ocracy.org> [Sat, 23 Jun 2007 22:26:22 -0500] rev 4695
purge: add the clean alias inspired by git-clean and svn-clean
NIIMI Satoshi <sa2c@sa2c.net> [Tue, 22 May 2007 07:24:06 +0900] rev 4694
mercurial.el: ignore errors on hg-after-save-hook()
Don't signal an error even if running hg command fails. Otherwise,
succeeding hooks won't be called.
NIIMI Satoshi <sa2c@sa2c.net> [Tue, 22 May 2007 08:05:16 +0900] rev 4693
mercurial.el: change default log range to tip:0
If the tip revision is smaller than hg-rev-completion-limit (defaults
to 100), "hg log -r tip:-100" fails.
Since performance does not differ between "hg log -l 50 -r tip:0" and
"hg log -l 50 -r tip:-100" even on large repository, default range can
be changed from "tip:-100" to "tip:0" without any drawbacks.
paul sorenson <sf@metrak.com> [Sat, 23 Jun 2007 22:25:11 -0500] rev 4692
Command in doc comment is now on a single line, fixed
after previous formatting broke it.
Emanuele Aina <em@nerd.ocracy.org> [Wed, 06 Jun 2007 22:17:35 +0200] rev 4691
purge: don't delete ignored files if --all is not specified
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
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 21:10:55 +0200] rev 4688
hgk: Use $HG instead of hg (see 849f011dbf79)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:22:17 +0200] rev 4687
hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:21:10 +0200] rev 4686
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 14:02:41 -0500] rev 4685
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 4684
convert: sometimes git forgets the author
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 12:05:00 +0200] rev 4683
Merge with main
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 20:44:40 -0300] rev 4682
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.
Matt Mackall <mpm@selenic.com> [Fri, 22 Jun 2007 17:29:49 -0500] rev 4681
rollback: update help for issue316
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
Brendan Cully <brendan@kublai.com> [Mon, 18 Jun 2007 12:38:54 -0700] rev 4623
Make fast-forward merges full merges
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4622
hooks: separate hook code into a separate module
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4621
dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4620
dirstate: pull ignore smarts out of ui
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4619
encoding: pull fallbackencoding out of localrepo into early parsing
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4618
extensions: kill ui readhooks
Move .hgrc extension loading into localrepo
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4617
extensions: pull extension-aware bits out of ui
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4616
dirstate: refactor checkinterfering
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4615
dirstate: hide some more internals
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4614
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 4613
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 4612
dirstate: simplify dirty handling
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4611
dirstate: lazify and lambdafy _slash
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4610
dirstate: simplify state()
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4609
dirstate: move ignore to its own file
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:34 -0500] rev 4608
dirstate: replace clear()
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4607
dirstate: fold parse into read
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4606
dirstate: make reload lazy
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4605
dirstate: lazify initdirs
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4604
dirstate: lazify copymap, _branch, and _pl
Matt Mackall <mpm@selenic.com> [Mon, 18 Jun 2007 13:24:33 -0500] rev 4603
dirstate: use getattr rather than lazyread
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.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 13 Jun 2007 15:02:09 +0300] rev 4594
test-patchbomb: sed -e may not work with extended regexps
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).
Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 17 Jun 2007 14:11:30 +0200] rev 4593
Make --import-branch option actually work (- is translated to _)
Eric Hopper <hopper@omnifarious.org> [Thu, 14 Jun 2007 09:01:51 -0700] rev 4592
Add --import-branch option to hg import to pull in branch information without --exact
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 16:19:58 -0700] rev 4591
convert: remove pdb call. *blush*
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 16:12:08 -0700] rev 4590
convert: fix various authormap handling bugs
Edouard Gomez <ed.gomez@free.fr> [Thu, 14 Jun 2007 23:25:55 +0200] rev 4589
convert extension: Add support for username mapping
Allows mapping usernames to new ones during conversion process.
- Use -A option for first import
- Then at the end of the conversion process and if the destination
repo supports authorfile attribute, author map content is copied
to the file pointed by the authorfile call.
- On incremental conversions w/o any -A option specified, the
destination authorfile, if any, gets read automatically.
EG: This allows mapping unix system usernames used in CVS accounts
to a more typical "Firstname Lastname <address@server.org>" pair.
Edouard Gomez <ed.gomez@free.fr> [Thu, 14 Jun 2007 23:25:55 +0200] rev 4588
convert extension: Save a few opens on the map file
Save a few opens on the map file adding a class attribute
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 13:32:35 -0700] rev 4587
Merge with stable
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 10:58:49 -0700] rev 4586
Make parents with a file but not a revision use working directory revision.
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 10:59:17 -0700] rev 4585
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 14 Jun 2007 10:58:49 -0700] rev 4584
Make parents with a file but not a revision use working directory revision.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jun 2007 12:54:06 +0200] rev 4583
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Repainted the bikeshed with its original color.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jun 2007 11:33:32 +0200] rev 4582
merge with main
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 19:11:20 -0700] rev 4581
Merge with crew
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 19:05:20 -0700] rev 4580
extensions: fix load of module/__init__.py on OS X
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 21:39:45 -0300] rev 4579
localrepo.status: only append stuff to the clean list if list_clean is true
This is consistent with dirstate.status.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 21:39:45 -0300] rev 4578
mq: reduce matcher abuse
The match function should match only the files we're interested in.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4577
commands.remove: don't use the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4576
commands.commit: don't use the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4575
localrepo.add: avoid some stats
There's still an extra lstat done by dirstate.update.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4574
revert: use util.lexists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4573
addremove: use util.lexists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4572
commands.commit: symlinks are supported
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Jun 2007 19:15:58 -0300] rev 4571
mq: grab locks before starting a transaction
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 13:50:29 -0700] rev 4570
Merge with crew
Brendan Cully <brendan@kublai.com> [Wed, 13 Jun 2007 13:46:40 -0700] rev 4569
extensions: load modules in module/__init__.py form.
For example, convert=/path/to/convert now works.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 13 Jun 2007 15:02:09 +0300] rev 4568
test-patchbomb: sed -e may not work with extended regexps
Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD)
may not support extended regexps (i.e. including \| branches),
or may need a special option to enable it (like -E instead of -e).
Expand the sed RE in tests/test-patchbomb to fix running this
test on FreeBSD and Solaris.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 13 Jun 2007 08:24:40 +0200] rev 4567
Correct tests/test-patchbomb* files:
mv test-patchbomb test-patchbomb.out
hg revert -r 1cf908c00479 test-patchbomb
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:52:34 -0700] rev 4566
patchbomb: add --date option
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:44:47 -0700] rev 4565
Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:39:36 -0700] rev 4564
patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil
Brendan Cully <brendan@kublai.com> [Tue, 12 Jun 2007 13:21:42 -0700] rev 4563
dispatch: restore a dropped shlex import
Add test-dispatch as a place for command parsing and dispatch tests.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Jun 2007 18:55:47 +0200] rev 4562
merge with main
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Jun 2007 17:39:57 +0200] rev 4561
Revive commands.dispatch as a simple way to call hg from other pythons scripts.
This was already used by hg-ssh and others and is really convenient if you
just want a native equivalent of calling the command line version.
Matt Mackall <mpm@selenic.com> [Wed, 13 Jun 2007 13:15:53 -0500] rev 4560
extensions: fix lookup of hgext.foo modules
Matt Mackall <mpm@selenic.com> [Wed, 13 Jun 2007 13:15:51 -0500] rev 4559
localrepo: demand-load changeset, manifest, and dirstate
Matt Mackall <mpm@selenic.com> [Tue, 12 Jun 2007 10:34:54 -0500] rev 4558
extensions: add missing sys import
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4557
dispatch: accept an abbreviation of --repository
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4556
dispatch: move findrepo to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4555
localrepo: don't search from path
All current callers already pass in the repo root.
This normalizes things a bit. Now all repo types take a direct path to
repo root and only the command line interface (or the dispatcher)
searches from the current directory.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4554
dispatch: use the repo path found by early parsing
This lets us simplify things a bit.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4553
dispatch: parse and apply -R early
This allows us to use extensions specified in .hg/hgrc. Unfortunately,
this requires us to parse that file twice, but performance impact on
the version command appears to be less than 1%.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4552
dispatch: parse and apply cwd opt early
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4551
dispatch: rename variables after code motion
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4550
dispatch: hoist debugging hook to runcatch
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4549
dispatch: move dispatching code to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4548
dispatch: move runcommand to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4547
dispatch: pull final command execution into its own function
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4546
dispatch: reduce nesting by moving parsing exceptions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4545
dispatch: move signal and exception handling to its own function
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4544
Create a separate module for managing extensions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4543
extensions: separate function for loading single extensions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4542
dispatch: reorder functions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4541
localrepo: break out the repo-finding walk into its own function
Brendan Cully <brendan@kublai.com> [Mon, 11 Jun 2007 12:14:31 -0700] rev 4540
Respect locale environment variables on darwin.
In python 2.4+ on darwin, locale.getpreferredencoding() returns
mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can
produce hard-to-notice conversion errors if input text is not in
mac-roman. So this patch overrides it with setlocale/getlocale if the
environment has been customized, on the assumption that the user has
done so deliberately.
Brendan Cully <brendan@kublai.com> [Mon, 11 Jun 2007 11:06:42 -0700] rev 4539
Small cleanups for the new tag code
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Fri, 01 Jun 2007 19:56:39 -0400] rev 4538
gitweb: Display branch and tag labels
Pages which display labels:
- summary
- shortlog
- changelog
- changeset
- search
Brendan Cully <brendan@kublai.com> [Sun, 10 Jun 2007 21:05:01 -0700] rev 4537
Merge with mpm
Brendan Cully <brendan@kublai.com> [Sun, 10 Jun 2007 20:08:47 -0700] rev 4536
Split convert extension into common and repository type modules
Matt Mackall <mpm@selenic.com> [Sun, 10 Jun 2007 21:16:58 -0500] rev 4535
commit: fix bug where dirstate for removed file is confused
This fixes issue586
Matt Mackall <mpm@selenic.com> [Sun, 10 Jun 2007 19:16:20 -0500] rev 4534
hg serve: don't lookup user-supplied names/addresses
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Jun 2007 13:25:54 +0200] rev 4533
Removed trailing \n in calls to util.Abort()
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Jun 2007 13:17:58 +0200] rev 4532
Some small cleanups for convert extension:
- repo doesn't need to be imported
- util.Abort doesn't need \n
- space after comma
- long lines
- spacing
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Jun 2007 01:04:28 -0300] rev 4531
Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Jun 2007 01:04:28 -0300] rev 4530
Make sure the changelog mentions files whose flags changed
These changes don't actually need a new filelog entry (see next patch),
but if we don't mention the files in the changelog, it becomes much
harder to find all changesets that touch a file (not even a
"hg log --removed file" will work).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4529
run-tests.py: set ui.slash = True
This should make things easier for pysh.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4528
test-config-case: print only the Section we're interested in.
This allows us to add additional settings to the global hgrc file
created by run-tests.py without breaking this test.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4527
Add ui.slash hgrc setting
This will make most commands print paths using "/", regardless of
the value of os.sep.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4526
docopy: use repo.pathto to format paths for printing
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4525
Add dirstate.pathto and localrepo.pathto.
Every time util.pathto is called, we have to pass the repo root and the
repo cwd.
dirstate.pathto is a simple convenience function that knows about the
root and the cwd arguments. It's still possible to pass the cwd as an
optimization.
localrepo.pathto is a convenience function that just calls
dirstate.pathto, just like localrepo.getcwd.
dirstate.pathto becomes a single point that converts most (all?) paths
from the internal representation to some OS-specific relative path for
display purposes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4524
Use absolute paths in revert.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4523
Use absolute paths in docopy.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4522
Use absolute paths in addremove.
This is more consistent with other places in the code, which only use
the "relpath" returned by cmdutil.walk for display purposes.
Edouard Gomez <ed.gomez@free.fr> [Thu, 07 Jun 2007 23:16:10 +0200] rev 4521
Add some more smart when initializing destination repository
Edouard Gomez <ed.gomez@free.fr> [Thu, 07 Jun 2007 23:06:17 +0200] rev 4520
Fix hgext/convert/__init__.py rights
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Jun 2007 22:28:52 +0200] rev 4519
Include convert extension in packages setup
(reported by Christian Ebert and Eric Hopper)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Jun 2007 12:41:12 +0200] rev 4518
convert: map CVS HEAD to default branch
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jun 2007 22:11:25 +0200] rev 4517
ui: make readsections() abort when configuration cannot be read.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 20:22:52 +0200] rev 4516
Removed trailing whitespace and tabs from python files
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 20:17:03 +0200] rev 4515
Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension
Edouard Gomez <ed.gomez@free.fr> [Fri, 25 May 2007 08:12:33 +0200] rev 4514
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr> [Fri, 25 May 2007 00:56:48 +0200] rev 4513
Turns convert.py into a real extension
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 19:49:47 +0200] rev 4512
Move convert-repo to hgext/convert/__init__.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 19:06:43 +0200] rev 4511
Fixed test output for changed glog (. instead of @)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 19:05:18 +0200] rev 4510
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 18:28:48 +0200] rev 4509
graphlog: Print . instead of @ for working directory parents
"." is accepted as an alias for the first working directory parent by -r/--rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 05 Jun 2007 19:55:27 -0300] rev 4508
Remove atomicfile class.
The interface provided by opener(atomic=True) is inherently unsafe:
if an exception is raised in the code using the atomic file, the
possibly incomplete file will be renamed to its final destination,
defeating the whole purpose of atomic files.
To get around this, we would either need some bad hacks involving
sys.exc_info (to make sure things work in except: blocks), or an
interface to say "file is complete; rename it".
This is the exact interface provided by atomictempfile. Since there
are no remaining users of the atomicfile class, just remove it.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 05 Jun 2007 19:55:27 -0300] rev 4507
Use atomictemp files to write the dirstate.
atomic files are not safe in all cases.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 05 Jun 2007 19:26:36 -0300] rev 4506
test-serve: let run-tests.py kill the daemons
If the daemons die while the tests are still running, we'll get additional
"killed!" messages, making the test fail.
Joel Rosdahl <joel@rosdahl.net> [Mon, 04 Jun 2007 21:49:01 +0200] rev 4505
Fix bug in "hg serve -v"
Joel Rosdahl <joel@rosdahl.net> [Mon, 04 Jun 2007 21:48:59 +0200] rev 4504
Add test reproducing a bug in "hg serve -v"
Patrick Mezard <pmezard@gmail.com> [Mon, 04 Jun 2007 22:56:42 +0200] rev 4503
Merge with crew-stable
TK Soh <teekaysoh@yahoo.com> [Mon, 04 Jun 2007 09:16:53 -0500] rev 4502
hgk: display tags that contain spaces
Bela Babik <teki321@gmail.com> [Mon, 04 Jun 2007 16:54:52 +1000] rev 4501
hgk: added -selectbackground grey to canvases
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 04 Jun 2007 22:08:42 +0200] rev 4500
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 04 Jun 2007 22:05:47 +0200] rev 4499
Obfuscate author in gitweb shortlog (issue578)
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 04 Jun 2007 22:02:17 +0200] rev 4498
Fixed indentation in hgext/notify.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:26:53 -0300] rev 4497
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Jun 2007 14:38:52 -0300] rev 4496
patch.diff: avoid calling workingctx().manifest()
Right now, to generate the manifest of the working dir, we have to
perform a full walk of the working dir, which will be very slow,
especially if we're interested in only a small part of it.
Since we use the manifest only to find out the mode of files for git
patches, manually build an execf function to do it.
This should fix issue567.
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jun 2007 17:18:48 +0200] rev 4495
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Sat, 02 Jun 2007 09:04:23 -0700] rev 4494
Merge with crew.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:58:59 -0700] rev 4493
patchbomb: Fail early if no revs given to email
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:54:00 -0700] rev 4492
patchbomb: Fix typo.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:53:46 -0700] rev 4491
patchbomb: Hoist sender config higher.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:43:29 -0700] rev 4490
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:40:14 -0700] rev 4489
patchbomb: Validate email config before we start prompting for info.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:26:54 -0700] rev 4488
Introduce find_exe. Use instead of find_in_path for programs.
The behaviour of find_in_path was broken for config options containing
path names, because it always searched the given path, even when not
necessary. The find_exe function is more polite: if the name passed
to it contains a path component, it just returns it.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 13:50:59 -0700] rev 4487
ui: Rename has_config to has_section.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 13:41:35 -0700] rev 4486
patchbomb: Defer the import of readline.
If imported at the top of the module, the import appears to succeed,
but raw_input doesn't acquire magic editing fu. I suspect this has
something to do with the newish demandimport code, because the prior
code worked with demandload.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 13:29:04 -0700] rev 4485
patchbomb: Don't prompt for headers until sure we have revs to export.
The prior behaviour was to always prompt for headers, and only then
bomb out if there were actually no revs to send.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:24:48 -0300] rev 4484
wsgicgi: change stdin to binary mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:24:48 -0300] rev 4483
Also check the index file size when deciding whether to reload a revlog.
This should fix some spurious failures from test-clone-pull-corruption
(issue552).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:24:48 -0300] rev 4482
use .extend instead of .append in readtags
TK Soh <teekaysoh@yahoo.com> [Fri, 20 Apr 2007 16:17:42 -0500] rev 4481
hbisect: fix a typo in error message
"Andrei Vermel <avermel@mail.ru>" [Fri, 15 Dec 2006 10:32:57 +0300] rev 4480
hgk - fix CR issues on windows
Mathieu Clabaut <mathieu.clabaut@gmail.com> [Thu, 24 May 2007 16:32:38 +0200] rev 4479
Add sending date to notify message.
When using SMTP, no date field was set into the message, which causes it to be
displayed as being send on 1st january 1970 on most MUA.
Matt Mackall <mpm@selenic.com> [Fri, 01 Jun 2007 18:40:14 -0500] rev 4478
Add support for url#id syntax
This allows you to do:
hg clone http://server/repo#stable
which is equivalent to:
hg clone -r stable http://server/repo
Future incoming, outgoing, and push commands will default to using
this id because it's recorded in the default path.
Other commands that accept URLs (push, pull, bundle, incoming, and
outgoing) also accept this syntax.
Matt Mackall <mpm@selenic.com> [Fri, 01 Jun 2007 18:52:18 -0500] rev 4477
clone: checkout the "default" branch if available
Matt Mackall <mpm@selenic.com> [Sat, 02 Jun 2007 09:21:56 -0500] rev 4476
mq: pass a URL to clone
Matt Mackall <mpm@selenic.com> [Fri, 01 Jun 2007 14:07:42 -0500] rev 4475
Warn about large files on hg add
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 19:49:09 +0200] rev 4474
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 16:02:49 +0200] rev 4473
Corrected similarity parameter used in test-addremove
0.5 meant 50% in the early stages of addremove -s, now 50 has to be used.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 16:00:40 +0200] rev 4472
addremove: comparing two empty files caused ZeroDivisionError
(found by Giorgos Keramidas)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 13:03:21 +0200] rev 4471
Add archive download links to hgweb search template
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 13:00:27 +0200] rev 4470
merge with crew
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Thu, 31 May 2007 20:12:40 -0400] rev 4469
gitweb: Fixed-up search template
It seems that the search template has been forgoten over time, and needed
major revamping.
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Thu, 31 May 2007 19:59:02 -0400] rev 4468
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 06:52:40 -0400] rev 4467
gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 11:16:57 -0400] rev 4466
gitweb: file annotate: Display metadata in same order as changeset does