Peter van Dijk <peter@dataloss.nl> [Wed, 22 Feb 2006 15:42:48 +0100] rev 1925
small solaris portability fixes from John Levon <levon@movementarian.org>
Peter van Dijk <peter@dataloss.nl> [Tue, 21 Feb 2006 22:32:17 +0100] rev 1924
add md5sum.py required by fix in previous changeset
Peter van Dijk <peter@dataloss.nl> [Tue, 21 Feb 2006 22:23:51 +0100] rev 1923
fix testsuite for freebsd and one timingissue
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 08:56:59 +0100] rev 1922
ui: output the number of file updated/merged/removed/... on update
add a note for people to remember commiting after a merge.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 20:34:09 +0100] rev 1921
Don't expand empty [paths] so later interpolation can do the right thing.
Example:
[paths]
default =
default-push = %(default)s
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 12 Mar 2006 16:21:59 -0800] rev 1920
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 12 Mar 2006 15:58:56 -0800] rev 1919
add changeset_quiet to templates.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 12 Mar 2006 15:50:18 -0800] rev 1918
fix template tests.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 21:41:44 -0800] rev 1917
add quiet and debug template keys.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 05 Mar 2006 17:08:35 -0800] rev 1916
fix test failures that depend on when tests run.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 04 Mar 2006 21:12:53 -0800] rev 1915
add tests for command line template.
fix default template problem found in test.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 04 Mar 2006 15:15:18 -0800] rev 1914
make --style=compact look for map-cmdline.compact.
change name of key in map file from changelog to changeset.
rename command map files to start with map-cmdline.
rename ui.logmap to ui.style in hgrc.
now --style=foo does this:
tries to open foo as file.
tries as map-cmdline.foo in template path.
tries as foo in template path.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 04 Mar 2006 12:40:10 -0800] rev 1913
fix some things people wanted to be cleaner.
rename --map-file to --style.
no more -t alias for --template.
update docs.
rename template entry in map files to changelog.
if --verbose, use changelog_verbose if there, else changelog.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Feb 2006 07:24:54 -0800] rev 1912
hide some functions behind lambdas, so demandload is useful.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 21:37:57 -0800] rev 1911
add extra newline to verbose log template. asak found this.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 21:32:15 -0800] rev 1910
changeset_templater: only compute manifest when --debug.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 15:07:25 -0800] rev 1909
add doc comments to template code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 13:25:40 -0800] rev 1908
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 13:18:57 -0800] rev 1907
let commands that show changesets use templates.
mechanism is same as hgweb templates.
old show_changeset code is still used for now if no template given,
because it is faster than template code when verbose or debug.
simple template can be given on command line using -t, --template.
example:
hg log -t '{author|person}\n'
complex template can be put in template map file, given on command line
using --map-file.
we give two example map files:
map-log.compact prints 3 lines of output for every change.
map-log.verbose prints exact same output as default "hg log -v".
map files are searched where user says, then in template path as backup.
example:
hg log --map-file map-log.compact
defaults can be set in hgrc with ui.logtemplate and ui.logmap.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 12:50:49 -0800] rev 1906
add iso date template filter.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 12:41:20 -0800] rev 1905
improve template errors when something is wrong.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 11:33:09 -0800] rev 1904
improve templating.
allow {foo} as well as #foo#.
add new functions for changeset authors.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 11:32:10 -0800] rev 1903
move shortuser into util module.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 11:18:56 -0800] rev 1902
make parsestring work with strings that do not have quotes.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 09:35:43 -0800] rev 1901
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 09:15:59 -0800] rev 1900
move repeated work out of inner loops.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 20:53:37 -0800] rev 1899
many small changes to templater.
get string code to parse escapes. uses eval now, should parse strings
itself soon.
let caller check if fragment is defined using "in".
make templatepath take optional file name.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 13:11:53 -0800] rev 1898
missed hunk when moving code to templater module
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 13:09:26 -0800] rev 1897
move hgweb.templatepath into templater
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 12:59:28 -0800] rev 1896
move hgweb template code out to templater
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 00:02:33 +0100] rev 1895
findincoming should return an iterable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 20:23:05 +0100] rev 1894
Allow symbolic path names in global -R/--repository parameter.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 20:13:58 +0100] rev 1893
Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 18:05:13 +0100] rev 1892
Directory names take precedence over symbolic names consistently.
Previously this was only done for clone.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 15:11:11 +0100] rev 1891
New version/release in mercurial.spec, patchbomb is now in hgext.
Xiaofeng Ling <xiaofeng.ling@intel.com> [Sun, 12 Mar 2006 15:07:40 +0100] rev 1890
fix contrib/mercurial.spec for hgext
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 13:57:55 +0100] rev 1889
Try to import extensions from the hgext module first.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 12:29:03 +0100] rev 1888
Make bash_completion more robust for e.g. broken hgrc or old hg installations.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 12 Mar 2006 11:32:03 +0100] rev 1887
new command debugcomplete
add a new command debugcomplete, it lists all the possible
completion for the specified command.
make the bash_completion script uses it instead of the awk code
TK Soh <teekaysoh@yahoo.com> [Sun, 12 Mar 2006 08:08:22 +0100] rev 1886
remove bashisms from tests
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 11 Mar 2006 21:33:19 -0800] rev 1885
run merge program in repo root.
before, merge program was run in user current directory. Well defined
location is better for scripts. no more need to pass HG_ROOT to merge
program now.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 23:34:36 -0800] rev 1884
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 23:34:02 -0800] rev 1883
give more info to hgmerge script.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 22:42:59 -0800] rev 1882
merge util.esystem and util.system.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 23:25:50 -0800] rev 1881
undo edit that was accident.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 22:24:19 -0800] rev 1880
fix broken environment save/restore when a hook runs.
move "run commend with different env/cwd" code out to function in util.
new function is called esystem.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 20:06:41 +0100] rev 1879
make clean now removes generated documentation.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 19:16:49 +0100] rev 1878
Make #!/usr/bin/env python in test-bdiff run the specified python version.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 08:31:31 -0800] rev 1877
change lock format to let us detect and break stale locks.
old style: symlink to pid
new style: symlink to hostname:pid
if lock code finds new-style lock, it breaks lock if locking pid is on
same machine and pid is not alive.
otherwise, lock is left alone. this makes locking code safe with
old-style locks and with locks on other machines.
new code makes server part of mercurial more robust in case machine
crashes, power fails, or crazy user does kill -9.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 11:34:02 +0100] rev 1876
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 11:33:28 +0100] rev 1875
Catch other exceptions (e.g. util.Abort) in parse(), too.
This has the benefit of removing duplicate catching of AmbiguousCommand
and UnknownCommand, and keeping all exception handling together.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 11:06:45 +0100] rev 1874
Inherit config from real parentui and don't use ConfigParser internals.
Added comments for the meaning of parentui.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 10:44:17 +0100] rev 1873
Added check for minimal python version to setup.py
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 09 Mar 2006 16:27:21 -0800] rev 1872
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 09 Mar 2006 16:26:49 -0800] rev 1871
patchbomb: ignore exception if pager quits.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 09 Mar 2006 12:18:59 -0800] rev 1870
make push over http print good error message.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Mar 2006 08:27:49 +0100] rev 1869
Reordered options for remove, fixed synopsis for rename.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 18:48:40 -0800] rev 1868
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 15:14:24 -0800] rev 1867
add -f/--force to remove command.
else to remove modified file, must use "hg revert; hg rm"
or "rm; hg rm --after".
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 14:53:57 -0800] rev 1866
inherit hgrc so "%" interpolation works.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 11:21:45 -0800] rev 1865
merge with crew.
Lee Cantey <lcantey@gmail.com> [Wed, 08 Mar 2006 11:20:39 -0800] rev 1864
Fix manifest view on Windows
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 19:31:54 +0100] rev 1863
Removed script header from mq.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 19:30:30 +0100] rev 1862
Moved bisect extension to hgext folder.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 19:25:03 +0100] rev 1861
Added copyright information to hbisect.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 06:20:32 +0100] rev 1860
Merged tah and crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 06:13:24 +0100] rev 1859
Moved --cwd handling in front of -R handling again. Shorter code for initial -R.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 01:30:43 +0100] rev 1858
Make hg paths and hg debugconfig work with -R/--repository option.
Commands that can use a repo, but don't need one, should be added
to the "optionalrepo" string, similar to the "norepo" string.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 01:25:14 +0100] rev 1857
Always try to open the repository if -R/--repository is specified.
This makes 'hg -R something_unknown command' consistently fail for
all commands, not only for those who need a repository.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 05:31:20 +0100] rev 1856
Make bisect extension work with python2.3
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 05:16:36 +0100] rev 1855
Fixed spacing/indentation, removed #! script header, added short description.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 05:07:20 +0100] rev 1854
Fixed contrib/hbisect.py to work with the new opener behaviour.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 00:27:23 +0100] rev 1853
Fix some problems when working on broken repositories:
Fix tracebacks in hg verify for certain repo errors.
Print compression type byte encoded safely.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 22:41:24 +0100] rev 1852
Fix mq's usage of opener, which don't allow absolute paths now.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 07 Mar 2006 22:27:18 +0100] rev 1851
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 08:46:19 +0100] rev 1850
Hide debug commands in ambiguous command list, unless no normal command matches.
This will execute diff if 'hg d' is typed and hide rawcommit on 'hg r'.
Based on a patch by TK Soh.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 08:41:13 +0100] rev 1849
Show ambiguous aliases, if they are not simple abbreviations. Sort output.
TK Soh <teekaysoh@yahoo.com> [Tue, 07 Mar 2006 08:05:17 +0100] rev 1848
show choices on ambiguous commands
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 07 Mar 2006 20:37:27 +0100] rev 1847
fix annotate for removed files
walk in the manifest files instead of the working dir files
when running annotate
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 21:06:53 -0800] rev 1846
only put numbers on patches if > 1 patch.
Lee Cantey <lcantey@gmail.com> [Mon, 06 Mar 2006 21:05:18 -0800] rev 1845
Patchbomb only sends introductory message [0 of N] if there are multiple patches.
Lee Cantey <lcantey@gmail.com> [Mon, 06 Mar 2006 21:03:46 -0800] rev 1844
Remove patchbomb from list of contrib files to install since it's now an extension.
Innosetup script was referencing old contrib location.
Also cosmetic change to group related files.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 23:16:42 +0100] rev 1843
Removed PKG-INFO from repository, because it already gets auto-generated.
Canonical place for changing the contained info is setup.py.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 10:50:26 -0800] rev 1842
merge with crew.
Eung-ju Park <eungju@gmail.com> [Mon, 06 Mar 2006 10:49:34 -0800] rev 1841
Fix py2exe packagescan problem with new demandload
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:53:11 +0100] rev 1840
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:47:41 +0100] rev 1839
Create local ui object per repository, so .hg/hgrc don't get mixed.
This is needed for hooks, but may be important for other settings, too.
Fixes issue113, also integrated push-hook-lock.sh as a test case for this.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:34:49 +0100] rev 1838
Call hooks in alphabetical (=defined) order, of course still grouped by type.
Output of test-hook adjusted.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 08:35:15 -0800] rev 1837
make ui flush output. this makes error happen if printing to /dev/full.
before this change, error happened with some pythons, but not others.
now always happens.
fixes issue 155.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 05 Mar 2006 01:37:28 -0800] rev 1836
make lock module use demandload.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Mar 2006 19:01:45 +0100] rev 1835
Validate paths before reading or writing files in repository or working dir.
Fixes security relevant issue134.
Lee Cantey <lcantey@gmail.com> [Fri, 03 Mar 2006 13:41:12 -0800] rev 1834
Fixes running 'hg serve' with Windows executable and no explicit template path configured.
PY2EXE executables don't support __file__ but do place the directory of the
shared code library into sys.prefix.
Fixes bug 152.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 13:24:26 -0800] rev 1833
i made a mistake in last change.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 13:11:25 -0800] rev 1832
generate profile even when exception raised.
otherwise, is not possible to profile hg serve.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 09:40:18 -0800] rev 1831
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 09:39:37 -0800] rev 1830
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Feb 2006 11:25:07 -0800] rev 1829
hgwebdir: export collections of repos
now you can use [collections] section in hgweb.config to export entire
tree of repos.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 08:44:37 -0800] rev 1828
merge with crew.
Vadim Gelfer <vadim.gelger@gmail.com> [Thu, 02 Mar 2006 11:38:39 -0800] rev 1827
get patchbomb extension to use demandload. speeds up hg startup by 50%.
Vadim Gelfer <vadim.gelger@gmail.com> [Thu, 02 Mar 2006 11:38:03 -0800] rev 1826
rewrite demandload module to be more flexible.
performance not affected.
old demandload module could only import top-level modules like os and
sys.
with rewrite, all of following syntax is emulated perfectly:
import foo, bar foo bar
import foo.bar.quux foo.bar.quux
from foo.bar import quux, blurfl foo.bar:quux,blurfl
only thing missing is "import foo as bar".
also, namespace clashes between placeholder object and demand loaded
module are no longer possible.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Mar 2006 09:17:04 +0100] rev 1825
Make hgweb.staticfile() more secure and portable.
Without this, files in directories next to the static directory starting
with 'static' could be retrieved, e.g. with '../static.private/foo'.
Additionally staticfile now generates platform specific pathnames from
the /-separated paths given in the URL.
Illegal file names (e.g. containing %00) now yield a sane error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 01 Mar 2006 21:44:00 -0800] rev 1824
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 01 Mar 2006 21:27:23 -0800] rev 1823
merge with crew.
Robin Farine <robin.farine@terminus.org> [Tue, 28 Feb 2006 23:47:40 -0800] rev 1822
copy/rename to a removed destination file
When the destination of a copy or rename operation has been
marked for removal, we need to restore it before we overwrite
it with the new content. This also handles the case of
idempotent renames, i.e.
hg rename "a" "b"
hg rename "b" "a"
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 15:29:13 +0100] rev 1821
Catch urllib errors for old-http in a nicer way.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 01 Mar 2006 14:52:28 +0100] rev 1820
Really fix bash_completion on Solaris. Maybe. Hopefully.
Use substr instead of sub.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:19:27 +0100] rev 1819
Regenerate hg.1.gendoc.txt if commands.py changed.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:14:25 +0100] rev 1818
Make the deprecated rawcommit an alias of debugrawcommit.
This way it doesn't show up in the non-debug help.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:09:50 +0100] rev 1817
Ignore generated documentation
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:08:56 +0100] rev 1816
Updated help synopsises and reordered some options. Dropped [-n] from revert.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Mar 2006 01:45:05 +0100] rev 1815
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 00:48:49 +0100] rev 1814
generate hg manpage from commands.py docstring
gendoc.py is a script generating a part of the manpage (the commands
help and options) from the docstring in commands.py.
It avoids duplicating the doc between the doc/ directory and the docstrings.
To generate the manpage, 'make doc' will create all the necessary intermediate
files.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:26:44 +0100] rev 1813
Merged automatic doc generation from tonfa.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 22:50:49 +0100] rev 1812
fix the synopsis of some commands, mark rawcommit as deprecated in short help
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 00:46:06 +0100] rev 1811
resync commands.py docstrings with hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:25:34 +0100] rev 1810
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:19:47 +0100] rev 1809
Updated test-commit to match changed output caused by nested transactions.
mason@suse.com [Tue, 28 Feb 2006 12:25:26 -0600] rev 1808
Add mq extension
mason@suse.com [Tue, 28 Feb 2006 12:25:10 -0600] rev 1807
Allow repo lock to be passed in to localrepo.commit for performance
mason@suse.com [Tue, 28 Feb 2006 12:24:54 -0600] rev 1806
Automatic nesting into running transactions in the same repository.
This associates a transaction handle with a given repository object, and
any additional calls to start new transactions reuse that transaction.
For the 2700 patch import run, this brings the system time down from
1m20s to 50s, mostly by skipping backups of the dirstate file.
(note, this patch does not change hg import to use the nested transaction,
mq is the only user right now)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Feb 2006 11:49:35 -0600] rev 1805
Fix bash_completion on Solaris
TK Soh noticed that the awk that ships with Solaris doesn't allow you
to define new functions. According to
http://www.shelldorado.com/articles/awkcompat.html
it looks like it also doesn't have some other stuff that we were using,
like deletion of an array element and gsub.
Rewrite the parsing of hg --debug help to work around that. This
version doesn't filter aliases that are simple abbreviations for debug
commands (not a big problem, since there are none right now).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 26 Feb 2006 16:23:14 +0100] rev 1804
refactor the dodiff optimization
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 26 Feb 2006 02:26:17 +0100] rev 1803
speed up hg log --patch
Changing dodiff to read the manifest/changelog for node1 before calling
repo.update allows us to take advantage of the revlog revision cache.
Before this patch and my previous "speed up hg log --debug" patch, when
using hg log -p to display three revisions (A, B and C), dodiff and
repo.changes would end up reading the manifests in this order:
B A B A C B C B
With both patches, this order becomes:
A A B B B B C C
(This considers only dodiff and repo.changes. I'm not sure how other
parts of hg log enter the picture.)
The speed up will depend on the revisions being displayed. (All
"before" times already have my previous "speed up hg log --debug" patch
applied.)
hg repo (tip = 414e81ae971f). hg log -p
before after
real 0m50.981s 0m45.279s
user 0m47.930s 0m42.560s
sys 0m2.526s 0m2.523s
output size: 6917897 bytes
kernel repo (tip = 9d4e135960ed). hg log -p -l64
before after
real 2m14.995s 1m45.025s
user 2m9.509s 1m33.900s
sys 0m3.663s 0m2.942s
output size: 31497621 bytes
same kernel repo. hg log -p -l64 -r c84c2069592f:0
before after
real 1m48.045s 1m0.076s
user 1m44.094s 0m58.492s
sys 0m2.603s 0m1.103s
output size: 197983 bytes
c84c2069592f was the tip of a 10 day old kernel repo that I had lying
around and was where I first tested this patch. For some weird
coincidence it's also a place where the patch makes a huge difference.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 25 Feb 2006 13:44:40 +0100] rev 1802
speed up hg log --debug
hg repo:
before:
real 0m6.998s
user 0m6.952s
sys 0m0.046s
after:
real 0m3.884s
user 0m3.839s
sys 0m0.042s
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Feb 2006 20:25:18 +0100] rev 1801
on revert, only undele files that are removed in the dirstate
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 22:47:40 +0100] rev 1800
Removed now obsolete min/max check in walkchangerevs().
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 22:37:29 +0100] rev 1799
Replaced fixed window size for walkchangerevs with an increasing one. Window
sizes starts at 8 (for good interactiveness) and doubles with each window
until it is 512, which seems to be the maximum efficient value.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Thu, 23 Feb 2006 18:10:04 +0100] rev 1798
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 14:42:47 +0100] rev 1797
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 12:35:15 +0100] rev 1796
Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.
Lee Cantey <lcantey@gmail.com> [Thu, 23 Feb 2006 12:02:39 +0100] rev 1795
Fix 'hg serve' not using CSS.
hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 23 Feb 2006 02:17:08 +0100] rev 1794
only write the dirstate when something changed
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 09:14:46 +0100] rev 1793
Allow serving static files from hgwebdir to fix CSS and favicon.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:32:51 +0100] rev 1792
Cleanup of tabs and coding when sending content type.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:11:52 +0100] rev 1791
Merge with jeffpc's hg-static
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.