Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 22 Feb 2006 01:06:17 -0500] rev 1790
[hgweb] Added favicon to standard/gitweb templates
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:04:46 +0100] rev 1789
Merge with mercurial/tonfa
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 23:50:53 +0100] rev 1788
change the default timeout to 600 seconds
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 23:21:15 +0100] rev 1787
add a timeout when a lock is held (default 1024 sec)
- change the wait keyword from lock.lock to timeout,
a negative timeout of means "wait forever"
- refactor the two lock functions from localrepo.py
- make them use the timeout (default 1024, can be changed
with ui.timeout in the config file
- update the doc
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 07:51:32 +0100] rev 1786
Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 07:45:14 +0100] rev 1785
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
(submitted by Alexis S. L. Carvalho <alexis@cecm.usp.br>)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Feb 2006 07:26:29 +0100] rev 1784
revalidate revlog data after locking the repo (issue132)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Feb 2006 05:21:09 +0100] rev 1783
merge with matt
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 16:46:38 +0100] rev 1782
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Feb 2006 21:11:57 +0100] rev 1781
add an optional argument to push only the specified revisions (push -r)
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 17:36:27 -0600] rev 1780
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:24:42 -0500] rev 1779
Merge with mpm
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:01:09 -0500] rev 1778
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 21:53:41 -0500] rev 1777
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net> [Tue, 14 Feb 2006 21:55:05 -0500] rev 1776
Merge
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 15:48:49 -0600] rev 1775
Merge with crew
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:22 -0600] rev 1774
hgmerge: add meld support
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:19 -0600] rev 1773
hgmerge: improve "apps not found" message
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:16 -0600] rev 1772
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:12 -0600] rev 1771
hgmerge: add and use ask_if_merged function
This patch, unlike the earlier ones, doesn't use unportable select builtin.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:09 -0600] rev 1770
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 16:04:47 +0100] rev 1769
Merged RSS feed for tags from Peter van Dijk
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 11:23:34 +0100] rev 1768
add rss link to tags page
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 02:21:28 +0100] rev 1767
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl> [Thu, 02 Feb 2006 12:00:45 +0100] rev 1766
tags-rss support; still shows tip
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 15:54:50 +0100] rev 1765
hg log --limit shouldn't count unprinted revisions (found by TK Soh)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 15:37:23 +0100] rev 1764
Cleanup: Put initialization of br in front of --branches option handling.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 13:14:03 +0100] rev 1763
Make option --branch vs. --branches more consistent.
As you can abbreviate --branches to --branch, old scripts using the long
name will still work.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 12:59:16 +0100] rev 1762
Add option -b/--branch to hg tip (as done for hg parents).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 08:11:46 +0100] rev 1761
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 00:45:02 +0100] rev 1760
fix typo in debugrebuildstate
Fabian Otto <sigsegv@alchiba.ni.cs.tu-berlin.de> [Mon, 20 Feb 2006 15:58:04 -0600] rev 1759
Sunpro compiler patch
The compiling runs through without warning, but runnig the newly builded
hg emmits a message:
| ImportError: ld.so.1: python: fatal: relocation error:
| file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so:
| symbol cmp: referenced symbol not found
Removing the inline infront of cmp corrects this error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:09:25 -0800] rev 1758
add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:07:09 -0800] rev 1757
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:06:41 -0800] rev 1756
add -l,--limit to log command.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 20 Feb 2006 19:04:56 +0100] rev 1755
add 'debugrebuildstate' to rebuild the dirstate from a given revision
- added and removed files will be lost while recreating the dirstate
- modifications are not lost
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 20 Feb 2006 01:12:03 +0100] rev 1754
use repo.lock when cloning via copy, use lock.LockException when necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 20 Feb 2006 01:09:40 +0100] rev 1753
Raise a different exception when the lock is not available
When the filesystem is read-only or if we have some other
error, there is no need to wait.
Raise a lock.LockUnavailable exception.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 22:41:49 +0100] rev 1752
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 22:39:09 +0100] rev 1751
localrepo: refactor the locking functions
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 21:44:32 +0100] rev 1750
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 19:43:03 +0100] rev 1749
fix warnings from pychecker (unused variables and shadowing)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 18:59:20 +0100] rev 1748
bisect: fix for recent changes disallowing "false" merges
Robin Farine <robin.farine@terminus.org> [Sat, 18 Feb 2006 07:37:59 -0800] rev 1747
transitive copy/rename
Add support for transitive copy or rename operations, e.g.
hg rename a b
... (possibly edit b)
hg rename b c
hg commit ...
by actually renaming "b" as "c" while recording a copy of
"a" to "c" and a removal of "a".
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Feb 2006 16:31:02 +0100] rev 1746
Fixed misleading indentation in mpatch.c
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 21:56:15 -0800] rev 1745
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 21:55:33 -0800] rev 1744
make server tests use --daemon.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Feb 2006 06:50:22 +0100] rev 1743
Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Feb 2006 05:40:08 +0100] rev 1742
Added help string for --daemon-pipefds
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 16:32:07 -0800] rev 1741
stop read end of pipe from staying open forever in child process.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 16:29:30 -0800] rev 1740
add --daemon option to serve command. for issue 45.
code looks odd because it is portable to windows. windows does not have
os.fork, so have to spawn and use pipe to tell parent ready instead.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Feb 2006 17:41:23 -0600] rev 1739
AmbiguousCommand is raised too soon.
Right now, hg raises AmbiguousCommand as soon as it finds two
commands/aliases that start with the substring it's searching for, even
though it may still find a full match later on.
This is a bit hard to hit on purpose, because hg checks the list of
commands in whatever order is returned by table.keys(), which will
change when you add an alias to a command. You should be able to hit it
by adding an alias "u" to the "identify" command - not that that makes a
lot of sense...
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Feb 2006 17:41:18 -0600] rev 1738
Don't hard-code /tmp in test-ro-message
This makes the test succeed when $TMPDIR is set.
Matt Mackall <mpm@selenic.com> [Fri, 17 Feb 2006 17:39:05 -0600] rev 1737
Merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 08:26:21 -0800] rev 1736
add preoutgoing and outgoing hooks.
preoutgoing lets prevent pull over http or ssh.
outgoing lets notify after pull.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 14:34:59 -0800] rev 1735
i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 09:56:31 -0800] rev 1734
tests for new hooks. fix things i found when writing tests.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 09:09:45 -0800] rev 1733
fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 08:51:24 -0800] rev 1732
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 11:05:43 -0800] rev 1731
add -p option to tip. for issue 64.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 10:49:30 -0800] rev 1730
add prechangegroup and pretxnchangegroup hooks.
prechangegroup lets you stop push, pull or unbundle before it begins.
pretxnchangegroup lets you inspect changegroup before transaction is
committed, and roll back if you not like it.
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
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
eric@localhost.localdomain [Mon, 19 Sep 2005 18:24:37 -0700] rev 1279
Add checks for programs which are required for the test suite to run.
All prerequisite programs are checked for existance, and if any are
missing,
a list of missing programs is printed, and the test suite is aborted.
All programs currently used in the tests, except those in core-utils,
are checked.
mpm@selenic.com [Mon, 19 Sep 2005 15:59:17 -0700] rev 1278
hgit -> hgk.py
Move hgit to hgk.py
- importing hgit as an extension created compiled hgitc, which was confusing
- hgit existed to support hgk so it was slightly misnamed
- removed executable bit as we no longer run it directly
- add 'view' command so we can run hg view
- change git-* commands to debug-* so hg help won't show them
- chdir to repository root on view so hgk doesn't choke in subdirs
Ollivier Robert <roberto@keltia.freenix.fr> [Mon, 19 Sep 2005 22:15:36 +0200] rev 1277
Add a favicon.ico, small version of the main HG image.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 18 Sep 2005 15:03:07 -0700] rev 1276
Fix dirstate.changes for ignored directories.
Do a second walking pass to examine any leftover files in the dirstate
map that are in the .hgignore file but match our search criteria.
This fixes the case of entire directories never being examined due to
their presence in the .hgignore file, and should hopefully not add any
significant overhead.
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:07:02 -0700] rev 1275
Fix cut and paste error in hgweb.py
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:06:36 -0700] rev 1274
Fix man page typos
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:05:54 -0700] rev 1273
Clean up RPM spec file
Florian La Roche <laroche@redhat.com> [Sun, 18 Sep 2005 14:05:04 -0700] rev 1272
Update version number in PKG-INFO
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:37:14 -0700] rev 1271
Fix ignore regression.
An empty or non-existent hgignore file must return False (don't
ignore) for everything.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:27:27 -0700] rev 1270
Switch to new syntax for .hgignore files.
Here is the new syntax, in summary.
Trailing white space is dropped.
The escape character is "\".
Comments start with #.
Empty lines are skipped.
Lines can be of the following formats:
syntax: regexp # defaults following lines to non-rooted regexps
syntax: glob # defaults following lines to non-rooted globs
re:pattern # non-rooted regular expression
glob:pattern # non-rooted glob
pattern # pattern of the current default type
The default pattern type is regexp, which is completely backwards
compatible with the old hgignore syntax.
In the dirstate class, the ignore method has been reworked to be based
on the util.matcher function, by way of a new dirstate.hgignore
method.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:23:58 -0700] rev 1269
Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 17 Sep 2005 00:23:19 -0700] rev 1268
Fix performance of dirstate.changes with ignored directories.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 16 Sep 2005 14:50:06 -0700] rev 1267
Fix diff command so it doesn't walk the dirstate unnecessarily.
mpm@selenic.com [Fri, 16 Sep 2005 14:01:03 -0700] rev 1266
Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3
Bryan O'Sullivan <bos@serpentine.com> [Fri, 16 Sep 2005 13:34:29 -0700] rev 1265
Update doc for ssh URL, describing path handling more clearly.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 16 Sep 2005 21:34:18 +0200] rev 1264
Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 16 Sep 2005 21:31:31 +0200] rev 1263
Added new debug commands to bash_completion.
mpm@selenic.com [Fri, 16 Sep 2005 10:42:20 -0700] rev 1262
Add debugancestor command
mpm@selenic.com [Thu, 15 Sep 2005 14:06:58 -0500] rev 1261
test-hup: hgrc no longer created at init
mpm@selenic.com [Thu, 15 Sep 2005 14:05:48 -0500] rev 1260
hgweb: use ui:username rather than web:contact
This also removes the creation of .hg/hgrc with web:contact at init time.
mpm@selenic.com [Thu, 15 Sep 2005 03:00:10 -0500] rev 1259
Merge with BOS
mpm@selenic.com [Thu, 15 Sep 2005 02:59:16 -0500] rev 1258
Add file encoding/decoding support
Bryan O'Sullivan <bos@serpentine.com> [Thu, 15 Sep 2005 00:04:29 -0700] rev 1257
Clamp negative rev numbers at zero.
Prior to this change, trying to run "hg log -r -50:" in a repo with
less than 50 changes caused an error. Now that we clamp at zero: no
more error.
mpm@selenic.com [Thu, 15 Sep 2005 00:49:40 -0500] rev 1256
mark copy/rename as experimental in the docs
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 22:32:12 -0700] rev 1255
Get all commands that operate on files to honour --verbose and --quiet.
Fix minor bug in remove command; the when-to-unlink logic was wonky.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 21:57:41 -0700] rev 1254
Switch cat command to use walk code.
The old syntax of "hg cat FILE REV" is now obsolete.
Use "hg cat -r REV FILE" instead, as for all other commands.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 16:34:22 -0700] rev 1253
Add rename/mv command.
This is the logical equivalent of copy and remove, and is in fact
implemented as such. It doesn't use the remove command directly.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 16:31:03 -0700] rev 1252
The copy tests don't need to invoke cp any longer.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 15:41:22 -0700] rev 1251
Fix lots of exception-related problems.
These have been around since the Big Code Split.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 14:39:46 -0700] rev 1250
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 14:29:02 -0700] rev 1249
Fix up copy command to behave more like regular "cp".
In addition to recording changes, copy now updates the working
directory.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 11:27:36 -0700] rev 1248
Merge with myself.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 14 Sep 2005 10:50:03 -0700] rev 1247
Make remove command really unlink files.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 09 Sep 2005 22:07:10 -0700] rev 1246
mercurial.el: implement hg-pull, and stub in hg-update.
Chris Mason <mason@suse.com> [Wed, 14 Sep 2005 15:50:31 -0500] rev 1245
Files not getting added appropiately
On Wed, 14 Sep 2005 15:15:13 -0400
Daniel Santa Cruz <byteshack@gmail.com> wrote:
> c:> hg debugstate
> a 666 0 09/14/05 15:11:44 a/aa\aa.a
> a 666 0 09/14/05 15:11:47 a/aa\aa.b <---- notice mixed
> slashes
>
> This all seems very confusing....
Please try this:
mpm@selenic.com [Wed, 14 Sep 2005 15:48:34 -0500] rev 1244
clone: fall back to pull if we can't lock the source repo
root@coffee.suse.com [Wed, 14 Sep 2005 13:14:20 -0500] rev 1243
Fix hgit revtree bug with stop revision handling
Mikael Berthe <mikael@lilotux.net> [Wed, 14 Sep 2005 12:35:10 -0500] rev 1242
Fix hg cat when the file cannot be found in the specified revision
Stephen Darnell [Wed, 14 Sep 2005 12:22:20 -0500] rev 1241
Add support for cloning with hardlinks on windows.
In order to use hardlinks, the win32file module is needed, and this is
present in ActivePython. If it isn't present, or hardlinks are not supported
on the underlying filesystem, a regular copy is used.
When using hardlinks the biggest benefit is probably the saving in space,
but cloning can be much quicker. For example cloning the Xen tree
(non trivial) without an update goes from about 95s to 15s.
Unix-like platforms should be unaffected, although should be more tolerant on
filesystems that don't support hard links.
(tweaked by mpm to deal with new copyfiles function)
--- hg.orig/mercurial/commands.py 2005-09-13 19:32:53.000000000 -0500
+++ hg/mercurial/commands.py 2005-09-14 12:11:34.000000000 -0500
@@ -620,10 +620,6 @@ def clone(ui, source, dest=None, **opts)
if other.dev() != -1:
abspath = os.path.abspath(source)
- copyfile = (os.stat(dest).st_dev == other.dev()
- and getattr(os, 'link', None) or shutil.copy2)
- if copyfile is not shutil.copy2:
- ui.note("cloning by hardlink\n")
# we use a lock here because if we race with commit, we can
# end up with extra data in the cloned revlogs that's not
@@ -638,7 +634,7 @@ def clone(ui, source, dest=None, **opts)
for f in files.split():
src = os.path.join(source, ".hg", f)
dst = os.path.join(dest, ".hg", f)
- util.copyfiles(src, dst, copyfile)
+ util.copyfiles(src, dst)
repo = hg.repository(ui, dest)
Index: hg/mercurial/util.py
===================================================================
--- hg.orig/mercurial/util.py 2005-09-08 00:15:25.000000000 -0500
+++ hg/mercurial/util.py 2005-09-14 12:16:49.000000000 -0500
@@ -12,7 +12,7 @@ platform-specific details from the core.
import os, errno
from demandload import *
-demandload(globals(), "re cStringIO")
+demandload(globals(), "re cStringIO shutil")
def binary(s):
"""return true if a string is binary data using diff's heuristic"""
@@ -217,17 +217,28 @@ def rename(src, dst):
os.unlink(dst)
os.rename(src, dst)
-def copyfiles(src, dst, copyfile):
- """Copy a directory tree, files are copied using 'copyfile'."""
+def copyfiles(src, dst, hardlink=None):
+ """Copy a directory tree using hardlinks if possible"""
+
+ if hardlink is None:
+ hardlink = (os.stat(src).st_dev ==
+ os.stat(os.path.dirname(dst)).st_dev)
if os.path.isdir(src):
os.mkdir(dst)
for name in os.listdir(src):
srcname = os.path.join(src, name)
dstname = os.path.join(dst, name)
- copyfiles(srcname, dstname, copyfile)
+ copyfiles(srcname, dstname, hardlink)
else:
- copyfile(src, dst)
+ if hardlink:
+ try:
+ os_link(src, dst)
+ except:
+ hardlink = False
+ shutil.copy2(src, dst)
+ else:
+ shutil.copy2(src, dst)
def opener(base):
"""
@@ -244,13 +255,13 @@ def opener(base):
if mode[0] != "r":
try:
- s = os.stat(f)
+ nlink = nlinks(f)
except OSError:
d = os.path.dirname(f)
if not os.path.isdir(d):
os.makedirs(d)
else:
- if s.st_nlink > 1:
+ if nlink > 1:
file(f + ".tmp", "wb").write(file(f, "rb").read())
rename(f+".tmp", f)
@@ -266,10 +277,41 @@ def _makelock_file(info, pathname):
def _readlock_file(pathname):
return file(pathname).read()
+def nlinks(pathname):
+ """Return number of hardlinks for the given file."""
+ return os.stat(pathname).st_nlink
+
+if hasattr(os, 'link'):
+ os_link = os.link
+else:
+ def os_link(src, dst):
+ raise OSError(0, "Hardlinks not supported")
+
# Platform specific variants
if os.name == 'nt':
nulldev = 'NUL:'
+ try: # ActivePython can create hard links using win32file module
+ import win32file
+
+ def os_link(src, dst): # NB will only succeed on NTFS
+ win32file.CreateHardLink(dst, src)
+
+ def nlinks(pathname):
+ """Return number of hardlinks for the given file."""
+ try:
+ fh = win32file.CreateFile(pathname,
+ win32file.GENERIC_READ, win32file.FILE_SHARE_READ,
+ None, win32file.OPEN_EXISTING, 0, None)
+ res = win32file.GetFileInformationByHandle(fh)
+ fh.Close()
+ return res[7]
+ except:
+ return os.stat(pathname).st_nlink
+
+ except ImportError:
+ pass
+
def is_exec(f, last):
return last
mason@suse.com [Tue, 13 Sep 2005 19:33:18 -0500] rev 1240
Convert hgk to use the hgit extension, and upate to the latest gitk
mason@suse.com [Tue, 13 Sep 2005 19:33:10 -0500] rev 1239
Turn hgit into an extension, and add commands supporting the latest gitk
mason@suse.com [Tue, 13 Sep 2005 19:32:53 -0500] rev 1238
Add log -b to show the branch a specific revision lives in
This can be somewhat slow on very large repositories, so I didn't want
to include it in -v
--- hg.orig/mercurial/commands.py 2005-09-13 14:21:57.000000000 -0500
+++ hg/mercurial/commands.py 2005-09-13 18:55:52.000000000 -0500
@@ -1161,7 +1161,10 @@ def log(ui, repo, *pats, **opts):
du = dui(ui)
elif st == 'add':
du.bump(rev)
- show_changeset(du, repo, rev)
+ br = None
+ if opts['branch']:
+ br = repo.branchlookup([repo.changelog.node(rev)])
+ show_changeset(du, repo, rev, brinfo=br)
if opts['patch']:
changenode = repo.changelog.node(rev)
prev, other = repo.changelog.parents(changenode)
@@ -1743,6 +1746,7 @@ table = {
(log,
[('I', 'include', [], 'include path in search'),
('X', 'exclude', [], 'exclude path from search'),
+ ('b', 'branch', None, 'show branches'),
('r', 'rev', [], 'revision'),
('p', 'patch', None, 'show patch')],
'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
mason@suse.com [Tue, 13 Sep 2005 19:32:43 -0500] rev 1237
Fix off by one in convert-repo tags
--- crew.orig/contrib/convert-repo 2005-07-16 11:52:06.000000000 -0400
+++ crew/contrib/convert-repo 2005-09-02 02:58:14.000000000 -0400
@@ -86,9 +86,7 @@ class convert_git:
for f in os.listdir(self.path + "/.git/refs/tags"):
try:
h = file(self.path + "/.git/refs/tags/" + f).read().strip()
- p, a, d, m = self.getcommit(h)
- if not p: p = [h] # git is ugly, don't blame me
- tags[f] = p[0]
+ tags[f] = h
except:
pass
return tags
--
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
mpm@selenic.com [Tue, 13 Sep 2005 18:38:27 -0500] rev 1236
Fix bug with co -C across branches, update tests
mpm@selenic.com [Tue, 13 Sep 2005 14:23:43 -0500] rev 1235
Fix test-tag output for new abort message
mpm@selenic.com [Tue, 13 Sep 2005 14:22:48 -0500] rev 1234
Revert unrelated changes in previous commit
mpm@selenic.com [Tue, 13 Sep 2005 14:18:18 -0500] rev 1233
Fix abort message for clone
mpm@selenic.com [Tue, 13 Sep 2005 14:16:15 -0500] rev 1232
Revert some exception type changes in revlog
mpm@selenic.com [Fri, 09 Sep 2005 12:19:24 -0700] rev 1231
CONTRIBUTORS update
mpm@selenic.com [Fri, 09 Sep 2005 12:17:51 -0700] rev 1230
dirstate: two more stat -> lstat changes
mpm@selenic.com [Fri, 09 Sep 2005 11:47:13 -0700] rev 1229
Fix comment typo
mpm@selenic.com [Fri, 09 Sep 2005 11:46:35 -0700] rev 1228
Fix dangling symlink bug in dirstate walk code
Bryan O'Sullivan <bos@serpentine.com> [Fri, 09 Sep 2005 11:34:34 -0700] rev 1227
Replace sequences of {ui.warn, return 1} with raise of util.Abort.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 09 Sep 2005 10:59:05 -0700] rev 1226
patchbomb: add TLS and SMTP AUTH support.
Original patch from Lee Cantey <lcantey@gmail.com>.
mpm@selenic.com [Thu, 08 Sep 2005 17:09:31 -0700] rev 1225
Add --debugger global option
With this option, hg will drop into the Python debugger on execution.
Running 'continue' will execute normally, and the debugger will be
reinvoked if an exception is raised.
mpm@selenic.com [Thu, 08 Sep 2005 15:01:33 -0700] rev 1224
Fix Windows status problem from new dirstate walk code
mpm@selenic.com [Thu, 08 Sep 2005 12:17:24 -0700] rev 1223
Update test-help for bundle/unbundle
mpm@selenic.com [Thu, 08 Sep 2005 12:16:31 -0700] rev 1222
Fix missing docstring for unbundle
TK Soh <teekaysoh@yahoo.com> [Thu, 08 Sep 2005 12:10:59 -0700] rev 1221
clone: directory names take precedence over symbolic names
If source matches both a directory name and a symbolic
name to repo, the directory will be taken.
mpm@selenic.com [Thu, 08 Sep 2005 12:10:43 -0700] rev 1220
import: fix bug in mail-format detection
mpm@selenic.com [Thu, 08 Sep 2005 10:49:33 -0700] rev 1219
hgweb: fix scope for RepoError
mpm@selenic.com [Thu, 08 Sep 2005 01:27:25 -0700] rev 1218
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com [Thu, 08 Sep 2005 00:13:52 -0700] rev 1217
Add missing import for hgwebdir
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 08 Sep 2005 09:11:17 +0200] rev 1216
Cleanup of tabs and trailing spaces in documentation.
mpm@selenic.com [Wed, 07 Sep 2005 23:57:59 -0700] rev 1215
Add reporting instructions to unknown exception backtraces
mpm@selenic.com [Wed, 07 Sep 2005 23:38:28 -0700] rev 1214
Smarter handling of revlog key errors
Use RevlogError for reporting exceptions
Catch and report RevlogError exceptions at the command parser
mpm@selenic.com [Wed, 07 Sep 2005 23:13:12 -0700] rev 1213
Clean up hgweb imports
Use demandloading
Pull function-local imports up to demandload
Scope hg and ui bits
mpm@selenic.com [Wed, 07 Sep 2005 20:50:23 -0700] rev 1212
Change grep -e to grep --all
We want to reserve -e for future use and grep compatibility.
I've changed every-match to all out of a general preference for
shorter long option names where short options don't exist.
mpm@selenic.com [Wed, 07 Sep 2005 20:09:16 -0700] rev 1211
Fold import -m option into import -f
mpm@selenic.com [Wed, 07 Sep 2005 20:05:22 -0700] rev 1210
Revert silly TypeError change
mpm@selenic.com [Wed, 07 Sep 2005 19:37:11 -0700] rev 1209
Tighten up clone locking
Add a lock on the destination, expand comment on source lock
mpm@selenic.com [Wed, 07 Sep 2005 19:30:23 -0700] rev 1208
Clean up local clone file list
We now use an explicit list of files to copy during clone so that we
don't copy anything we shouldn't.
mpm@selenic.com [Wed, 07 Sep 2005 19:21:38 -0700] rev 1207
Rewrite copytree as copyfiles
This inverts the logic of copytree to allow copying single files at
the top level.
mpm@selenic.com [Wed, 07 Sep 2005 19:16:36 -0700] rev 1206
Redo local clone hgrc fix
We shouldn't copy hgrc on a local clone, nor localtags. Behavior
should be identical to a remote clone.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 15:47:59 -0700] rev 1205
Write out hgrc properly.
Previously, we simply appended to the hgrc file, which meant that it
ended up containing multiple "paths" sections. Now, we only modify
"paths.default".
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 15:12:20 -0700] rev 1204
patchbomb: continue if we can't import readline.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:48:33 -0700] rev 1203
Get test-commit to exit cleanly.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:47:02 -0700] rev 1202
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:45:03 -0700] rev 1201
revlog: raise informative exception if file is missing.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 04 Sep 2005 14:21:53 -0700] rev 1200
Minor cleanups.
Eric Hopper <hopper@omnifarious.org> [Sun, 04 Sep 2005 14:11:51 -0700] rev 1199
Created a class in util called chunkbuffer that buffers reads from an
iterator over strings (aka chunks).
Also added to util (for future use) is a generator function that
iterates over a file n bytes at a time.
Lastly, localrepo was changed to use this new chunkbuffer class when
reading changegroups form the local repository.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:52:39 -0700] rev 1198
Add test output.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:51:53 -0700] rev 1197
Date validation must check for 32-bit width. Don't use assert to check.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:28:15 -0700] rev 1196
Make date/timezone validation in changelog.add more robust. Add test.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 03 Sep 2005 23:08:39 -0700] rev 1195
Validate user input of dates when adding a changelog entry.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 12:13:56 -0700] rev 1194
Add doc string for debugrename.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 09:35:42 -0700] rev 1193
Fortify the recognition of a diff header.
TK Soh <teekaysoh@yahoo.com> [Thu, 01 Sep 2005 09:11:25 -0700] rev 1192
Add -p to incoming and outgoing commands to show patch
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 09:08:21 -0700] rev 1191
Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e.
I inadvertantly used "hg import" on a message I saved, expecting it to do
the right thing, but instead it made the commit look like I authored it,
and filled the description with the email header.
Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard
against "hg import" doing this again.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 09:04:18 -0700] rev 1190
Make import command reject patches that resemble email messages.
See changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e for an example
of why this is a good idea.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 01 Sep 2005 08:01:10 -0700] rev 1189
Make removal check more complete and informative.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 01 Sep 2005 07:48:14 -0700] rev 1188
Fix up remove command to use walk code.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 07:47:26 -0700] rev 1187
From mercurial-bounces@selenic.com Thu Sep 1 07:01:32 2005
Return-Path: <mercurial-bounces@selenic.com>
X-Original-To: bos@serpentine.com
Delivered-To: bos@serpentine.com
Received: from waste.org (waste.org [216.27.176.166]) by
demesne.serpentine.com (Postfix) with ESMTP id 3616A20B571 for
<bos@serpentine.com>; Thu, 1 Sep 2005 07:01:32 -0700 (PDT)
Received: from waste.org (localhost [127.0.0.1]) by waste.org
(8.13.4/8.13.4/Debian-3) with ESMTP id j81DxodQ028829; Thu, 1 Sep 2005
08:59:51 -0500
Received: from web32904.mail.mud.yahoo.com (web32904.mail.mud.yahoo.com
[68.142.206.51]) by waste.org (8.13.4/8.13.4/Debian-3) with SMTP id
j81DxnNA028824 for <mercurial@selenic.com>; Thu, 1 Sep 2005 08:59:49 -0500
Received: (qmail 25859 invoked by uid 60001); 1 Sep 2005 13:59:17 -0000
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com;
h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding;
b=O6sELrlCknW3M/gKVqijWs82e/CbDEum1sEitcuLKXaP9dHU175PszOqMgcSKykMY+BVXtcH3NeaXLM3FyBmqNkoPAvesezyFbgQsHSM1S028oOexybCKMvtGQJmz66hzd1fDb0QoPj1gCcGU2VDevQaOesSmo1xF9jJwy2LlLE=
;
Message-ID: <20050901135917.25856.qmail@web32904.mail.mud.yahoo.com>
Received: from [60.48.222.94] by web32904.mail.mud.yahoo.com via HTTP; Thu,
01 Sep 2005 06:59:17 PDT
Date: Thu, 1 Sep 2005 06:59:17 -0700 (PDT)
From: TK Soh <teekaysoh@yahoo.com>
To: mercurial@selenic.com
In-Reply-To: <20050828075808.GO27787@waste.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
X-Virus-Scanned: by amavisd-new
Subject: Re: add -p to hg tip
X-BeenThere: mercurial@selenic.com
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: mercurial.selenic.com
List-Unsubscribe: <http://selenic.com/mailman/listinfo/mercurial>,
<mailto:mercurial-request@selenic.com?subject=unsubscribe>
List-Archive: <http://www.selenic.com/pipermail/mercurial>
List-Post: <mailto:mercurial@selenic.com>
List-Help: <mailto:mercurial-request@selenic.com?subject=help>
List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial>,
<mailto:mercurial-request@selenic.com?subject=subscribe>
Sender: mercurial-bounces@selenic.com
Errors-To: mercurial-bounces@selenic.com
X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on
demesne.serpentine.com
X-Spam-Level:
X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
version=3.0.4
X-Evolution-Source: imap://bos@www.serpentine.com/
Content-Transfer-Encoding: 8bit
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 07:43:53 -0700] rev 1186
Merge with myself.
Edouard Gomez <ed.gomez@free.fr> [Thu, 01 Sep 2005 07:41:32 -0700] rev 1185
Output Content-encoding for tar.gz and tar.bz2 snapshots
If the HTTP header 'Content-encoding' is missing for tar.gz
snapshots, some gzip capable proxies can bork the tarball and
serve unusable files to users.
GZ tarballs are served using Content-encoding: gzip.
BZ2 tarballs are served using Content-encoding: x-bzip2.
bos@serpentine.internal.keyresearch.com [Thu, 01 Sep 2005 07:37:49 -0700] rev 1184
Fix up failing tests.
mason@suse.com [Thu, 01 Sep 2005 07:34:53 -0700] rev 1183
Optimize dirstate walking
This generally cuts the time for hg status/diff in half, from 2s down to 1s.
The main parts I'm trying to optimize are:
1) os.walk stats every file. dirstate.changes then stats every file again.
2) os.walk yields every file and subdir to dirstate.traverse who yields every
file and everything in the dirstate map. dirstate.walk then
filters this mass and yields every file to the caller. There should be
fewer steps in here, and fewer duplicate strings yielded.
3) dirstate.walk runs util.unique on the results from dirstate.traverse,
even though it is also passing things through dirstate.seen to look for
duplicates.
I've turned os.walk into something hg specific that takes all the dirstate
ignore and matching rules into account. The new function also takes an
function arg (statmatch()) the caller supplies to help filter out
files it doesn't care about. dirstate.changes uses this to update state
for each file, avoiding the second stat call.
dirstate.walk is changed to turn the match function it is passed into
a statmatch function. The only real difference is that a statmatch
function takes the stat data as a second parameter. It now calls
dirstate.walkhelper, who requires a statmatch function to be passed.
This fails test-walk, but right now I think this is from a sorting error
fixed by this patch.
Index: crew/mercurial/dirstate.py
===================================================================
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 21:07:36 +0200] rev 1182
Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 21:58:44 +0200] rev 1181
Make sure the repository names don't have slashes at the at or else in some
cases env[path_info] will not find an defined repository.
REQUEST_URI can contain a query_string appending the repository name would
lead to corrupt urls.
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 18:23:39 +0200] rev 1180
Saving sys.argv and sys.stderr is not needed anymore
jdc@uwo.ca [Wed, 31 Aug 2005 11:58:15 -0700] rev 1179
Fix mercurial.el help.
jdc@uwo.ca [Wed, 31 Aug 2005 11:56:58 -0700] rev 1178
Adjust hg-strip and hg-chomp regexps.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 31 Aug 2005 11:19:20 -0700] rev 1177
hg serve: print a more useful error message if server can't start.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 31 Aug 2005 10:54:46 -0700] rev 1176
Merge with TAH.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 31 Aug 2005 10:54:00 -0700] rev 1175
Emacs: fix invocations of "hg log" to match current behaviour of log.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 09:01:41 +0200] rev 1174
Added missing 'import errno', and use errno for EPIPE, too.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 08:40:55 +0200] rev 1173
Merged changes.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 08:38:34 +0200] rev 1172
Use path relative to document root as reponame if published via a web server.
The full path is still displayed when using 'hg serve'.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 30 Aug 2005 23:16:15 -0700] rev 1171
Sort items in each hgrc section. Add web/description.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 Aug 2005 07:25:02 +0200] rev 1170
Make .hg/hgrc optional for repositories published by hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 21:26:27 +0200] rev 1169
Reverted changeset e254bcbfe636e97301f76c7da241b07be14f3d36
Volker Kleinfeld agreed that this is dead code and tried to fix a problem
which was already fixed somewhere else.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:42:58 +0200] rev 1168
Fixed two tests to run with bourne shell.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:32:11 +0200] rev 1167
Added FIXME output to test-grep so the test will not fail.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:17:05 +0200] rev 1166
Added test case for zip/gz/bz2 archive downloads.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 19:12:17 +0200] rev 1165
Fixed import needed to serve zip files which broke because of other changes.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 30 Aug 2005 18:10:20 +0200] rev 1164
Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 16:36:29 +0200] rev 1163
Don't need to save sys.stdin and sys.stdout anymore
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 16:33:04 +0200] rev 1162
Use local generated env instead of os.environ
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 16:25:46 +0200] rev 1161
Fix hg serve...
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 14:52:58 +0100] rev 1160
Fix TypeError
Vincent Wagelaar <vincent@ricardis.tudelft.nl> [Tue, 30 Aug 2005 10:57:52 +0200] rev 1159
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing),
people should make sure they write strings.
TK Soh <tksoh@freescale.com> [Tue, 30 Aug 2005 11:22:29 +0200] rev 1158
Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com> [Tue, 30 Aug 2005 11:17:20 +0200] rev 1157
tcsh_completion_build.sh: fixed error caused by xargs on Linux
TK Soh <teekaysoh@yahoo.com> [Tue, 30 Aug 2005 11:16:31 +0200] rev 1156
Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com> [Tue, 30 Aug 2005 11:16:31 +0200] rev 1155
Add contrib script for generating tcsh completion source
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 12:15:37 -0700] rev 1154
patchbomb: fix up confusion between strings and lists of strings.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1153
bash_completion: try to use bash3 features if they're available
This does NOT break completion for bash 2.05b (I haven't tested
earlier versions)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1152
bash_completion: small cleanup and bugfix
_hg_count_non_option wasn't taking global options into account
while counting non-option arguments.
It also used only its first argument.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1151
teach bash_completion about --cwd
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1150
bash_completion: better handling of aliases
Instead of listing every alias in the big case..esac, use hg help
to get the canonical name of the command.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 29 Aug 2005 20:37:07 +0200] rev 1149
bash_completion: update for new help output format
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 11:28:48 -0700] rev 1148
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 10:31:41 -0700] rev 1147
Merge with TAH.
bos@serpentine.internal.keyresearch.com [Mon, 29 Aug 2005 10:05:49 -0700] rev 1146
grep: extend functionality, add man page entry, add unit test.
walkchangerevs now returns a two-tuple. Its behaviour is also
extensively commented.
The annotate command's getname function has been factored out to a new
function, trimname, so it can be shared between annotate and grep.
The behaviour of grep has been beefed up, so that it now performs a
number of useful functions.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 29 Aug 2005 08:24:06 -0700] rev 1145
grep: change default to printing first matching rev.
Printing of every matching rev remains via --every-match/-e switch.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:42:46 +0200] rev 1144
Documented passing list or dict instead of config file in hgwebdir.cgi
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:39:01 +0200] rev 1143
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:34:35 +0200] rev 1142
Cleaned up hgweb.hgwebdir.run()
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:28:39 +0200] rev 1141
Use ConfigParser only in hgwebdir.__init__()
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:19:02 +0200] rev 1140
Don't create repo objects in hgwebdir, ui object is enough.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Aug 2005 07:07:07 +0200] rev 1139
Reverted change 51f26e856f3d: Reading changelogs is too slow.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 19:50:13 +0200] rev 1138
Use commit time instead of stat to check time of last change.
Ollivier Robert <roberto@keltia.freenix.fr> [Sun, 28 Aug 2005 19:18:39 +0200] rev 1137
Remove the link from the template as there no real way to have it always be correct.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:53:43 +0200] rev 1136
Make diffstat optional for patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:52:55 +0200] rev 1135
Variable 'body' was missing in patchbomb script.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:30:40 +0200] rev 1134
Adjusted test-hup for generated .hg/hgrc
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:27:24 +0200] rev 1133
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 18:13:28 +0200] rev 1132
Completed renaming author to contact in hgwebdir:
Prefer [web] contact = foo instead of author, but still accept the old name.
Adjusted template to show obfuscated contact. Drop bogus <i>email</i> entry.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 17:55:15 +0200] rev 1131
Create repository objects instead of using own ConfigParser in hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 17:53:37 +0200] rev 1130
Longer variable names in hgwebdir: l->repos, v->name, r->path
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 17:29:28 +0200] rev 1129
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 16:41:16 +0200] rev 1128
Fixed test-static-http with http_proxy variable set.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 16:37:24 +0200] rev 1127
Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 28 Aug 2005 16:24:04 +0200] rev 1126
Changed printing of copies in hg debugstate to: "copy: source -> dest"
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:45:27 -0700] rev 1125
Add RSS link to the repository index.
Index: hg/templates/index.tmpl
===================================================================
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:44:26 -0700] rev 1124
Add the template.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:44:15 -0700] rev 1123
Use a template for the error message.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:44:02 -0700] rev 1122
Use .has_option to avoid the unknown Exception.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:43:13 -0700] rev 1121
NoOptionError is unknown there.
Ollivier Robert <roberto@keltia.freenix.fr> [Sat, 27 Aug 2005 23:43:08 -0700] rev 1120
Handle a nonexistent repository with a 404 error.
Based on changeset 62ea868cafbfa3acb7e5dba6982ecb46a1637246 from
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
in http://hannibal.lr-s.tudelft.nl/~vincent/fcgi
roberto@keltia.freenix.fr [Sat, 27 Aug 2005 23:42:51 -0700] rev 1119
Protect against unknown repositories.
mpm@selenic.com [Sat, 27 Aug 2005 23:10:49 -0700] rev 1118
patchbomb: eliminate silly complete summary message
No longer makes sense without attachments
mpm@selenic.com [Sat, 27 Aug 2005 22:04:17 -0700] rev 1117
fix some rename/copy bugs
- delete copy information when we update dirstate
hg was keeping the copy state and marking things as copied on
multiple commits
- files that are renamed should have no parents
if you do a rename/copy to an existing file, it should not be marked
as descending from its previous revisions.
- remove spurious print from filelog.renamed
- add some more copy tests
mpm@selenic.com [Sat, 27 Aug 2005 20:58:53 -0700] rev 1116
Add some rename debugging support
mpm@selenic.com [Sat, 27 Aug 2005 20:42:53 -0700] rev 1115
bash_completion: add debugindex and debugdata support
Stephen Darnell [Sat, 27 Aug 2005 19:15:02 -0700] rev 1114
Remove the lock file copied during clone (was the source lock file)
Index: hg/mercurial/commands.py
===================================================================
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 18:55:14 -0700] rev 1113
Updated manpage and help.
Updated manpage on change to hg status; standardized description
of -print0 options.
mpm@selenic.com [Sat, 27 Aug 2005 18:40:25 -0700] rev 1112
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com [Sat, 27 Aug 2005 18:27:45 -0700] rev 1111
Add an old-http test case
This uses a trivial Python http server to test pulling from a static
http server.
mpm@selenic.com [Sat, 27 Aug 2005 18:11:32 -0700] rev 1110
Add a simple dummy ssh test
This uses the -e flag to run a dummy script rather than actual ssh to
test the protocol over a local pipe.
mpm@selenic.com [Sat, 27 Aug 2005 17:26:26 -0700] rev 1109
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:36:25 +0200] rev 1108
Remove some options from 'hg grep':
-Z (we have -0 as in locate)
-a (use "-r 0:tip" instead, or always grep all unless -r is given)
-e (we have the PATTERN argument)
-v (doesn't work, and this is more of a job for 'hg cat|grep')
-s (we have -q/--quiet)
-f (should be always enabled if -l used, or enable on -v/--verbose)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:35:30 +0200] rev 1107
Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:25:55 +0200] rev 1106
Whitespace cleanup.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:23:32 +0200] rev 1105
Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.
mpm@selenic.com [Sat, 27 Aug 2005 16:42:03 -0700] rev 1104
Fix dirstate imports
mpm@selenic.com [Sat, 27 Aug 2005 16:40:24 -0700] rev 1103
Fix sshrepo imports
mpm@selenic.com [Sat, 27 Aug 2005 16:34:54 -0700] rev 1102
localrepo: minor opener usage restructuring
mpm@selenic.com [Sat, 27 Aug 2005 16:28:53 -0700] rev 1101
Separate out old-http support
- create new statichttprepo class
- pull remote bits out of localrepo
- pull remote bits out of util.opener
- switch hg.repository to use statichttprepo
mpm@selenic.com [Sat, 27 Aug 2005 15:35:37 -0700] rev 1100
localrepo: more import/namespace tidying
mpm@selenic.com [Sat, 27 Aug 2005 15:19:36 -0700] rev 1099
Minor import fixups
mpm@selenic.com [Sat, 27 Aug 2005 15:13:52 -0700] rev 1098
manifest: convert sys.stderr bits to AssertionError
mpm@selenic.com [Sat, 27 Aug 2005 15:09:46 -0700] rev 1097
localrepo: adjust some imports, remove sys dependency
mpm@selenic.com [Sat, 27 Aug 2005 15:05:59 -0700] rev 1096
sshrepo: adjust file comment
mpm@selenic.com [Sat, 27 Aug 2005 15:05:43 -0700] rev 1095
changelog: adjust imports, comment
mpm@selenic.com [Sat, 27 Aug 2005 14:59:25 -0700] rev 1094
Adjust some imports
mpm@selenic.com [Sat, 27 Aug 2005 14:56:58 -0700] rev 1093
commands: use revlog directly for debug commands
This eliminates the import in hg.py
mpm@selenic.com [Sat, 27 Aug 2005 14:55:07 -0700] rev 1092
commands: use node functions directly
mpm@selenic.com [Sat, 27 Aug 2005 14:43:20 -0700] rev 1091
Move hash function back to revlog from node
mpm@selenic.com [Sat, 27 Aug 2005 14:31:41 -0700] rev 1090
Move opener to utils
- move the opener code down to util
- add docstring
- change commands.py users to simply use file instead
mpm@selenic.com [Sat, 27 Aug 2005 14:21:25 -0700] rev 1089
Break apart hg.py
- move the various parts of hg.py into their own files
- create node.py to store node manipulation functions
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 12:00:12 -0700] rev 1088
updated manpage for new options of status
mpm@selenic.com [Sat, 27 Aug 2005 01:55:10 -0700] rev 1087
hgweb: add catch for connection reset
suggested by Jeff Sipek
mpm@selenic.com [Sat, 27 Aug 2005 01:50:18 -0700] rev 1086
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 01:49:41 -0700] rev 1085
status: added option -p and -0 to assist xargs
The -p option strips the status prefix of each file, while
-0 ends each file with a NUL character, instead of a newline.
Together, selected group of files can be passed to 'xargs -0'
for further processing.
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 01:49:35 -0700] rev 1084
updated manpage on global options and typo fix.
mpm@selenic.com [Sat, 27 Aug 2005 01:43:48 -0700] rev 1083
Add some docstrings to revlog.py
mpm@selenic.com [Sat, 27 Aug 2005 01:13:28 -0700] rev 1082
Update util.py docstrings, fix walk test
mpm@selenic.com [Fri, 26 Aug 2005 23:29:10 -0700] rev 1081
Change canonpath to not know about repo objects
Code in util should not have any knowledge about repo objects
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 08:22:10 +0200] rev 1080
Updated list of contributors.
mpm@selenic.com [Fri, 26 Aug 2005 20:56:50 -0700] rev 1079
Document archive download options
mpm@selenic.com [Fri, 26 Aug 2005 20:52:31 -0700] rev 1078
Various cleanups for tarball support
s/tarball/archive/
query config rather than maintaining a list
default all archive support to off
use changeset nodes rather than manifest nodes
use web:name for archive name
don't use rev number in filename, it's not portable
refactor manifest lookup bits
use finally: clause to delete tmpfile
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:48 -0700] rev 1077
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:34 -0700] rev 1076
tarball support v0.3
Hello,
I'm slowly improving support for tarballs in Mercurial. Attached patch
is made against current tip in Matt's repository - f859e9cba1b9, and
contains everything done so far.
Changes:
- gzip and bzip2 tarballs are sent immediately without writing to
temporary files (I was wrong Matt, it can be done very easy)
- hgrc customization, you can choose which type (if any) you will support
There's no easy way to support compression levels, since TarFile open()
assume that it is 9. I tried to use gzopen(), and bz2open() methods
instead, but it seems that headers of generated archives, are missing or
wrong. We could eventually try to rewrite tarfile.py and include our own
version into Mercurial, but I don't know if it's good idea...
Wojtek
Volker.Kleinfeld@gmx.de [Fri, 26 Aug 2005 19:20:04 -0700] rev 1075
Fixed system command abord reason on windows.
mason@suse.com [Fri, 26 Aug 2005 19:19:35 -0700] rev 1074
Add revlog.reachable to find a graph of ancestors for a given rev
Bart Trojanowski <bart@jukie.net> [Fri, 26 Aug 2005 19:08:25 -0700] rev 1073
[PATCH] raise exceptions with Exception subclasses
Fixed the patch. Using Exception subclasses.
(tweaked by mpm)
mpm@selenic.com [Fri, 26 Aug 2005 16:49:23 -0700] rev 1072
Fixes for push corner case
TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.
Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.
Add some more debugging output.
mason@suse.com [Fri, 26 Aug 2005 14:05:52 -0700] rev 1071
Add support for extension modules
This adds support for an [extensions] section to hgrc. This has the form of:
[extensions]
mod=[path]
If a path is specified, the python module found at that path is load.
Otherwise, __import__ is used to find the module.
Each module must implement a dict called cmdtable where the command line
options for that module live. Each module must also implement a reposetup
function:
cmdtable = {}
def reposetup(ui, repo): pass
Index: hg/mercurial/ui.py
===================================================================
mpm@selenic.com [Fri, 26 Aug 2005 13:59:14 -0700] rev 1070
hgwebdir index: change "author" to "contact"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 22:40:56 +0200] rev 1069
Allow using a ssh repository without a path.
This uses the home directory on the remote side or the directory
specified in the command in .ssh/authorized_keys
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:47:09 +0200] rev 1068
Fixed synopsis for grep command.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:37:28 +0200] rev 1067
Fixed zero-padded filenames with %r if there is a longer number in the middle.
e.g. with: hg export -o ../%r.patch 99 100 98
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:26:44 +0200] rev 1066
Shortened commands.revrange() a little bit, added docstring.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:19:18 +0200] rev 1065
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:31:40 +0200] rev 1064
Removed obsolete imports from hgwebdir.cgi
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:29:52 +0200] rev 1063
Some more spacing/indentation/linebreak cleanups to hgweb.py.
benoit.boissinot@ens-lyon.fr [Fri, 26 Aug 2005 13:06:58 +0200] rev 1062
pep-0008 cleanup
- Don't use spaces around the '=' sign when used to indicate a
keyword argument or a default parameter value.
mpm@selenic.com [Fri, 26 Aug 2005 02:03:35 -0700] rev 1061
Fix set type usage for Python 2.3
mpm@selenic.com [Fri, 26 Aug 2005 01:56:49 -0700] rev 1060
Merge from BOS, fix help
bos@serpentine.internal.keyresearch.com [Thu, 25 Aug 2005 17:13:48 -0700] rev 1059
grep: speed up matching, and only return one match per line.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 10:11:54 -0700] rev 1058
Use ui.write instead of print in debugwalk.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 02:00:03 -0700] rev 1057
Add grep command.
It currently searches all revs of every matching file. I'll change
this soon so that it can still do this, but it will not be the default
behaviour.
Many options are unimplemented. There's only one output mode. Binary
files are not handled yet.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 22:25:55 -0700] rev 1056
Map long option names containing dashes to ones containing underscores.
mpm@selenic.com [Fri, 26 Aug 2005 01:51:44 -0700] rev 1055
Minor test-help fix
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:39:43 +0200] rev 1054
Fixed some synopsises in command help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:01:55 +0200] rev 1053
Added missing doc strings for two new debug commmands.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:56:33 +0200] rev 1052
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:15:04 +0200] rev 1051
Clean up displaying help of global options, only one row per option.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:47:43 +0200] rev 1050
Moved --cwd handling to a place where ui and exception handling already exists.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:42:56 +0200] rev 1049
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:37:41 +0200] rev 1048
Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:26:21 +0200] rev 1047
Moved special handling of --version and no hg command from parse to dispatch.
This allows e.g. 'hg status --version' to work.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 18:35:35 +0200] rev 1046
Sort global options by topic: directories, ui, timing, other
(and changed indentation to match command table)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Aug 2005 18:25:19 +0200] rev 1045
run the doc/* through aspell.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 16:00:08 +0200] rev 1044
Removed forgotten debug print statement from commands.py and tests.
mpm@selenic.com [Wed, 24 Aug 2005 19:19:35 -0700] rev 1043
Update tests
mpm@selenic.com [Wed, 24 Aug 2005 19:16:45 -0700] rev 1042
Fix a couple fencepost errors in hg log
mpm@selenic.com [Wed, 24 Aug 2005 18:45:49 -0700] rev 1041
Fix hg log -p
mpm@selenic.com [Wed, 24 Aug 2005 18:42:42 -0700] rev 1040
Show number of new heads when doing a pull
mpm@selenic.com [Wed, 24 Aug 2005 18:40:17 -0700] rev 1039
Add debugdata for dumping revlog revision data
bos@eng-25.internal.keyresearch.com [Wed, 24 Aug 2005 14:46:02 -0700] rev 1038
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Wed, 24 Aug 2005 14:45:35 -0700] rev 1037
Fix a small corner of log behaviour.
If invoked with no arguments in a subdirectory of the repo root, it
should print the history of the repository as a whole.
mpm@selenic.com [Wed, 24 Aug 2005 14:24:20 -0700] rev 1036
Update hg log docs
mpm@selenic.com [Wed, 24 Aug 2005 13:31:46 -0700] rev 1035
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 13:26:45 -0700] rev 1034
Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:50:11 -0700] rev 1033
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:43:09 -0700] rev 1032
Get patchbomb working with tip again.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:39:10 -0700] rev 1031
Rewrite log command. New version is faster and more featureful.
The original implementation of log walked backwards through history,
which had terrible behaviour. It took several minutes to view
complete kernel change history on a fast machine, for example.
The rewrite uses a windowed approach to walk hunks of history
forwards, while still giving results in reverse order. This reduces
run time from five minutes to five seconds on my system.
In addition, the rewrite uses our normal name handling mechanisms, so
you can run a command like "hg log net/ipv4/**.c" and get a useful
answer. It optimises for three different cases (no arguments, only
files, and anything goes), so it performs well in all circumstances
I've tested.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:57:22 -0700] rev 1030
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:53:13 -0700] rev 1029
Emacs: implement hg-incoming, hg-outgoing and hg-push.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:30:12 -0700] rev 1028
Add commands.debugconfig.
This lets us both view the actual config data that hg is using, and
drive editors that need to see this information.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 16:46:10 -0700] rev 1027
Emacs: fix up hg-log and hg-diff to operate more uniformly.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:42:06 -0700] rev 1026
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:30:06 -0700] rev 1025
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 15:27:17 -0700] rev 1024
Sync buffers prior to doing a diff.
mpm@selenic.com [Wed, 24 Aug 2005 03:33:54 -0700] rev 1023
Minor tweak to the revgen algorithm
mpm@selenic.com [Wed, 24 Aug 2005 03:32:08 -0700] rev 1022
Minor hgwebdir tweaks
- ignore / for PATH_INFO
- fix // in URLs
mpm@selenic.com [Wed, 24 Aug 2005 00:38:36 -0700] rev 1021
Add Makefile to the manifest
mpm@selenic.com [Wed, 24 Aug 2005 00:36:12 -0700] rev 1020
Add default make rule
The default make rule builds the extensions "in-place" so that hg can
be run out of the working directory.
mpm@selenic.com [Wed, 24 Aug 2005 00:32:10 -0700] rev 1019
Create helper functions for I/O to files in the working directory
This simplifies some code and gives us a single place to add I/O
filters.
mpm@selenic.com [Wed, 24 Aug 2005 00:12:04 -0700] rev 1018
Add some aliases
mpm@selenic.com [Wed, 24 Aug 2005 00:09:56 -0700] rev 1017
Fix up help for binary options
mpm@selenic.com [Tue, 23 Aug 2005 20:21:52 -0700] rev 1016
Teach annotate about binary files
mpm@selenic.com [Tue, 23 Aug 2005 19:58:46 -0700] rev 1015
Add automatic binary file detection to diff and export
Based on a patch by Fuming Wang
- add util.binary which decides whether a file is binary if it has any NUL
characters in the first 1K.
- teach mdiff.unidiff to print "binary file <x> has changed" for binary files
- add text flag to cause unidiff and dodiff to treat all files as text
- add -a and --text flags (like diff(1)) to hg diff and export
- update docs
mpm@selenic.com [Tue, 23 Aug 2005 18:58:26 -0700] rev 1014
Clean up argument passing for dodiff
mpm@selenic.com [Tue, 23 Aug 2005 16:19:14 -0700] rev 1013
Deal with repos with missing timezones
mpm@selenic.com [Tue, 23 Aug 2005 15:15:14 -0700] rev 1012
Merge with BOS
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 14:51:52 -0700] rev 1011
Emacs: search for hg in path before looking in funny places.
mpm@selenic.com [Tue, 23 Aug 2005 14:21:19 -0700] rev 1010
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 19:56:52 +0200] rev 1009
Don't show the diff in hgeditor if there are no changes in file contents.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:46:43 +0200] rev 1008
Add Makefile for generating release tarballs.
- test suite is run
- documentation is generated and included
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:39:44 +0200] rev 1007
Include generated documentation in MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:33:02 +0200] rev 1006
Generate html documentation by default, too.
mpm@selenic.com [Tue, 23 Aug 2005 14:20:17 -0700] rev 1005
Merge with BOS
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:29:55 -0700] rev 1004
Emacs: improved GNU Emacs support.
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:08:20 -0700] rev 1003
Emacs support: numerous changes.
Most SCM commands now work in derived buffers (e.g. diff viewing
buffers) as well as buffers backed by files.
diff and log now work properly on repositories and files.
Commit support is more solid.
Doc strings are better.
bos@eng-25.internal.keyresearch.com [Mon, 22 Aug 2005 13:06:43 -0700] rev 1002
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:41:09 -0700] rev 1001
Emacs: update mode lines properly after commit.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:27:27 -0700] rev 1000
Emacs: kill commit buffer once it's done with.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:16:32 -0700] rev 999
Emacs: first cut at commit support.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:33:02 -0800] rev 998
contrib/patchbomb: Fix buglet with empty cc list.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:03:14 -0800] rev 997
Fix handling of addresses in hgrc.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 22:46:57 -0800] rev 996
Emacs: document existing functions.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 21:51:01 -0800] rev 995
Emacs support: add hg-revert-buffer.
mpm@selenic.com [Tue, 23 Aug 2005 12:46:43 -0700] rev 994
Fix callers to file.revision to use file.read
This was causing unchanged files to show up as modified.
mpm@selenic.com [Tue, 23 Aug 2005 02:19:38 -0700] rev 993
Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
mpm@selenic.com [Mon, 22 Aug 2005 01:22:29 -0700] rev 992
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
mpm@selenic.com [Sun, 21 Aug 2005 22:03:36 -0700] rev 991
merge: remove remaining mark bits
mpm@selenic.com [Sun, 21 Aug 2005 21:59:55 -0700] rev 990
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
mpm@selenic.com [Sun, 21 Aug 2005 16:51:50 -0700] rev 989
Reformat debugindex output
mpm@selenic.com [Sun, 21 Aug 2005 16:00:07 -0700] rev 988
Remove unused relfilter function
mpm@selenic.com [Sun, 21 Aug 2005 15:56:14 -0700] rev 987
hgweb: change startup argument processing
- allow passing a repo object instead of a path
(if we get a string, we construct a repo object)
- hg serve: pass options via repo.ui.setconfig
- add --style option
- get default name from repo.root rather than getcwd()
- remove template argument to hgweb()
- reduce create_server from 8 args to 1
mpm@selenic.com [Sun, 21 Aug 2005 15:00:02 -0700] rev 986
Add web:style option
mpm@selenic.com [Sun, 21 Aug 2005 13:18:45 -0700] rev 985
hgweb: fix RSS and raw for new % scheme
mpm@selenic.com [Sun, 21 Aug 2005 11:52:52 -0700] rev 984
Remove debug print
mpm@selenic.com [Sun, 21 Aug 2005 11:46:39 -0700] rev 983
Fix RSS feeds
mpm@selenic.com [Sat, 20 Aug 2005 13:11:36 -0700] rev 982
hgweb: convert index entries to list expansion style
mpm@selenic.com [Sat, 20 Aug 2005 13:08:07 -0700] rev 981
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:59:47 -0500] rev 980
Merge with MPM
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:32:47 -0500] rev 979
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:08:15 -0500] rev 978
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:03:28 -0500] rev 977
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:59:02 -0500] rev 976
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:45:44 -0500] rev 975
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:14:20 -0500] rev 974
Added support for #foo%bar# syntax
This required moving template() into the templater class
mpm@selenic.com [Sat, 20 Aug 2005 11:59:10 -0700] rev 973
Deal with non-integer date offsets generated by some tools
mpm@selenic.com [Sat, 20 Aug 2005 01:46:57 -0700] rev 972
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com [Sat, 20 Aug 2005 01:35:45 -0700] rev 971
Remove call to non-existent date_parser
mpm@selenic.com [Sat, 20 Aug 2005 01:29:04 -0700] rev 970
Fix possible unitialized variable warnings
mpm@selenic.com [Sat, 20 Aug 2005 00:49:41 -0700] rev 969
Minor README updates
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:26:32 -0800] rev 968
[PATCH] Take DST into account
Right now, mercurial doesn't take daylight saving time into account
because it uses time.timezone inconditionally, instead of resorting to
time.altzone if daylight saving time is on.
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:23:42 -0800] rev 967
[PATCH] Print timezone offset when outputting dates
Example:
% hg log | head -12
changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a
tag: tip
user: Samuel Tardieu <sam@rfc1149.net>
date: Mon Jul 25 13:24:15 2005 +0200
summary: Parse various date formats when accepting user specified dates
[...]
changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73
parent: 785:31a80e3723cee0a5991340facb2707e71983eb41
user: Bryan O'Sullivan <bos@serpentine.com>
date: Sun Jul 24 00:39:24 2005 -0800
summary: Get "forget" command to use new walk code.
[...]
mpm@selenic.com [Fri, 19 Aug 2005 23:07:31 -0800] rev 966
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com [Fri, 19 Aug 2005 22:48:43 -0800] rev 965
Use post-expanded clone pathname as default
mpm@selenic.com [Fri, 19 Aug 2005 22:12:40 -0800] rev 964
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com [Fri, 19 Aug 2005 22:11:48 -0800] rev 963
Add -e and --remotecmd for clone and pull too
mpm@selenic.com [Fri, 19 Aug 2005 21:47:46 -0800] rev 962
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com [Fri, 19 Aug 2005 21:36:57 -0800] rev 961
Add --ssh and --remotecmd to push
This uses the new setconfig options passing mechanism
mpm@selenic.com [Fri, 19 Aug 2005 21:25:25 -0800] rev 960
Add ui.setconfig overlay
This can simplify option passing
mpm@selenic.com [Fri, 19 Aug 2005 18:56:20 -0800] rev 959
Fix option parsing bug for empty short options
mpm@selenic.com [Fri, 19 Aug 2005 18:47:05 -0800] rev 958
Make mercurial.el load with GNU emacs
mpm@selenic.com [Fri, 19 Aug 2005 17:22:04 -0800] rev 957
hgweb: sort repository list
mpm@selenic.com [Fri, 19 Aug 2005 17:01:11 -0800] rev 956
Fix hgwebdir virtual start-up
mpm@selenic.com [Fri, 19 Aug 2005 16:51:44 -0800] rev 955
Remove -C alias for --cwd
mpm@selenic.com [Fri, 19 Aug 2005 16:46:31 -0800] rev 954
Add hgwebdir.cgi to MANIFEST.in
mpm@selenic.com [Fri, 19 Aug 2005 16:45:25 -0800] rev 953
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Fri, 19 Aug 2005 06:04:46 +0100] rev 952
bash_completion: support GNU sed 3 and non-GNU sed
replaced command 'Q' introduced in GNU sed 4, in order to support
platforms with older sed.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 21:35:36 +0100] rev 951
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 13:55:45 +0100] rev 950
Removed TODO from MANIFEST.in
TK Soh <teekaysoh@yahoo.com> [Thu, 18 Aug 2005 13:33:39 +0100] rev 949
test fixes for Solaris 2.6
Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.
mpm@selenic.com [Fri, 19 Aug 2005 16:43:30 -0800] rev 948
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Fri, 19 Aug 2005 06:41:29 -0800] rev 947
In-progress Emacs snapshot.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 17:49:43 -0800] rev 946
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:32:15 -0800] rev 945
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:27:57 -0800] rev 944
Initial skeleton for mercurial.el.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 14:58:14 -0800] rev 943
Add --cwd global option, to change directory before doing anything.
Useful for interacting with a program presenting a UI, such as Emacs.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 13:58:32 -0800] rev 942
Modify commands.walk to yield a 4-tuple.
The new element of the tuple indicates whether a name is an exact match
for one passed in on the command line.
mpm@selenic.com [Fri, 19 Aug 2005 16:38:25 -0800] rev 941
Add a multi-repository server
This merges a bunch of the ideas for a multi-repository CGI script and
simplifies things a bit.
It uses PATH_INFO so it generally wants paths of the form:
http://host/hg.cgi/virtualpath
This gets mapped via a simple config file to the real path. All info
about the repo is read from the repo's hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 18:52:27 -0800] rev 940
Add in and out aliases
mpm@selenic.com [Wed, 17 Aug 2005 18:41:04 -0800] rev 939
Fix stray debug statement
mpm@selenic.com [Wed, 17 Aug 2005 17:57:37 -0800] rev 938
hgweb: add [web] section to hgrc
This makes almost all of the hgweb settings available in hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 16:37:04 -0800] rev 937
Whitespace
mpm@selenic.com [Wed, 17 Aug 2005 12:26:06 -0800] rev 936
Add a simple remove test
mpm@selenic.com [Wed, 17 Aug 2005 12:22:12 -0800] rev 935
bash: Add smarter completion of add/commit/remove/forget/diff/revert
Use hg status to determine which files are interesting for various commands.
Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.
mpm@selenic.com [Wed, 17 Aug 2005 00:36:36 -0800] rev 934
Fix path handling for deleting files on merge
tksoh@users.sf.net [Wed, 17 Aug 2005 00:33:53 -0800] rev 933
Fixed --repository option when handling relative path
When specifying relative path to --repository option, 'log' and
'diff' were unable to find the files specified. Here's the fix.
mpm@selenic.com [Tue, 16 Aug 2005 23:49:53 -0800] rev 932
The TODO and the FAQ now live on the Wiki
mpm@selenic.com [Tue, 16 Aug 2005 22:47:49 -0800] rev 931
Fix incoming for empty set
mpm@selenic.com [Tue, 16 Aug 2005 21:33:50 -0800] rev 930
Fix incoming help test again
mpm@selenic.com [Tue, 16 Aug 2005 19:31:30 -0800] rev 929
Add incoming to completions
mpm@selenic.com [Tue, 16 Aug 2005 19:27:46 -0800] rev 928
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com [Tue, 16 Aug 2005 19:17:16 -0800] rev 927
Add hg incoming command for local repositories
mpm@selenic.com [Tue, 16 Aug 2005 19:17:01 -0800] rev 926
Add a local() method to repository classes
mpm@selenic.com [Tue, 16 Aug 2005 19:03:01 -0800] rev 925
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 17:30:41 -0800] rev 924
updated help text and added manpage section for hg paths
Index: hg/doc/hg.1.txt
===================================================================
mpm@selenic.com [Tue, 16 Aug 2005 17:12:25 -0800] rev 923
Add basic https support for pull
mpm@selenic.com [Tue, 16 Aug 2005 15:55:33 -0800] rev 922
Teach bash_completion about outgoing
mpm@selenic.com [Tue, 16 Aug 2005 15:50:42 -0800] rev 921
show_changeset: -q shows short hash
mpm@selenic.com [Tue, 16 Aug 2005 15:49:26 -0800] rev 920
Add hg outgoing command
mpm@selenic.com [Tue, 16 Aug 2005 15:30:26 -0800] rev 919
whitespace cleanup
mpm@selenic.com [Tue, 16 Aug 2005 15:22:44 -0800] rev 918
hg cat: accept changeset hashes
mpm@selenic.com [Tue, 16 Aug 2005 14:53:47 -0800] rev 917
Fix hg clone race with writer
Most read operations in hg don't need locks because we order reads and
writes for consistency. Clone is an exception to this as we're copying
entire file histories and could end up with more file history copied
than we have commits.
For now, make clone take a lock on the source repo. Non-hardlinked
clone should eventually be changed to use lockless pull.
mpm@selenic.com [Tue, 16 Aug 2005 14:17:27 -0800] rev 916
Add bash_completion to contrib
Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br>
Attached is a file that implements bash completion for hg. Just
reading it from your .bashrc should be enough to use it - I think: I'm
using the /etc/bash_completion from debian and I'm not sure whether it
sets some important option.
It gets the list of commands, aliases and options from the output of hg
help and then adds some specific stuff - e.g. completing update with
tags; pull and push with path aliases and directories, etc.
mpm@selenic.com [Tue, 16 Aug 2005 13:52:28 -0800] rev 915
Let hg paths work outside of repositories
mpm@selenic.com [Tue, 16 Aug 2005 10:44:04 -0800] rev 914
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 10:42:30 -0800] rev 913
typo fix in command help text
This patch fixes a few typo errors on the command help output
(I am not sure if the change on 'diff' is the best though).
mark.williamson@cl.cam.ac.uk [Mon, 15 Aug 2005 11:46:41 -0800] rev 912
Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 08:08:11 +0100] rev 911
Fix .hgignore parsing if last line has no EOL, ignore trailing white space.
(and don't use tabs in python code)
mpm@selenic.com [Sun, 14 Aug 2005 22:00:16 -0800] rev 910
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:58:25 +0100] rev 909
Addes test for error messages when operating on non-existing files.
mpm@selenic.com [Sun, 14 Aug 2005 21:36:08 -0800] rev 908
Fix tests for new init command
Bryan O'Sullivan <bos@serpentine.com> [Sun, 14 Aug 2005 21:33:09 -0800] rev 907
Modify init command to take an optional directory to set up.
If the directory does not exist, it is created.
If no directory is given, the current directory is used.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:18:49 +0100] rev 906
Update synopsis for 'hg update', too.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 05:22:40 +0100] rev 905
Update online help of hg heads for new --branches option.
mason@suse.com [Sun, 14 Aug 2005 20:09:32 -0800] rev 904
Add optional parameter for changed/added/del/unknown files to commands.dodiff
This makes it possible to avoid a call into repo.changes if the details
of what has changed is already known
mason@suse.com [Sun, 14 Aug 2005 20:09:21 -0800] rev 903
Allow the changegroup generator to completely load the buffer.
This makes is possible to delete or truncate away revisions and still
use the changegroup later.
mason@suse.com [Sun, 14 Aug 2005 20:09:09 -0800] rev 902
Add optional stop revision to revlog.heads
mason@suse.com [Sun, 14 Aug 2005 20:09:01 -0800] rev 901
Change repo.comit to return None on error or the new revision number on
success
This allows the caller to correctly record the new revision number
mason@suse.com [Sun, 14 Aug 2005 20:08:35 -0800] rev 900
Add force option to repo.commit, allowing commits where no files change
mark.williamson@cl.cam.ac.uk [Sun, 14 Aug 2005 12:30:01 -0800] rev 899
Add '-' support to the commit logfile option to read message from stdin.
mason@suse.com [Sun, 14 Aug 2005 12:23:45 -0800] rev 898
Add searching for named branches
named branching is when you identify a head by a tag on an earlier revision.
This patch adds repo.branchlookup for searching through the tree to
find branch tags for heads.
hg update -b tag is added to checkout based on branch tags
hg heads -b is added to print the tag associated with each head
mpm@selenic.com [Sun, 14 Aug 2005 12:23:36 -0800] rev 897
Fix bug with empty inc and exc
This fixes an exception that showed up when importing patches
mpm@selenic.com [Sat, 13 Aug 2005 19:43:42 -0800] rev 896
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:26:32 -0800] rev 895
Merge walk changes with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:23:06 -0800] rev 894
Merge with TAH.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:13:37 -0800] rev 893
Turn off testing of absolute paths for now.
I don't know how to stop this from always reporting false errors, and am
too lazy to worry about it right now.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:09:37 -0800] rev 892
Fix bug involving "hg debugwalk -Ipattern" from repository root.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 14:41:51 -0800] rev 891
Fix clone when target directory is relative.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:12:09 -0800] rev 890
Merge walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:10:09 -0800] rev 889
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:09:17 -0800] rev 888
Fix up handling of regexp paths.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:10:09 -0800] rev 887
Merge Windows path fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:06:52 -0800] rev 886
Fix walk path handling on Windows
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:18:41 -0800] rev 885
Merge latest round of walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:16:58 -0800] rev 884
Fix walk code for files that do not exist anywhere, and unhandled types.
Prior to this, a file that did not exist was reported as showing up in
the filesystem, as were files of unsupported types (such as fifos).
Now, an error message is printed and nothing is returned in such cases.
This change also moves the commands.pathto function to the util module,
as the walk code needs it to print non-confusing error messages.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 07:42:32 -0800] rev 883
Update to tip.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:36:34 -0800] rev 882
Merge IPv6 fix.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:35:25 -0800] rev 881
Fix problem with "hg serve" on systems not providing IPv6.
mason@suse.com [Fri, 12 Aug 2005 07:12:08 -0800] rev 880
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 07:10:21 -0800] rev 879
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 10:17:12 -0800] rev 878
Merge patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 08:04:31 -0800] rev 877
Polish patchbomb script.
diffstat output is now a non-default option.
The hgrc file can now contain default information for the patchbomb
script.
Date generation is fixed.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:53:50 -0800] rev 876
Get patchbomb script to not use MIME attachments.
Adding patches as attachments makes it difficult or impossible for some
mail clients to quote them effectively.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:18:58 -0800] rev 875
Add patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 09:58:35 -0800] rev 874
Merge Chris's changes with mine.
mason@suse.com [Fri, 12 Aug 2005 09:57:59 -0800] rev 873
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 09:57:56 -0800] rev 872
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 17:24:38 -0800] rev 871
Merge with mpm.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 12:43:11 -0800] rev 870
Teach walk code about absolute paths.
The first consequence of this is that absolute and relative paths now
all work in the same way. The second is that paths that lie outside
the repository now cause an error to be reported, instead of something
arbitrary and expensive being done.
Internally, all of the serious work is in the util package. The new
canonpath function takes an arbitrary path and either returns a
canonical path or raises an error. Because it needs to know where the
repository root is, it must be fed a repository or dirstate object, which
has given commands.matchpats and friends a new parameter to pass along.
The util.matcher function uses this to canonicalise globs and relative
path names.
Meanwhile, I've moved the Abort exception from commands to util, and
killed off the redundant util.CommandError exception.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 11:09:21 -0800] rev 869
Kill dead function.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 07 Aug 2005 11:04:58 -0800] rev 868
Fix debugwalk when there's nothing to walk.
tksoh@users.sourceforge.net [Sat, 13 Aug 2005 12:41:00 -0800] rev 867
Allow Mercurial to build on HP-UX 11
Temporary fix to allow Mercurial to build on HP-UX 11, as the C
compiler on HP-UX 11 doesn't support 'inline' qualifier. The
'__inline' qualifier seemed to be supported, but not without
first resolving other associated issues.
mpm@selenic.com [Fri, 12 Aug 2005 23:54:09 -0800] rev 866
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 08:41:23 +0100] rev 865
Cleanup after previous changes:
- there are only two states for the exec bit, so no need to override it.
- file_ variable is only once now, so it self.file(f) can be used directly.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 08:23:42 +0100] rev 864
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 07:51:37 +0100] rev 863
Use length of file instead of length of change for the dirstate entry.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 Aug 2005 06:47:46 +0100] rev 862
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 Aug 2005 11:32:30 +0100] rev 861
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Interface is not yet changed.
Non-regular files are considered to be removed or deleted.
Removed the unneeded match(fn) call for adding to the unknown list.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 Aug 2005 11:15:57 +0100] rev 860
Use correct term "closed interval" for ranges.
Edouard Gomez <ed.gomez@free.fr> [Tue, 09 Aug 2005 09:36:34 -0800] rev 859
Trap OSError when deleting env vars
On the other OS, it seems that case insensitivity for
environment vars can bite users when using some unknown
combination of python 2.4.1 and win2kSP4+minsys (and
probably other vversions of these softwares).
The best way to avoid problems in those weird cases is to
ignore OSError exception during env var deletion.
Jeff Sipek <jeffpc@optonline.net> [Mon, 08 Aug 2005 19:49:48 -0800] rev 858
[PATCH] Move default page name into map file
Move default page name from code into the map file. This way, different
hgweb styles/themes are free to select their default (no cmd in args)
page.
Jeff Sipek <jeffpc@optonline.net> [Mon, 08 Aug 2005 19:49:34 -0800] rev 857
[PATCH] Propagate the template map though recursively
This patch allows propagates the template map though recursively
though all the templates.
This allows for some hgweb template cleanup patches as well as it makes
writing new skins/themes for hgweb much much easier. (I'm planing to
write several basic ones.)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 07 Aug 2005 17:41:13 +0100] rev 856
Fixed encoding of directories ending in .d or .i:
One .d and .i was mixed up, and string replace method doesn't work in-place.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:59:22 +0100] rev 855
Added Tristan Wibberley to contributors.
Tristan Wibberley <tristan@wibberley.org> [Sat, 06 Aug 2005 21:58:28 +0100] rev 854
Fixed revlog.children.
It was comparing a node to a rev, then appending a rev onto the list
of children being constructed instead of a node.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:41:53 +0100] rev 853
Update TODO
Samuel Tardieu <sam@rfc1149.net> [Sat, 06 Aug 2005 21:23:38 +0100] rev 852
Allow HG patch to appear late in the input stream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 21:19:32 +0100] rev 851
Added Samuel Tardieu to contributors list.
Samuel Tardieu <sam@rfc1149.net> [Sat, 06 Aug 2005 21:18:21 +0100] rev 850
Add temporary documentation files and profiling output to .hgignore
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 15:43:12 +0100] rev 849
Further help improvements:
Show command aliases in 'hg help something', unless in quiet mode.
Show short command description with 'hg help -q something'.
Show global options in verbose mode of command help.
State that Mercurial is a Distributed SCM.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 14:04:59 +0100] rev 848
Always show short help when an unknown command is given.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:33:14 +0100] rev 847
Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 846
When hg is invoked without parameters, the short list help is displayed.
When hg is executed without parameters ( or hg is executed with the
'help shortlist' command ) the short help list is displayed.
If the 'help' command is passed on the commandline the full help list
is displayed.
In both the cases if the switch '-v' is passed, the help contains also
the aliases of the short/full commands list and the global switches.
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 845
More verbose information on the global options
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 844
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it [Sat, 06 Aug 2005 13:27:31 +0100] rev 843
'hg help -v' shows global options
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 12:05:09 +0100] rev 842
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 Aug 2005 07:16:37 +0100] rev 841
Realigned command table again.
tksoh@users.sourceforge.net [Sat, 06 Aug 2005 07:09:10 +0100] rev 840
hg status: added options to select files by status.
Added options -m, -a, -r and u to select files corresponding
to status M, A, R and ? respectively. If none of these
options are specified, files of all status will be shown.
mpm@selenic.com [Thu, 04 Aug 2005 13:31:25 -0800] rev 839
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Thu, 04 Aug 2005 05:14:59 -0800] rev 838
Merge with Matt.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 03 Aug 2005 09:10:48 -0800] rev 837
Fix performance of hg diff.
commands.walk has been refactored. commands.walk's behaviour remains as
it was, but there is a new function, commands.makewalk. This returns
results that can be passed along to other internal code, in our case
dodiff.
mpm@selenic.com [Thu, 04 Aug 2005 13:27:41 -0800] rev 836
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:23:07 +0100] rev 835
Cleaned up trap handling in run-tests, too.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:20:40 +0100] rev 834
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:13:17 +0100] rev 833
Removed special FIXME handling in run-tests, added bug info to .out files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 18:06:49 +0100] rev 832
Handle broken pipe on pressing Ctrl-C with e.g. 'hg log|grep something'.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:43:05 +0100] rev 831
Cleaned up trap handling:
- Use numbers instead of signal names
- No need to explicitly call "cleanup_exit RC" to exit with return code RC.