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
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 13 Nov 2005 02:06:02 +0100] rev 1537
Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos
To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8):
command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ...
(probably together with these other useful options:
no-port-forwarding,no-X11-forwarding,no-agent-forwarding)
This allows pull/push over ssh to to the repositories given as arguments.
If all your repositories are subdirectories of a common directory, you can
allow shorter paths with:
command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 10 Nov 2005 16:16:28 +0100] rev 1536
Catch the exception raised with 'hg help <somethingambiguous>'.
Example: 'hg help a'
mason@suse.com [Fri, 11 Nov 2005 18:20:24 -0800] rev 1535
Add revlog.strip to truncate away revisions.
This updates the revlog data structures for index and nodemap in place
so the .d and .i files don't need to be reread after stripping away a revision.
mason@suse.com [Fri, 11 Nov 2005 18:20:22 -0800] rev 1534
Optimize manifest.add
Testing shows that manifest.add is spending a significant percentage of
its time running calcoffsets and doing text = "".join(addlist). This
patch removes the need for both of these by storying the manifest in a
character array, and using a modified bisect search to find lines without
the help of a separate index of line offsets.
manifest.add was also reworked to push delta construction/combination into the
main loop.
Time to apply 2751 patches (without psyco, ext3 noatime,data=writeback):
Stock hg: 4m45s real 3m32s user 55s sys
patched: 2m48s real 1m53s user 43s sys
quilt: 2m30s real 45s user 50s sys
(quilt does much more io...)
mason@suse.com [Fri, 11 Nov 2005 18:20:19 -0800] rev 1533
Reduce string duplication in compression code
This cuts down on string copies and allows buffers (instead of strings)
to be passed into the compression code
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 11 Nov 2005 15:34:17 -0800] rev 1532
reset mtime when two files are equal
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 11 Nov 2005 15:34:13 -0800] rev 1531
add localrepo.wlock for protecting the dirstate
- add localrepo.wlock
- nest it in localrepo.lock
- protect the code that change the dirstate
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 11 Nov 2005 15:34:09 -0800] rev 1530
add a releasefn keyword to lock.lock
releasefn is a function that will be executed when the lock is released
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 11 Nov 2005 15:34:06 -0800] rev 1529
add dirstate.lazyread, write atomically the dirstate
- add a dirstate.lazyread function that read only if it wasn't read before and
update all callers
- use the atomic keyword from util.opener to atomically write the dirstate
mercurial/dirstate.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 11 Nov 2005 15:33:59 -0800] rev 1528
add an atomic argument to util.opener
when atomic is used, the file while be renamed on close
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 11 Nov 2005 15:33:08 -0800] rev 1527
don't print anything about file of unsupported type unless
the file was specified on the command line
TK Soh <teekaysoh@yahoo.com> [Fri, 11 Nov 2005 15:32:28 -0800] rev 1526
fix a bug where command defaults suppress global options
Matt Mackall <mpm@selenic.com> [Wed, 09 Nov 2005 13:42:16 -0800] rev 1525
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Wed, 09 Nov 2005 13:40:08 -0800] rev 1524
hgweb: fix traceback by skipping invalid repo paths
Matt Mackall <mpm@selenic.com> [Wed, 09 Nov 2005 13:39:56 -0800] rev 1523
Fix line wrapping
lupus@debian.org [Wed, 09 Nov 2005 13:39:24 -0800] rev 1522
Added --date option to annotate.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 09 Nov 2005 13:38:46 -0800] rev 1521
copy the mode of the file when breaking hardlinks
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 09 Nov 2005 22:31:18 +0100] rev 1520
Allow ambiguous command shortcut if only an alias for the same command.
Currently the only example for this is 'hg o' or 'hg ou' as a shortcut for
'hg out' and 'hg outgoing'.
Matt Mackall <mpm@selenic.com> [Wed, 09 Nov 2005 12:52:05 -0800] rev 1519
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 07 Nov 2005 19:00:51 +0100] rev 1518
Improved error message for ambiguous command shortcuts.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 07 Nov 2005 18:39:25 +0100] rev 1517
Canonicalize command when using aliases or prefix matching.
This makes the norepo check and the help and version command work when not
using the canonical name.
Matt Mackall <mpm@selenic.com> [Tue, 08 Nov 2005 14:22:03 -0800] rev 1516
Automatically run "verify" whenever we run "recover"
Matt Mackall <mpm@selenic.com> [Tue, 08 Nov 2005 10:36:23 -0800] rev 1515
Fix up test-help, mark test-rename +x
Robin Farine <robin.farine@terminus.org> [Tue, 08 Nov 2005 10:35:13 -0800] rev 1514
avoid to copy more than one file to the same destination file
Robin Farine <robin.farine@terminus.org> [Tue, 08 Nov 2005 10:35:09 -0800] rev 1513
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org> [Tue, 08 Nov 2005 10:35:05 -0800] rev 1512
generalize copy/rename to handle more than one source directory
TK Soh <teekaysoh@yahoo.com> [Tue, 08 Nov 2005 10:35:00 -0800] rev 1511
hgweb: remove redundant rstrip filter
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 08 Nov 2005 10:34:50 -0800] rev 1510
use self.{w,}join when possible
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2005 15:40:24 -0800] rev 1509
Add safety check for addgroup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Nov 2005 11:37:45 -0800] rev 1508
fix a warning when py2exe is not used
Matt Mackall <mpm@selenic.com> [Fri, 04 Nov 2005 10:24:05 -0800] rev 1507
Add explicit 'st' alias for status
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Nov 2005 10:22:03 -0800] rev 1506
if unambigious command name are passed, use them
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Thu, 03 Nov 2005 17:19:59 -0800] rev 1505
Add support for -r option in hg tag
Christian Boos <cboos@neuf.fr> [Thu, 03 Nov 2005 14:24:07 -0800] rev 1504
fix file opening for some commands on Windows
Using file as opener in debug commands won't work on Windows, as the
index and data files needs to be opened in binary mode.
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2005 14:22:19 -0800] rev 1503
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 03 Nov 2005 18:59:36 +0100] rev 1502
Fixed test-static-http with http_proxy variable set again.
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2005 14:19:54 -0800] rev 1501
Merge from Hidetaka Iwai
Hidetaka Iwai <tyuyu@debian.or.jp> [Thu, 03 Nov 2005 11:56:51 +0900] rev 1500
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp> [Thu, 03 Nov 2005 11:54:07 +0900] rev 1499
Fixed wrong encoding of files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 03 Nov 2005 18:45:27 +0100] rev 1498
hgweb: Added archive download buttons to manifest page.
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2005 00:45:54 -0800] rev 1497
Add permissions handling test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 03 Nov 2005 00:43:05 -0800] rev 1496
remove the deprecated --text (t) option to rawcommit and tag
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2005 20:22:29 -0800] rev 1495
Deal with merge abort more gracefully
We save parent info last rather than first.
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2005 20:09:19 -0800] rev 1494
Handle empty logs in repo.checksize
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2005 19:26:23 -0800] rev 1493
verify: add check for mismatch of index and data length
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2005 18:59:40 -0800] rev 1492
Allow interrupting all parts of verify
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Nov 2005 16:13:41 -0800] rev 1491
fix a bug in dirstate.changes when cwd != repo.root
- use lstat instead of stat
- add a testcase (thanks to Johannes Hofmann)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Nov 2005 16:13:34 -0800] rev 1490
minor doc fix
"Hidetaka Iwai <tyuyu@debian.or.jp>" [Wed, 02 Nov 2005 16:13:24 -0800] rev 1489
Added Japanese translations of manpages.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Nov 2005 16:08:48 -0800] rev 1488
only files in normal state should be marked as deleted
fix a traceback when you removed an added file
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Nov 2005 15:46:31 -0800] rev 1487
fix handling of files of unsupported type in the walk code
if a file was of unsupported type, it was considered as 'seen' while
walking. this way it was possible to have file in the dirstate not
yielded by the walk function.
Steve Borho <steve@borho.org> [Wed, 02 Nov 2005 15:45:41 -0800] rev 1486
zsh: allow 'hg clone' to complete paths listed in ~/.hgrc
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 31 Oct 2005 10:47:27 -0800] rev 1485
mention running multiple hooks in the doc
Steve Borho <steve@borho.org> [Mon, 31 Oct 2005 09:58:05 -0800] rev 1484
zsh completion improvements.
File completers now correctly deal with filenames that contain spaces.
The completers also use 'hg status .' so they'll work correctly when the
default behaviour changes.
Soh Tk-r28629 <tksoh@freescale.com> [Mon, 31 Oct 2005 09:57:54 -0800] rev 1483
Fix traceback on bad system hgrc files
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 31 Oct 2005 10:56:42 -0700] rev 1482
fix handling of daylight saving time
Matt Mackall <mpm@selenic.com> [Sat, 29 Oct 2005 13:45:01 -0700] rev 1481
Change test-hook to test multiple hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 29 Oct 2005 13:44:05 -0700] rev 1480
allow multiples hook
suggested by Vadim Gelfer
This patch allows to have multiple hooks of the same kind:
for example
commit.email = /my/email/hook
commit.autobuild = /my/build/hook
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Oct 2005 17:18:50 -0700] rev 1479
fix a bug where hg could remove file ending with .tmp
util.opener used a fixed filename for writing tempfile
instead of using the tempfile module.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Oct 2005 11:03:18 -0700] rev 1478
add a test for hgignore
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Oct 2005 11:01:25 -0700] rev 1477
util.opener already create the base directory if it doesn't exist
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Oct 2005 10:57:40 -0700] rev 1476
fix dirstate.change: it should walk ignored files
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2005 13:49:15 -0700] rev 1475
Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2005 13:48:00 -0700] rev 1474
Add missing test output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Oct 2005 13:40:56 -0700] rev 1473
make readconfig take a filename instead of a file pointer as argument
catch parse error while reading a config file
add a testcase for parse error
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Oct 2005 13:31:12 -0700] rev 1472
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 27 Oct 2005 13:29:35 -0700] rev 1471
rewrote changes function in dirstate to use generic walk code
now, file with unsupported type will not show up in status anymore
TK Soh <teekaysoh@yahoo.com> [Thu, 27 Oct 2005 13:29:28 -0700] rev 1470
minor fix on command help docstrings
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2005 12:26:16 -0700] rev 1469
Merge bundle -r work from Eric Hopper
Eric Hopper <hopper@omnifarious.org> [Sun, 16 Oct 2005 16:24:40 -0700] rev 1468
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org> [Wed, 12 Oct 2005 11:32:51 -0700] rev 1467
Stupid spelling mistake in a variable name.
Eric Hopper <hopper@omnifarious.org> [Tue, 11 Oct 2005 18:56:47 -0700] rev 1466
Added a lot of comments to changegroupsubset.
Eric Hopper <hopper@omnifarious.org> [Tue, 11 Oct 2005 08:39:21 -0700] rev 1465
Implementing pull -r and changing clone -r. Both now support
multiple 'target' revisions.
Eric Hopper <hopper@omnifarious.org> [Tue, 11 Oct 2005 08:06:52 -0700] rev 1464
Fixed silly bug involving a non-existent variable.
Eric Hopper <hopper@omnifarious.org> [Mon, 10 Oct 2005 17:20:38 -0700] rev 1463
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org> [Mon, 10 Oct 2005 08:36:29 -0700] rev 1462
Optimizing manifest reads in changegroupsubset by using deltas.
Eric Hopper <hopper@omnifarious.org> [Fri, 07 Oct 2005 19:51:09 -0700] rev 1461
Implementing clone -r, which clones all changesets needed to reach a
particular revision.
Eric Hopper <hopper@omnifarious.org> [Fri, 07 Oct 2005 19:49:25 -0700] rev 1460
Bug fixing in localrepository.changegroupsubset. Bugs found in testing.
Eric Hopper <hopper@omnifarious.org> [Fri, 07 Oct 2005 17:07:57 -0700] rev 1459
Fix small bug in nodesbetween if heads is [nullid].
Eric Hopper <hopper@omnifarious.org> [Fri, 07 Oct 2005 10:57:11 -0700] rev 1458
This changes the revlog.group and re-implements the localrepo.changeroup
function in terms of it.
revlog.group now takes a list of nodes, and some callback functions
instead of a linkmap.
Eric Hopper <hopper@omnifarious.org> [Fri, 07 Oct 2005 10:48:27 -0700] rev 1457
This implements the nodesbetween method, and it removes the newer method
and replaces it with calls to nodesbetween.
nodesbetween calculates all the changesets needed to have a complete
revision graph between a given set of base nodes and a given set of
head nodes.
Matt Mackall <mpm@selenic.com> [Wed, 26 Oct 2005 16:32:50 -0700] rev 1456
Remove copy/rename --parents option
This is no longer needed now that we have more standard UNIX-like copy
semantics.
Robin Farine <robin.farine@terminus.org> [Wed, 26 Oct 2005 16:24:10 -0700] rev 1455
[PATCH] copy/rename a directory
This patch adds support for 'hg copy dir1 dir2' or 'hg rename dir1 dir2'.
When "dir2" exists, "dir1" is recursively copied (or moved) to "dir2/dir1".
When "dir2" does not exists, "dir1" is copied to (renamed as) "dir2".
Benoit Boissinot <mercurial-bugs@selenic.com> [Wed, 26 Oct 2005 16:10:56 -0700] rev 1454
further fix traceback on invalid .hgignore patterns
Please apply this little fix (matchfn return None if no patterns are
specified).
TK Soh <teekaysoh@yahoo.com> [Wed, 26 Oct 2005 16:10:36 -0700] rev 1453
get command defaults from hgrc
Matt Mackall <mpm@selenic.com> [Tue, 25 Oct 2005 22:17:31 -0700] rev 1452
Remove now unused sortdiff and diff from mdiff
Matt Mackall <mpm@selenic.com> [Tue, 25 Oct 2005 22:15:44 -0700] rev 1451
Remove old manifest diff code, it's now buggy
Matt Mackall <mpm@selenic.com> [Tue, 25 Oct 2005 16:31:38 -0700] rev 1450
Add Benoit to CONTRIBUTORS
Matt Mackall <mpm@selenic.com> [Tue, 25 Oct 2005 15:54:44 -0700] rev 1449
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com> [Tue, 25 Oct 2005 15:52:27 -0700] rev 1448
Allow reverting a deleted file with two parents
As elsewhere, we choose the first parent by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Oct 2005 15:51:28 -0700] rev 1447
revert added and removed files to their normal state before reverting
add a test for revert
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Oct 2005 14:58:11 -0700] rev 1446
abort on invalid pattern in matcher
TK Soh <teekaysoh@yahoo.com> [Tue, 25 Oct 2005 14:57:14 -0700] rev 1445
hgweb: add strip and rstrip filters to handle summary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Oct 2005 14:55:39 -0700] rev 1444
fix for cloning empty repo (.hg is still empty)
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2005 20:42:20 -0700] rev 1443
Remove deprecated commit -t option
Steve Borho <steve@borho.org> [Mon, 24 Oct 2005 19:55:44 -0700] rev 1442
zsh completion: Added '--newest-first' to incoming, outgoing
TK Soh <teekaysoh@yahoo.com> [Mon, 24 Oct 2005 17:54:06 -0700] rev 1441
hgweb: a couple of fixes on search page
- show search string in the bottom search box
- wrap search boxes within paragraphs, this also puts
some space between last changeset and bottom
search box in firefox.
tonfa@arakou.lan [Mon, 24 Oct 2005 17:41:45 -0700] rev 1440
Fix relative pull in a subdir
Michal Kvasnica <kvasnica@gmail.com> [Mon, 24 Oct 2005 16:59:31 -0700] rev 1439
allow 'hg out' / 'hg in' to show newest commit first
Steve Borho <steve@borho.org> [Mon, 24 Oct 2005 16:54:07 -0700] rev 1438
zsh completions: new -M, -m arguments for log, etc.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 24 Oct 2005 15:52:28 -0700] rev 1437
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 24 Oct 2005 15:37:45 -0700] rev 1436
add --only-merges (-m) log
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 24 Oct 2005 15:37:20 -0700] rev 1435
add --no-merges (-M) for log, outgoing, incoming
levon@movementarian.org [Mon, 24 Oct 2005 14:55:53 -0700] rev 1434
Fix use of diff(1) triggered by set -e.
Search harder for a decent diff/patch to use.
TK Soh <teekaysoh@yahoo.com> [Mon, 24 Oct 2005 14:55:46 -0700] rev 1433
hgweb: fix broken filelog->changelog link
TK Soh <teekaysoh@yahoo.com> [Mon, 24 Oct 2005 14:55:34 -0700] rev 1432
hgweb: fix broken search->changelog link
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2005 14:55:20 -0700] rev 1431
Calling flush is unnecessary with bz2 decompressors and may not even exist.
TK Soh <teekaysoh@yahoo.com> [Mon, 24 Oct 2005 14:54:54 -0700] rev 1430
hgk: add horizontal scrollbar to patch window
Eric Bloodworth <ergosys@gmail.com> [Mon, 24 Oct 2005 14:54:48 -0700] rev 1429
Add control-w key binding to quit hgk.
Eric Bloodworth <ergosys@gmail.com> [Mon, 24 Oct 2005 14:54:34 -0700] rev 1428
Change asciidoc backend to more recent name.
The latest asciidoc doesn't have an 'html' backend. 'html' was last valid
with version 6 ( 2005-1-28). Current options are xhtml11, or
html4, with xhtml11 by default.
michael.w.dales@intel.com [Mon, 24 Oct 2005 14:54:17 -0700] rev 1427
Fixed problem with invoking hgmerge on paths with spaces.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 24 Oct 2005 14:53:36 -0700] rev 1426
add a target for running only one test
TK Soh <teekaysoh@yahoo.com> [Mon, 24 Oct 2005 14:53:25 -0700] rev 1425
hgweb: improve look-n-feel of changelog nagivation
Benoit Boissinot <mercurial-bugs@selenic.com> [Mon, 24 Oct 2005 14:53:12 -0700] rev 1424
[issue21] cannot debug extension
The following patch should work.
levon@movementarian.org [Mon, 24 Oct 2005 14:52:49 -0700] rev 1423
Use $(MAKE) not make
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Mon, 24 Oct 2005 14:52:41 -0700] rev 1422
py2exe is not able to handle win32com.shell
Changes:
- setup.py: help py2exe finding the shell module in win32com.shell
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Mon, 24 Oct 2005 14:52:30 -0700] rev 1421
Option -i broken in py2exe_for_demandload
Using the includes option -i on modified py2exe is
not working.
Change:
- setup.py: convert self.includes to a list.
olivier.maquelin@intel.com [Mon, 24 Oct 2005 14:34:48 -0700] rev 1420
Avoid insertion/deletion of CRs on stdio during hg serve
Matt Mackall <mpm@selenic.com> [Fri, 21 Oct 2005 00:15:55 -0700] rev 1419
hgweb: fix broken tags->changelog link
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Oct 2005 11:41:14 -0700] rev 1418
Make hgweb work when the repository is empty (no 00changelog.i)
Matt Mackall <mpm@selenic.com> [Thu, 20 Oct 2005 00:26:24 -0700] rev 1417
hgweb: add a mercurial link to the footer
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 19 Oct 2005 20:54:46 -0700] rev 1416
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 19 Oct 2005 00:10:52 -0700] rev 1415
refactor some unlink/remove code and make sure we prune empty dir
Steve Borho <steve@borho.org> [Wed, 19 Oct 2005 00:05:08 -0700] rev 1414
New vim script; provides key mappings and menus for GVIM
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 19 Oct 2005 00:02:41 -0700] rev 1413
Do not use 'glob' expansion by default on OS != 'nt'
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:58:00 -0700] rev 1412
hgweb: fix too short manifest link
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:50:55 -0700] rev 1411
hgweb: make viewing of non-text work in hgweb
We use mimetypes.guess_type to guess file types and util.binary to determine
whether a file is displayable as text.
This lets us display displayable text files in our normal source view.
Files that appear to be binary will be displayed as something like
"(binary:image/gif)".
Clicking on raw view will send the raw file with an appropriate MIME
type. Thus things like GIFs will now be viewable inside hgweb without
making a mess. Further, things like postscript files that are text
should show source in the normal view and a browser can launch a
postscript viewer for the raw view.
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:08:35 -0700] rev 1410
hgweb: shorten all the URLs in the standard templates
A URL like this:
http://www.selenic.com/hg/?cmd=changeset;node=5010207c35273ac1331cae44c253dd41fa07cb7f
is now presented as:
http://www.selenic.com/hg/?cs=5010207c352
(though the old style still works, of course)
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 23:05:30 -0700] rev 1409
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matthew Elder <sseses@gmail.com> [Tue, 18 Oct 2005 21:32:51 -0700] rev 1408
symlink unit test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 21:11:24 -0700] rev 1407
allow empty values for url so we can have /?tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 20:06:34 -0700] rev 1406
hgweb: allow urls to be shorter by using shortcuts
for example cs=xxx will be expanded to cmd=changeset;node=xxx
TK Soh <teekaysoh@yahoo.com> [Tue, 18 Oct 2005 20:06:13 -0700] rev 1405
log: speedup keyword search when used with --branch
By avoiding unnecessary branch lookup.
TK Soh <teekaysoh@yahoo.com> [Tue, 18 Oct 2005 20:06:05 -0700] rev 1404
log: make keyword search truly case-insensitive
Eric Hopper <hopper@omnifarious.org> [Tue, 18 Oct 2005 20:05:54 -0700] rev 1403
lazyindex fix, make load handle negative indexes properly.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 18:38:39 -0700] rev 1402
i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org [Tue, 18 Oct 2005 18:38:04 -0700] rev 1401
use a dummy function for gettext
import gettext is really slow, until we figure out a solution
we use identity for gettext
Benoit Boissinot <benoit.boissinot@ens-lyon.org [Tue, 18 Oct 2005 18:37:48 -0700] rev 1400
i18n first part: make '_' available for files who need it
Zbynek Winkler <zwin@users.sourceforge.net> [Tue, 18 Oct 2005 17:57:27 -0700] rev 1399
Try to use ini-file in the same directory as the exe as the default on NT.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 18 Oct 2005 17:56:50 -0700] rev 1398
make update quieter when nothing is wrong
sometimes when i am going around in my history, i get long lists of
errors from the update command. this patch will fix that. i tried to
make the code style the same like the rest of the code.
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 12:11:23 -0700] rev 1397
bdiff: change spurious __inline to inline
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 18 Oct 2005 00:45:27 -0700] rev 1396
check if a file is ignored before complaining if it is an unsupported type
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 00:43:33 -0700] rev 1395
Add debugsetparents command
Matt Mackall <mpm@selenic.com> [Tue, 18 Oct 2005 00:43:19 -0700] rev 1394
dirstate: make sure we read the dirstate before setting parents
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2005 15:49:05 -0700] rev 1393
Fix traceback on bad revlog.lookup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 15 Oct 2005 15:43:40 -0700] rev 1392
add a check for filetype when walking
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2005 15:04:45 -0700] rev 1391
Fix patch failure reporting exception
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2005 15:04:22 -0700] rev 1390
Borrow patch header detection heuristic from quilt
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 19:27:35 -0700] rev 1389
convert-repo: fix up octopus merge conversion
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 19:26:41 -0700] rev 1388
convert-repo: change duplicate elimination
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 19:25:45 -0700] rev 1387
convert-repo: linearize the tag commit
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 17:11:06 -0700] rev 1386
convert-repo: retrieve the commit hash from the tag object for tag import
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 17:09:51 -0700] rev 1385
convert-repo: Fix timezone handling
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 10:59:42 -0700] rev 1384
hg verify: add some bin to hex conversions
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 10:51:02 -0700] rev 1383
hg verify: add an error reporting helper function
Matt Mackall <mpm@selenic.com> [Wed, 05 Oct 2005 10:37:51 -0700] rev 1382
hg verify: more consistency checking between changesets and manifests
TK Soh <teekaysoh@yahoo.com> [Tue, 04 Oct 2005 17:34:02 -0700] rev 1381
log --debug: fix misplaced manifest field
Index: hg/mercurial/commands.py
===================================================================
--- hg.orig/mercurial/commands.py 2005-10-04 16:44:26.000000000 -0700
+++ hg/mercurial/commands.py 2005-10-04 17:16:42.000000000 -0700
@@ -1238,6 +1238,9 @@ def log(ui, repo, *pats, **opts):
self.write(*args)
def write(self, *args):
self.hunk[self.rev].append(args)
+ def debug(self, *args):
+ if self.debugflag:
+ self.write(*args)
def __getattr__(self, key):
return getattr(self.ui, key)
cwd = repo.getcwd()
Eric Hopper <hopper@omnifarious.org> [Tue, 04 Oct 2005 12:24:59 -0700] rev 1380
Fix an hg copy/move bug. Failed if file being copied or moved not in tip.
Matt Mackall <mpm@selenic.com> [Tue, 04 Oct 2005 11:25:48 -0700] rev 1379
Clean up mdiff imports
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 04 Oct 2005 11:21:48 -0700] rev 1378
make diff dates be epoch for add/remove
Eric Hopper <hopper@omnifarious.org> [Mon, 03 Oct 2005 16:07:54 -0700] rev 1377
Fixed a bug in my changes to httprepo.py
Eric Hopper <hopper@omnifarious.org> [Mon, 03 Oct 2005 15:06:46 -0700] rev 1376
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 03 Oct 2005 14:45:14 -0700] rev 1375
Fix traceback when nothing was added during unbundle
The changegroup and commit hook are now run only when
something is modified.
The correct number of changesets added is printed.
Eric Hopper <hopper@omnifarious.org> [Mon, 03 Oct 2005 14:43:11 -0700] rev 1374
Fix hg unbundle chunking performance bug
Matt Mackall <mpm@selenic.com> [Mon, 03 Oct 2005 13:45:59 -0700] rev 1373
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com> [Mon, 03 Oct 2005 12:52:45 -0700] rev 1372
Merge with TAH
Robin Farine <robin.farine@terminus.org> [Wed, 28 Sep 2005 19:42:03 +0200] rev 1371
emacs minor mode optional argument
With GNU Emacs 21.4.1 and desktop save/restore enabled, loading
"mercurial.el" from ".emacs" breaks Emacs' initialization sequence
when the desktop restore code loads a file under Mercurial control.
The function 'desktop-create-buffer' passes an argument to each
minor mode it activates for the buffer.
Matt Mackall <mpm@selenic.com> [Sat, 01 Oct 2005 13:11:48 -0700] rev 1370
hgweb: remove various manifest and file hashes from display
Matt Mackall <mpm@selenic.com> [Sat, 01 Oct 2005 12:50:56 -0700] rev 1369
Allows abbreviated hashes in hgweb
Steve Borho <steve@borho.org> [Sat, 01 Oct 2005 00:02:01 -0700] rev 1368
Fix completion function for 'hg pull'. Fix truncation bug and remove tabs.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Sep 2005 11:08:13 -0700] rev 1367
bisect extension for mercurial
it works almost the same as git-bisect:
hg bisect init # start bisecting
hg bisect bad # mark current revision as broken
hg bisect good [<rev>] # mark <rev> as working
... the bisect code finds a new revision to try
... see if it works
hg bisect good # if it worked
hg bisect bad # it doesn't work
continue until there is only one revision left
Eric Hopper <hopper@omnifarious.org> [Fri, 30 Sep 2005 11:06:19 -0700] rev 1366
Fixed an exception that was caught and improperly forgotten.
Mikael Berthe <mikael@lilotux.net> [Fri, 30 Sep 2005 11:06:13 -0700] rev 1365
Suppress warning in zsh_completion script
Matt Mackall <mpm@selenic.com> [Thu, 29 Sep 2005 15:18:32 -0700] rev 1364
Fix data reported for the nullid changeset
Matt Mackall <mpm@selenic.com> [Thu, 29 Sep 2005 13:20:03 -0700] rev 1363
Merge with self
Steve Borho <steve@borho.org> [Thu, 29 Sep 2005 13:18:39 -0700] rev 1362
zsh completion function for hg
TK Soh <teekaysoh@yahoo.com> [Thu, 29 Sep 2005 13:18:32 -0700] rev 1361
contrib/hgk: remove hardcoded path to Wish
Matt Mackall <mpm@selenic.com> [Thu, 29 Sep 2005 12:49:01 -0700] rev 1360
Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 18:30:54 -0700] rev 1359
Set the user agent for httprepo communication
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 15:23:34 -0700] rev 1358
Partially revert ssh change so we read all of remote ssh stream
zbynek@alex.kolej.mff.cuni.cz [Tue, 27 Sep 2005 15:01:49 -0700] rev 1357
Replacing select.select() with os.fstat() which works also on windows.
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 14:59:30 -0700] rev 1356
Fix +x permissions lost by export/import
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Sep 2005 14:59:02 -0700] rev 1355
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Sep 2005 14:58:48 -0700] rev 1354
Made the abort message for IOError nicer when the filename is known.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Sep 2005 14:58:28 -0700] rev 1353
Fix misleading abort message when permissions are bad.
Matt Mackall <mpm@selenic.com> [Tue, 27 Sep 2005 14:53:11 -0700] rev 1352
Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com> [Mon, 26 Sep 2005 16:52:47 -0700] rev 1351
Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com> [Mon, 26 Sep 2005 14:01:18 -0700] rev 1350
Fix pipe error regression
Matt Mackall <mpm@selenic.com> [Mon, 26 Sep 2005 14:01:05 -0700] rev 1349
More info on file merge for update --debug
mpm@selenic.com [Sat, 24 Sep 2005 11:33:20 -0700] rev 1348
hgwebdir: Fix date display
mpm@selenic.com [Fri, 23 Sep 2005 19:46:43 -0700] rev 1347
Fix up static-http test
mpm@selenic.com [Fri, 23 Sep 2005 19:46:12 -0700] rev 1346
Execute hooks in the repository root
mpm@selenic.com [Fri, 23 Sep 2005 19:41:45 -0700] rev 1345
hgk: Allow specifying hgk path in [hgk]path
mpm@selenic.com [Fri, 23 Sep 2005 19:38:21 -0700] rev 1344
Fix hgk for date handling changes
mpm@selenic.com [Fri, 23 Sep 2005 19:35:23 -0700] rev 1343
Add support for /etc/mercurial/hgrc.d/*.rc
mpm@selenic.com [Fri, 23 Sep 2005 19:04:19 -0700] rev 1342
Warn on failure to import an extension
Vincent Danjean [Fri, 23 Sep 2005 18:59:16 -0700] rev 1341
Fix copyright symbol in docs
--- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700
+++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700
@@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc
COPYING
-------
-Copyright (C) 2005 Matt Mackall.
+Copyright \(C) 2005 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).
Index: hg/doc/hgmerge.1.txt
===================================================================
--- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700
+++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700
@@ -30,6 +30,6 @@ hg(1) - the command line interface to Me
COPYING
-------
-Copyright (C) 2005 Matt Mackall.
+Copyright \(C) 2005 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).
Vincent Danjean [Fri, 23 Sep 2005 18:58:57 -0700] rev 1340
hgk is a wish script
--- mercurial-0.7.orig/contrib/hgk 2005-09-23 11:02:21.000000000 +0200
+++ mercurial-0.7/contrib/hgk 2005-09-23 11:07:57.000000000 +0200
@@ -1,6 +1,4 @@
-#!/bin/sh
-# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "${1+$@}"
+#!/usr/bin/wish
# Copyright (C) 2005 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified
Vincent Danjean [Fri, 23 Sep 2005 18:58:48 -0700] rev 1339
bash_completion is not an executable
Index: hg/contrib/bash_completion
===================================================================
--- hg.orig/contrib/bash_completion 2005-09-22 09:40:47.000000000 -0700
+++ hg/contrib/bash_completion 2005-09-23 18:32:46.000000000 -0700
@@ -1,5 +1,3 @@
-#!/bin/bash
-
shopt -s extglob
_hg_commands()
mpm@selenic.com [Fri, 23 Sep 2005 17:52:15 -0700] rev 1338
Add empty repo test
mpm@selenic.com [Fri, 23 Sep 2005 17:50:03 -0700] rev 1337
Fix up some bugs for log and grep with empty repo
TK Soh <teekaysoh@yahoo.com> [Fri, 23 Sep 2005 17:19:35 -0700] rev 1336
hgweb file: fixed left-justified line numbers on IE v6.0
IE (v6.0) seemed to squash the spaces surrounding the line
numbers, making them appeared as left- instead of being
right-justified.
Testing with IE v6.0 and Firefox 1.0.6.
Florian La Roche <laroche@redhat.com> [Fri, 23 Sep 2005 17:15:36 -0700] rev 1335
git -> hg conversion script
contrib/convert-repo changes:
- do not print verbose output so that error messages are seen more easily
- Output the date as integer and not as floating point number.
- Do not require a ".git" subdirectory to work on, but use the GIT_DIR
environment var to specify the git repository.
Change is otherwise compatible to the current version and I have tested it
by converting the kernel and several git respositories from kernel.org.
(Btw, the udev test dir contains a /sys dir with entries which should not
be normal dirs and not be normal files. ;-)
Thanks again for mercurial,
Florian La Roche
--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -28,26 +28,18 @@
self.path = path
def getheads(self):
- h = file(self.path + "/.git/HEAD").read()[:-1]
- return [h]
+ return [file(self.path + "/HEAD").read()[:-1]]
def catfile(self, rev, type):
if rev == "0" * 40: raise IOError()
- path = os.getcwd()
- os.chdir(self.path)
- fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev))
- os.chdir(path)
+ fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev))
return fh.read()
def getfile(self, name, rev):
return self.catfile(rev, "blob")
def getchanges(self, version):
- path = os.getcwd()
- os.chdir(self.path)
- fh = os.popen("git-diff-tree --root -m -r %s" % (version))
- os.chdir(path)
-
+ fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version))
changes = []
for l in fh:
if "\t" not in l: continue
@@ -83,9 +75,9 @@
def gettags(self):
tags = {}
- for f in os.listdir(self.path + "/.git/refs/tags"):
+ for f in os.listdir(self.path + "/refs/tags"):
try:
- h = file(self.path + "/.git/refs/tags/" + f).read().strip()
+ h = file(self.path + "/refs/tags/" + f).read().strip()
tags[f] = h
except:
pass
@@ -99,8 +91,7 @@
def getheads(self):
h = self.repo.changelog.heads()
- h = [ hg.hex(x) for x in h ]
- return h
+ return [ hg.hex(x) for x in h ]
def putfile(self, f, e, data):
self.repo.wfile(f, "w").write(data)
@@ -155,12 +146,12 @@
newlines.sort()
if newlines != oldlines:
- print "updating tags"
+ #print "updating tags"
f = self.repo.wfile(".hgtags", "w")
f.write("".join(newlines))
f.close()
if not oldlines: self.repo.add([".hgtags"])
- date = "%s 0" % time.mktime(time.gmtime())
+ date = "%s 0" % int(time.mktime(time.gmtime()))
self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
date, self.repo.changelog.tip(), hg.nullid)
@@ -262,7 +253,7 @@
num -= 1
if c in self.map: continue
desc = self.commitcache[c][3].splitlines()[0]
- print num, desc
+ #print num, desc
self.copy(c)
tags = self.source.gettags()
@@ -275,6 +266,8 @@
self.dest.puttags(ctags)
gitpath, hgpath, mapfile = sys.argv[1:]
+if os.path.isdir(gitpath + "/.git"):
+ gitpath += "/.git"
c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile)
c.convert()
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
TK Soh <teekaysoh@yahoo.com> [Fri, 23 Sep 2005 17:15:10 -0700] rev 1334
hgweb: fixed IE display problem on changelog page
IE (v6.0) didn't seemed to comply to the 15% width on the
left column of changelog display.
Tested with IE v6.0 and Firefox 1.0.6.
mpm@selenic.com [Fri, 23 Sep 2005 17:08:45 -0700] rev 1333
hgweb: fix date bug in hgweb diff generation
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:32:19 -0700] rev 1332
Help debugability: print ssh command being used when --verbose.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:31:00 -0700] rev 1331
Write hgrc file in text mode, even on Windows.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:30:41 -0700] rev 1330
Give ssh a better chance of working on Windows.
Switch the type of quotes used for the remote command.
Open the pipe in binary mode.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 10:28:55 -0700] rev 1329
Allow files to be opened in text mode, even on Windows.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 07:41:25 -0700] rev 1328
Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 07:36:30 -0700] rev 1327
Some repos represent a date as a float.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 00:06:49 -0700] rev 1326
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 23 Sep 2005 00:05:16 -0700] rev 1325
Move urllib error handling from revlog into statichttprepo, where it belongs.
mpm@selenic.com [Thu, 22 Sep 2005 23:38:04 -0700] rev 1324
hgweb: pass date tuples around rather than whole changesets for dates
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:33:26 -0700] rev 1323
Fix old-http test when no server exists.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:31:44 -0700] rev 1322
Make revlog constructor more discerning in its treatment of errors.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 23:19:47 -0700] rev 1321
Clean up date and timezone handling.
We used to pass changelog dates around as a "unixtime timezone" string
containing a pair of encoded ints. Now, they get passed around as a
(unixtime, timezone) tuple of numbers, which makes much more sense.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 22:46:50 -0700] rev 1320
Fix up representation of dates in hgweb.
Date display is now uniform both on the command line and via the web
interface.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 21:42:33 -0700] rev 1319
Fix behaviour of commit.
It's now a fatal error if the option to --logfile isn't readable.
Ditto if both --message and --logfile are specified.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 21:29:02 -0700] rev 1318
Unify display of dates.
We now use one function, commands.datestr, to display dates, instead
of calling time.asctime in inconsistent ways.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 22 Sep 2005 21:15:57 -0700] rev 1317
Print commit time/date from perspective of committer.
Previously, it was printed in the time zone of the reader, but with
the committer's time zone offset. It is now consistent.
mpm@selenic.com [Thu, 22 Sep 2005 10:12:42 -0700] rev 1316
Hook fixups
Pass the first new changeset node to the changegroup hook
Call commit for each changeset in a pull changegroup
Improve hook docs
Lee Cantey <lcantey@gmail.com> [Thu, 22 Sep 2005 09:47:27 -0700] rev 1315
Fix setting of hg default when using --pull on clone of local repository.
mpm@selenic.com [Thu, 22 Sep 2005 09:47:03 -0700] rev 1314
Fix default clone destination
The default clone wasn't working:
$ hg clone hg
abort: repository hg/.hg not found!
This was because we were creating the destination directory from the
default, then checking whether it existed to determine whether to
expand the path.
Anupam Kapoor<anupam.kapoor@gmail.com> [Thu, 22 Sep 2005 09:42:15 -0700] rev 1313
Fix traceback during invalid rev identifier for debugdata
mpm@selenic.com [Thu, 22 Sep 2005 09:41:34 -0700] rev 1312
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Wed, 21 Sep 2005 09:02:41 +0200] rev 1311
bash_completion: extended patterns require extglob option
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 21 Sep 2005 08:25:46 +0200] rev 1310
Updated CONTRIBUTORS.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 21 Sep 2005 08:07:38 +0200] rev 1309
Make debugwalk strip trailing spaces and remove these from test-walk.out
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 21 Sep 2005 07:56:19 +0200] rev 1308
Cleanup of tabs and trailing spaces.
mpm@selenic.com [Thu, 22 Sep 2005 09:39:05 -0700] rev 1307
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:50:43 -0700] rev 1306
Add release notes to built Windows package.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:44:50 -0700] rev 1305
Update Windows release notes.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:44:35 -0700] rev 1304
Update hgrc documentation to refer to Windows paths.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:27:00 -0700] rev 1303
Fix path of win32text extension in INI file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:26:50 -0700] rev 1302
Update Inno Setup installer to install INI file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:18:24 -0700] rev 1301
Fix small thinko.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 15:17:24 -0700] rev 1300
Rename mercurial.ext to hgext.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:46:01 -0700] rev 1299
Package the extension directory.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:40:52 -0700] rev 1298
Add INI file for Windows.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:23:25 -0700] rev 1297
Add win32text extension module.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:23:07 -0700] rev 1296
Add placeholder extension module.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 14:22:16 -0700] rev 1295
Make contract with extensions optional.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 13:33:24 -0700] rev 1294
Clean up whitespace damage.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 11:44:08 -0700] rev 1293
Enhance the file filtering capabilities.
We now allow filtering through either pipes or pairs of temporary
files. The latter appear to be mandatory for use on Windows.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 09:56:30 -0700] rev 1292
Use platform-appropriate rc file names.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:47:57 -0700] rev 1291
Document Windows installer build process.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:47:40 -0700] rev 1290
Add Windows installer file.
This uses Inno Setup. If you don't use ISTool to edit the file, you
are either brave, nuts, or both.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:27:52 -0700] rev 1289
Add post-install text file.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:20:20 -0700] rev 1288
Turn the win32 README into a HTML file for now.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 21 Sep 2005 00:02:53 -0700] rev 1287
Add win32 README for standalone installer.
mpm@selenic.com [Thu, 22 Sep 2005 09:22:25 -0700] rev 1286
Make incoming/outgoing show oldest first
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Tue, 20 Sep 2005 21:35:51 -0700] rev 1285
Make 'hg import' platform independent.
- moved popen("patch ...") from commands.py to util.py
- files may not be single quoted in popen under windows: fixed
- patch returns the files quoted under windows. quotes need to
be stripped off: fixed
Bryan O'Sullivan <bos@serpentine.com> [Tue, 20 Sep 2005 21:29:07 -0700] rev 1284
Fix Volker's modifications to setup.py for non-Windows systems.
Volker.Kleinfeld@gmx.de [Tue, 20 Sep 2005 19:25:14 -0700] rev 1283
Support for the distutils extention 'py2exe' added.
Description:
- If the py2exe distutils extention is installed this patch allows
building standalone exe for windows - example:
> python setup.py build --compiler=mingw32 py2exe
- The 'out of the box' py2exe is not able to resolve
the dependencies due to 'demandload'. A new helper module
of scanning the mercurial package has been added.
Changed:
- setup.py: importing py2exe and sub classing its command class
to fetch the build directory and insert the needed includes
- packagescan.py: new helper module added, that scans the distutil
build directory for modules to be included.
mpm@selenic.com [Tue, 20 Sep 2005 11:38:01 -0700] rev 1282
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Tue, 20 Sep 2005 11:20:48 -0700] rev 1281
Add --pull option to clone.
mpm@selenic.com [Tue, 20 Sep 2005 10:45:26 -0700] rev 1280
pull/unbundle: raise an exception on premature EOF