Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 10:40:15 -0800] rev 1729
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 10:39:47 -0800] rev 1728
add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 08:48:31 -0800] rev 1727
fix names of parent changeset ids in hooks.
fix hook part of man page.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 08:40:47 -0800] rev 1726
prefix hook env var names with HG_.
old names are still provided, but doc says they deprecated.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Feb 2006 22:37:28 +0100] rev 1725
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Feb 2006 22:21:20 +0100] rev 1724
add a -b/--branch option to 'hg parents'
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 15 Feb 2006 14:22:16 +0100] rev 1723
Fix diff against an empty file (issue124) and add a test for this.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Feb 2006 04:37:47 +0100] rev 1722
catch errors and throw exception with invalid binary patch data
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 17:13:18 -0800] rev 1721
add pretxncommit hook.
hook allows check of changeset after create, but before transaction
is committed. hook failure rolls transaction back.
makes place for local policies like commit message must contain bug id
or reviewer signoff.
change also adds parent changeset ids to commit hook environment,
because is cheap and useful.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:47:25 -0800] rev 1720
add pretag and tag hooks.
pretag hook lets hook decide how tags can be named. tag hook is
notifier.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:37:27 -0800] rev 1719
hook parameters must be strings.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:28:06 -0800] rev 1718
make hook code nicer.
pre hooks can raise exception if fail.
tidy up better if exception raised (like KeyboardInterrupt) when running
hook program.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:10:45 -0800] rev 1717
hooks run after transactions finish must not affect method results.
Matt Mackall <mpm@selenic.com> [Fri, 17 Feb 2006 17:23:53 -0600] rev 1716
Refactor excessive merge detection, add test
Matt Mackall <mpm@selenic.com> [Mon, 13 Feb 2006 12:48:28 -0600] rev 1715
Revert convert-repo changes
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 11 Feb 2006 00:31:52 -0800] rev 1714
fix hgrc doc hook descriptions.
Daniel Santa Cruz <byteshack@gmail.com> [Fri, 10 Feb 2006 16:45:56 -0500] rev 1713
hooks: distinguish between locally committed and incoming changes.
"commit" hook is now for locally committed changes only.
"incoming" is for changes pulled, pushed, or unbundled into local repo.
mason@suse.com [Thu, 09 Feb 2006 17:18:43 -0600] rev 1712
Allow callers to pass in the dirstate lock in most localrepo.py funcs.
This makes it possible to take the lock once and commit a large number of
patches, without having to read and write the dirstate for each patch.
mason@suse.com [Thu, 09 Feb 2006 17:07:20 -0600] rev 1711
revlog.strip should clear the chunkcache
The chunkcache isn't valid after a strip, it needs to be cleared out.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 09:07:19 +0100] rev 1710
Show "(No help text available)" for commands without doc string.
Currently this only occurs with "hg help qcommit" from mq extension.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:24:34 +0100] rev 1709
Create default commit message in a more pythonic way.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:16:13 +0100] rev 1708
Removed "HG: manifest hash" line from commit message.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:14:05 +0100] rev 1707
Put the empty line in commit text above the branch merge line.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:01:23 +0100] rev 1706
Run commit message editor in the repo root (like hooks).
This makes the hgeditor script work with hg commit -R path/to/repo
Johannes Stezenbach <js@linuxtv.org> [Tue, 07 Feb 2006 23:01:11 -0600] rev 1705
add changenav at bottom of page
if one reads through the changelog and wants to go to the
previous or next page one needs the navigation links at
the bottom, not at the top of the page
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:35:22 -0600] rev 1704
display revision numbers
revision numbers are useful for orientation when browsing
through the changelog
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:34:53 -0600] rev 1703
fix changenav for maxchanges != 10
for maxchanges = 25 the changelog navigation had a minimum
stepsize of 30; try to calculate more useful navigation steps
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:34:39 -0600] rev 1702
add --mbox output to patchbomb
add option to save generated mails in an mbox file for later
processing with formail, instead of sending them directly
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:10 -0600] rev 1701
hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:06 -0600] rev 1700
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:00 -0600] rev 1699
hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:21:02 -0600] rev 1698
Update copyright notice
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:18:38 -0600] rev 1697
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:58:40 +0100] rev 1696
Merge with Peter van Dijk
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 12:56:41 +0100] rev 1695
remove escaping from decriptions on repo index page
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:50:02 +0100] rev 1694
Added raw view for file annotate in hgweb.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 03 Feb 2006 11:54:16 +0100] rev 1693
hgweb/templates: remove unused vars from map-raw
annotateline contains html and it is unused
filenodelink is unused but should be defined
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 03 Feb 2006 11:54:12 +0100] rev 1692
hgweb/templates: no need to escape the '<' '>' and '&' in raw templates
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 11:43:49 +0100] rev 1691
Removed executable bit from patchbomb extension.
lcantey@gmail.com [Fri, 03 Feb 2006 11:29:39 +0100] rev 1690
Update version strings and add release notes to Windows specific files
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 10:54:58 +0100] rev 1689
Fall back to asciidoc6 html backend if html4 doesn't work.
This reenables building documentation on Debian sarge,
which broke after 9346a7fb3fe2.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 10:52:25 +0100] rev 1688
Reverted name change (mercurial -> Mercurial) from dd5085897010.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Feb 2006 00:52:31 -0800] rev 1687
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Feb 2006 00:50:28 -0800] rev 1686
make stuff for macos x binary package.
it is now easy to make prebuilt binary for macos x. i have no hosting
space. i hope someone else can make binaries.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 02 Feb 2006 19:22:27 +0100] rev 1685
extension gpg.py: really raise the exception in case of invalid data
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Feb 2006 08:16:17 +0100] rev 1684
Cleanup of spacing in bash_completion
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Feb 2006 07:50:20 +0100] rev 1683
Use user specified path to hg in bash_completion
e.g. for multiple installs with different versions or extensions.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 20:20:27 +0100] rev 1682
fix an exception in gpg.py with multiples sigs for the same cset
- silly error, do not overwrite the variable we use for iterating
- correct 'hg help sign'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 19:37:26 +0100] rev 1681
fixes for gpg.py extension
- add copyright and license
- add i18n
- add 'sigs' command behaving like 'hg tags'
- change 'role' to 'comment' and output it only if there is one
- refactoring
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 19:18:15 +0100] rev 1680
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Dec 2005 18:04:39 +0100] rev 1679
Merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Dec 2005 18:04:05 +0100] rev 1678
reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5
passing local everywhere violate the layering
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 08 Dec 2005 15:12:02 +0100] rev 1677
cleanup of revlog.group when repository is local
revlog.group cached every chunk from the revlog, the behaviour was
needed to minimize the roundtrip with old-http.
The patch export the information that the repository is local or not
from the repository object down to the revlog.
Then it uses the workaround for old-http only if the repository is non-local.
The memory used server side when pulling goes down to less than 30Mo maximum
whereas without the patch more than 160Mo was used when cloning the linux kernel
repository.
The time used by cloning is roughly the same (although some caching could be
implemented if needed):
before
110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+708707minor)pagefaults 0swaps
after
112.85user 22.98system 2:50.66elapsed 79%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+862862minor)pagefaults 0swaps
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Feb 2006 12:55:01 +0100] rev 1676
Added missing space in output of gpg.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 08:50:45 +0100] rev 1675
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 08:46:24 +0100] rev 1674
abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:14:48 -0800] rev 1673
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:14:23 -0800] rev 1672
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:13:03 -0800] rev 1671
forgot to add import statement for _.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:08:43 -0800] rev 1670
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:06:35 -0800] rev 1669
turn patchbomb script into an extension module.
command name is now 'hg email'.
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sun, 05 Feb 2006 20:52:55 -0500] rev 1668
[hgweb] Added rename information to gitweb templates & misc cleanups
Fixed up file log template's title
Removed double entry for filelogentry in gitweb map file
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 19:34:35 +1300] rev 1667
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 13:01:16 +1300] rev 1666
Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 12:04:36 +1300] rev 1665
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 30 Jan 2006 12:02:12 +1300] rev 1664
Safer version of FileMerge merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 30 Jan 2006 12:02:06 +1300] rev 1663
return a non-zero exit code when a merge failed
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jan 2006 14:36:11 +0100] rev 1662
Added missing quote in warning text to tests, too.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jan 2006 14:33:12 +0100] rev 1661
Added missing quote in warning text.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:30:41 +1300] rev 1660
Fix revlog signature check for empty revlogs
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:27:58 +1300] rev 1659
Add revlog version signature check
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:13:43 +1300] rev 1658
doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 19:06:42 +1300] rev 1657
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 18:38:56 +1300] rev 1656
convert-repo: use commit rather than rawcommit
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:22:03 +1300] rev 1655
convert-repo: automatically create empty map file
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 17:12:31 +1300] rev 1654
deprecate the use of 'hg tag NAME [REV]'
add some tests and some doc
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:10:38 +1300] rev 1653
hgweb: show copy/rename links in file history
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:31:11 +0100] rev 1652
unbreak templates/summary-gitweb.tmpl
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 12:23:52 +1300] rev 1651
Fix comment syntax
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:18:52 +0100] rev 1650
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 11:17:54 +1300] rev 1649
hgweb: fix breakage on manifest subdirs from path cleaning
Petr Mazanec <petr.mazanec@tiscali.cz> [Sun, 29 Jan 2006 10:10:16 +1300] rev 1648
Process working files through encode filters in dodiff()
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Jan 2006 10:10:00 +1300] rev 1647
Use of opendiff as merge program on MacOS X
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 09:10:13 +1300] rev 1646
Clean up paths passed to hgweb
(spotted by Peter van Dijk)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 08:38:31 +1300] rev 1645
add removed files to the changelog file list
- this should allow better detection of removed file
when walking in the history (like hg log)
it doesn't help for the fast path of hg log where
we only look at the filelog
- users of the changelog file list shouldn't assume
anymore that the file still exist (anyway it won't
be found in the manifest like in 5ecf05541e11)
- fix the tests (some hashes changed)
mason@suse.com [Sat, 28 Jan 2006 17:16:15 +1300] rev 1644
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:15:39 +0100] rev 1643
bash_completion: ignore hg help error messages
They are usually not useful when you're completing stuff and end up
cluttering the screen.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:11:14 +0100] rev 1642
bash_completion: always use single quotes with compgen -W
This avoids a bug in bash 2.05a
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:10:35 +0100] rev 1641
bash_completion: be more careful about whitespaces
- use awk to parse the output of hg help.
- print one completion candidate per line
- print the debug commands after regular commands
(this eases the shell side of the parsing)
- don't print aliases that are simple abbreviations
(e.g. up/update, id/identify)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 16:37:31 +0100] rev 1640
Added hint to hg-ssh that you can use shell pattern matching.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 15:07:46 +0100] rev 1639
_hg_status improvements in bash_completion:
- Use "hg status -n" option instead of cut command.
- Sort status flags accoring to "hg status --help"
- Show deleted files instead of "hg remove"d for "hg remove"
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Jan 2006 14:52:26 +0100] rev 1638
bash_completion: small updates and fixes
- $result in _hg_commands is not an array
- use "hg status ."
- update "hg cat" completion
- let bash itself generate the default completion
mason@suse.com [Tue, 24 Jan 2006 15:02:10 +1300] rev 1637
Add new bdiff based unidiff generation.
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 14:49:19 +1300] rev 1636
contrib: add Chris Mason's stand-alone diff tool
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
efiring@manini.soest.hawaii.edu [Tue, 24 Jan 2006 13:59:11 +1300] rev 1635
Fix rcpath for hgwebdir case (sys.argv is empty)
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:59:01 +1300] rev 1634
copy & rename can ignore removed source files
As mercurial now distinguishes deleted files from removed files,
we can skip removed source files while copying or renaming.
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:57:09 +1300] rev 1633
copy/rename '.' or '..' correctly
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:50:40 +1300] rev 1632
Merge with Eric
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:49:20 +1300] rev 1631
Merge with crew
Eric Hopper <hopper@omnifarious.org> [Fri, 20 Jan 2006 09:35:43 -0800] rev 1630
This fixes a bug that Chris Mason found. As for a test case, I can't
think of one. It's a very weird case. Basically, if there is a file
listed as changed in the changelog entry, but not showing up in any
of the associated manifest entries, hg would abort when trying to
create a changeset. Now it just decides the file must not have any
versions relevant to the changeset.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Jan 2006 18:54:25 +0100] rev 1629
Copy manifest map before modifying it (see issue86)
Matt Mackall <mpm@selenic.com> [Mon, 23 Jan 2006 16:36:44 +1300] rev 1628
[hgweb] Prevent search engine bots from indexing the entire repository
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 17:07:48 +0100] rev 1627
fix for hgweb.filterfiles
some variable weren't converted, fix a possible out of range error
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 16:55:05 +0100] rev 1626
make the order of the arguments for filterfiles consistent
fix a bug where the order was reversed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 17 Jan 2006 16:10:22 +0100] rev 1625
correct the relative path when walking from a subdir
- yield the correct relative path when walking from a subdir
(regardless the walk is repo-wide or not)
- have a consistent output from all commands: filename are
absolute when no patterns are specified and relative otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 16:00:55 +0100] rev 1624
Added test for relative paths and all status flags for 'hg status'
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 15:03:47 +0100] rev 1623
Added test for the currently broken addremove with the expected output.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Jan 2006 15:51:09 +0100] rev 1622
fix locate broken since 63799b01985c
- fix the keyword arguments for walk in commands.locate
- implement 'hg locate -r <rev>'
- add a test for 'hg locate'
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:55:19 +0100] rev 1621
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:02:38 +0100] rev 1620
Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:58:36 +0100] rev 1619
Distinguish removed and deleted files. Tests are not fixed yet.
hg status will now show "R filename" for "hg rm"ed files and
"! filename" for files which were deleted manually.
Manually deleted files are considered unmodified.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:35:09 +0100] rev 1618
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 12:22:28 +0100] rev 1617
Make localrepo.changes() internally distinguish between removed and deleted.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 11:32:07 +0100] rev 1616
Cleaned up localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 07:57:58 +0100] rev 1615
Cleanup of indentation, spacing, newlines, strings and line length
Vincent Danjean <Vincent.Danjean@ens-lyon.org> [Thu, 12 Jan 2006 06:29:06 +0100] rev 1614
hgk.py is not a script (no '#!' line needed)
Guy Brand <gb@isis.u-strasbg.fr> [Tue, 10 Jan 2006 13:12:13 +0100] rev 1613
Added archives links to gitweb template
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Jan 2006 16:34:20 +0100] rev 1612
Adjusted test output to match new hgignore error messages.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:52:56 -0800] rev 1611
make invalid pattern message not confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:48:16 -0800] rev 1610
if hgignore contains errors, print message that is not confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:25:33 -0800] rev 1609
eliminate backtrace when piping output on windows.
this fixes issue 54.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 14:31:25 -0800] rev 1608
document revert command more accurately.
this fixes issue 87.
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 29 Dec 2005 14:59:19 -0600] rev 1607
add '_' to several strings
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 29 Dec 2005 14:51:29 -0600] rev 1606
- duplicate the parent link logic to show child links
- don't show trivial parent or children links
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:22:26 -0800] rev 1605
merge with mainline
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:13:52 -0800] rev 1604
add --plain option to patchbomb.
this omits the hg patch headers. it makes a patchbomb email look like
a regular email with a patch.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:11:46 -0800] rev 1603
make patchbomb work with recent changes to export
Muli Ben-Yehuda <mulix@mulix.org> [Wed, 28 Dec 2005 00:27:05 -0600] rev 1602
strictly adher to 80 chars per line
Matt Mackall <mpm@selenic.com> [Tue, 27 Dec 2005 16:18:00 -0600] rev 1601
Error handling for unbundle, fix option line wrapping
Muli Ben-Yehuda <mulix@mulix.org> [Tue, 27 Dec 2005 16:16:06 -0600] rev 1600
add --update support to 'hg unbundle'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 13:12:53 -0600] rev 1599
remove the gpg stuff from hgeditor (superseded by the signing extension)
remove the gpg stuff from hgeditor, update the comments to make it clear
it can be used to show a diff while commiting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 13:09:49 -0600] rev 1598
cleanup of revlog.group when repository is local
revlog.group cached every chunk from the revlog, the behaviour was
needed to minimize the roundtrip with old-http.
We now cache the revlog data ~4MB at a time.
The memory used server side when pulling goes down to 35Mo maximum
whereas without the patch more than 160Mo was used when cloning the linux kernel
repository.
The time used by cloning is higher mainly because of the check in revlog.revision.
before
110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+708707minor)pagefaults 0swaps
after
117.56user 18.86system 2:50.43elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+748366minor)pagefaults 0swaps
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 12:52:25 -0600] rev 1597
remove a duplicate check in commit / fix a bug when merging files
followed by revert
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 27 Dec 2005 12:52:10 -0600] rev 1596
fix 'hg tag <tagname> <revision>
- fix a collision with the option keyword rev and the option
name
- update the tests
Matt Mackall <mpm@selenic.com> [Thu, 22 Dec 2005 13:18:44 -0600] rev 1595
Re-enable the renamed check fastpath
Matt Mackall <mpm@selenic.com> [Fri, 16 Dec 2005 11:13:08 -0600] rev 1594
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Dec 2005 17:50:10 +0100] rev 1593
if a filename contains spaces, patch adds quote around it
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 11:12:08 -0600] rev 1592
gpg signing extension for hg
the principle is almost the same as how tags work:
.hgsigs stores signatures, localsigs stores local signatures
the format of the signatures is:
nodeid sigversion base64_detached_sig
sigversion 0 signs simply the nodeid (maybe we would like
to sign other things in the future).
you can associate fingerprints with roles in hgrc like:
[gpg]
fingerprint_of_a_key_without_spaces = release
fingerprint_of_a_key_without_spaces = contributor, testing
the key used for signing can be specified on the command line or
via hgrc (key =)
thanks to Eric Hopper for testing and bugfixing
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 01:32:44 -0600] rev 1591
do not copy atime and mtime in util.copyfiles
it is unsupported on some fs (vfat) and we don't need to copy
it one clone anyway
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 01:32:28 -0600] rev 1590
reloads manifest and changelog after recovering
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Dec 2005 00:12:00 -0600] rev 1589
fix a bug in hg export --switch-parent
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Dec 2005 16:19:23 +0100] rev 1588
Better error message (without /.hg appended) when repository is not found.
This makes the error for missing default or default-push more readable.
Daniel Kobras <kobras@debian.org> [Thu, 15 Dec 2005 15:40:14 +0100] rev 1587
Less annoying directory completion (see http://bugs.debian.org/343458)
The current bash completion script is quite painful in conjuntion with
deep directory trees because it adds a space after each successful
directory completion. Eg. "hg clone /ho<tab>" is completed to "hg clone
/home " when what you really want is "hg clone /home/" (assuming the
complete path to the repository looks like /home/foo/hg...).
That's because the 'complete' command does not know about the type of
completion it receives from the _hg shell function. When only a single
completion is returned, it assumes completion is complete and tells
readline to add a trailing space. This behaviour is usually wanted, but
not in the case of directory completion.
I've attached a patch that circumvents this problem by only returning
successful completions for directories that contain a .hg subdirectory.
If no repositories are found, no completions are returned either, and
bash falls back to ordinary (filename) completion. I find this behaviour
a lot less annoying than the current one.
Alternative: Use option nospace for the 'complete' command and let _hg
itself take care of adding a trailing space where appropriate. That's a
far more intrusive change, though.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Dec 2005 15:39:20 +0100] rev 1586
Merge with upstream.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 12 Dec 2005 07:50:43 -0800] rev 1585
delete unintended print statement
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 11 Dec 2005 15:38:42 -0800] rev 1584
merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 04 Nov 2005 11:51:01 -0800] rev 1583
make mercurial look in more places for config files.
now it searches <install dir>/etc/mercurial, /etc/mercurial, and user
hgrc.
this allows site-wide configuration to be shared over automounted nfs
partition, instead of chenging on every system. option of having local
configuration on every system remains.
old code for searching /etc/mercurial/hgrc.d never worked, this code
is tested and works.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Dec 2005 14:10:38 +0100] rev 1582
fix the cat command
- improve localrepo.walk when passed a node
- make the differents walk commands in commands.py accept a node
- change commands.cat to walk over a revision
- add a test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 22:19:03 -0600] rev 1581
abort when merging two heads and repository has local changes
Matt Mackall <mpm@selenic.com> [Wed, 14 Dec 2005 22:12:18 -0600] rev 1580
Merge http://sh0n.net/jeffpc/repos/hg-gitweb/
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 12 Dec 2005 02:05:08 -0500] rev 1579
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 12 Dec 2005 01:25:24 -0500] rev 1578
[hgweb] Remove reference to a non-existing file
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 10 Dec 2005 00:26:32 -0500] rev 1577
[hgweb] Fixed up bad link
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 10 Dec 2005 00:09:13 -0500] rev 1576
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 07:07:40 -0500] rev 1575
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Namespace polution prevention (manifest vs. tagmanifest - shouldn't be a problem yet)
File annotate updated
File revision now has commit info
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 05:01:28 -0500] rev 1574
[hgweb] More gitweb style related fixes
Fixed manifest link on tags page
Fixed changeset link on manifest page
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 04:49:37 -0500] rev 1573
File revision style fixed
Josef "Jeff" Sipek <jeffpc@optonline.net> [Mon, 05 Dec 2005 04:30:47 -0500] rev 1572
[hgweb] Initial import of the "gitweb" style
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 21:01:57 -0600] rev 1571
add a --switch-parent option to export against the other parent
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 20:53:45 -0600] rev 1570
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Dec 2005 20:38:11 -0600] rev 1569
quote the filename when calling HGEDITOR
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 01 Dec 2005 10:51:45 -0600] rev 1568
make all commands be repo-wide by default
- refactor code in commands.py so that:
if no pattern is given, the command will be repo-wide
else it will work on the working dir
- update the doc
- fix the tests
TK Soh <teekaysoh@yahoo.com> [Thu, 01 Dec 2005 10:51:33 -0600] rev 1567
make command defaults works for aliases
Arun Sharma <arun@sharma-home.net> [Thu, 01 Dec 2005 10:48:42 -0600] rev 1566
Handle hg under /
Robin Farine <robin.farine@terminus.org> [Thu, 01 Dec 2005 10:48:35 -0600] rev 1565
fix rename --after
Benoit Boissinot <bboissin@gmail.com> [Thu, 01 Dec 2005 10:48:29 -0600] rev 1564
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
Robin Farine <robin.farine@terminus.org> [Thu, 01 Dec 2005 10:48:22 -0600] rev 1563
export patkind() from util
Christian Boos <cboos@neuf.fr> [Thu, 01 Dec 2005 10:48:18 -0600] rev 1562
Fix walkhelper on windows.
The ''seen'' dictionary stores paths in canonical form,
so the walkhelp must also provide paths in that form,
otherwise the changed files are listed twice.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 29 Nov 2005 22:29:14 +0100] rev 1561
disallow '\n' and '\r' in tag names
add a test for disallowed characters in tag names
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 29 Nov 2005 18:06:23 +0100] rev 1560
Merge with http://hg.omnifarious.org/~hopper/mercurial
Eric Hopper <hopper@omnifarious.org> [Fri, 18 Nov 2005 22:48:47 -0800] rev 1559
Convert all classes to new-style classes by deriving them from object.
Robin Farine <robin.farine@terminus.org> [Sun, 27 Nov 2005 16:37:18 +0100] rev 1558
fix run-tests' PYTHONPATH
Specify the installation directory for python modules so we can
set PYTHONPATH without guessing.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 23 Nov 2005 18:36:44 +0100] rev 1557
Updated help text for 'hg log'.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 23 Nov 2005 08:07:27 +0100] rev 1556
Space/Tab cleanup in bash_completion.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 23 Nov 2005 08:02:35 +0100] rev 1555
bash_completion: use hg --debug help to get the list of debug commands.
Also, try completing with the debug commands only when there's no other
candidates.
Based on an idea by TK Soh.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 17 Nov 2005 19:38:57 +0100] rev 1554
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 17 Nov 2005 19:18:33 +0100] rev 1553
Merge with mercurial/crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 16 Nov 2005 19:19:39 +0100] rev 1552
Added version information to "report bug" message for unknown exceptions.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 16 Nov 2005 12:56:19 +0100] rev 1551
Fixes to "hg heads -r FOO":
Make it actually work (undefined variable 'rev'; allow to pass a rev parameter).
repo.branchlookup() doesn't need a copy of heads because it doesn't modify it.
Use None as default argument to heads() instead of nullid.
Doc string PEPification.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 16 Nov 2005 12:08:25 +0100] rev 1550
add a -r/--rev option to heads to show only heads descendant from rev
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 17 Nov 2005 19:11:13 +0100] rev 1549
Always escape repository name in hgweb, very important in notfound.tmpl.
Will <will@glozer.net> [Wed, 16 Nov 2005 20:53:16 +0100] rev 1548
fix bug in setup.py introduced in r1508.
The 'console' argument is expected to be a list of strings,
but was changed to just a string.
TK Soh <teekaysoh@yahoo.com> [Tue, 15 Nov 2005 20:35:10 +0100] rev 1547
close .hg/hgrc after writing the default values on clone
this fix a bug where Dircleanup did not work because
the file was still open
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 14 Nov 2005 21:47:07 +0100] rev 1546
close file before renaming it (since it doesn't work the other way on windows)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 14 Nov 2005 16:10:59 +0100] rev 1545
fix errors found by pychecker
Michael Gebetsroither <michael.geb@gmx.at> [Mon, 14 Nov 2005 15:10:10 +0100] rev 1544
added st as alias for status in zsh_completition
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 14 Nov 2005 15:09:34 +0100] rev 1543
Merge with Thomas Waldmann
twaldmann@thinkmo.de [Mon, 14 Nov 2005 04:58:28 +0200] rev 1542
made C src formatting more consistent
twaldmann@thinkmo.de [Mon, 14 Nov 2005 03:59:35 +0200] rev 1541
fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX
twaldmann@thinkmo.de [Mon, 14 Nov 2005 02:30:19 +0200] rev 1540
minor optimization: save some string trash
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Nov 2005 16:25:45 +0100] rev 1539
use posix compliant option for head
head -N is not posix compliant, head -n N should be used instead
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 13 Nov 2005 02:08:39 +0100] rev 1538
Merge with upstream