Pascal Quantin
a962927931
Add Python 2.6 support to win32 installer
...
With Python 2.6, win32 installer should try to package MSVC9.0 dlls instead of
MSVC7.1 dlls
2009-04-11 21:58:28 +02:00
Pascal Quantin
c20653023e
Bundle python dll in win32 installer if present
...
in case hg.exe is generated with the py2exe '-b 2' option instead of '-b 1',
python2?.dll is not included in library.zip file and must also be packaged.
The file will be integrated in the installer only if it is present in the dist
directory. Generating hg.exe with the '-b 2' option is mandatory to avoid a
crash when pyreadline is installed.
2009-01-25 21:08:36 +01:00
Pascal Quantin
13346f4a22
Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
2009-01-25 21:55:18 +01:00
Benoit Boissinot
7789b29b2e
Change wording in example hook
2009-03-30 01:21:39 +02:00
Alexander Solovyov
4f628e24de
diffstat hook example
2009-03-26 16:49:47 +02:00
Alexander Solovyov
0dac3f9036
contrib: add perflog and perftemplating commands to perf extension
2009-03-23 13:12:03 +01:00
Pascal Quantin
79f2ac527a
merge tools: fix typo in Beyond Compare's 3 command line
...
Fix a typo error preventing 'base' to be displayed properly.
2009-03-23 10:48:45 +01:00
Steve Borho
270940d51c
update copyright in ReadMe.html
2009-03-04 22:56:17 -06:00
Stefan Rusek
50d1fd501f
include i18n files in the win32 installer
...
The .mo files for translations should be included in the Windows installer.
2009-03-02 23:07:56 +01:00
Dirkjan Ochtman
7be8113e09
contrib: add hgwebdir.wsgi, to serve as a better example
2009-02-24 16:05:43 +01:00
Dirkjan Ochtman
680b0c1d1e
contrib: bring hgwebdir.fcgi up-to-date with current WSGI practices
2009-02-24 16:01:29 +01:00
Pascal Quantin
29992cd051
Update Beyond Compare's configuration
...
If there is already a Beyond Compare's instance running when performing a merge
from Mercurial, BCompare.exe will exit immediately and the merge will fail.
Use the /solo switch to make it always wait (it will open each comparison in
it's own window instead of in tabs)
2009-02-04 22:12:55 +01:00
Martin Geisler
ccfb3c24ba
hgk: select first changeset at startup (issue1382)
2009-02-16 01:41:01 +01:00
Gilles Moris
cc1f605bcd
Update tcsh completion scripts with new commands and for new help output.
...
Also make the build script executable.
2009-02-08 15:58:39 +01:00
Robert Bauck Hamar
d94956710e
hgk: added explanation to .hgk for background colour
2009-02-09 19:00:55 +01:00
Robert Bauck Hamar
6faf5ed122
hgk: added colour settings for different colours in diff view
2009-02-09 19:00:52 +01:00
Robert Bauck Hamar
7831eedb92
hgk: added setting of foreground colour
...
Added the fgcolor setting read by hgk to change the text colour in the
diff output and the file list. The colours for diff highlighting
remains unchanged.
2009-02-09 19:00:48 +01:00
Robert Bauck Hamar
da9d5a5752
hgk: Add background colour setting
...
Adds the bgcolor config variable, that sets the background
colour of the text and canvas frames.
2009-02-07 18:46:13 +01:00
Pascal Quantin
1243276d6c
Retrieve Beyond Compare's path from registry
...
Switch from a hardcoded path to registry key to find Beyond Compare's
executable. Calling BCompare.exe works fine with version 3.0.14.
2009-01-23 23:39:28 +01:00
Pascal Quantin
96bb56bfd5
Update win32 merge tools configuration
...
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.
2009-01-17 18:51:40 +01:00
Pascal Quantin
3c320942ef
Package hgk Tcl/Tk script in win32 installer
...
hgk script will be copied to Contrib/hgk.tcl
2009-01-17 15:25:20 +01:00
Pascal Quantin
1a6eeffbf1
Update mercurial.ini file packaged in win32 installer
...
Update contrib/win32/mercurial.ini file with contrib/sample.hgrc
content and append contrib/mergetools.hgrc content during installation
2009-01-17 15:23:13 +01:00
Patrick Mezard
ea82145f7f
Merge with crew-stable
2009-01-17 15:19:41 +01:00
Patrick Mezard
2771395c7d
Document how HTML documentation is built under Windows
2009-01-17 15:15:26 +01:00
Pascal Quantin
857ecbcb33
Add Lee Cantey's installer icon to win32 installer
...
Add Lee Cantey's installer icon to contrib/win32 and update
mercurial.iss accordingly
2009-01-15 14:19:29 +01:00
Brendan Cully
9ef554dbfb
Update zsh completion to use debugcomplete -v instead of parsing help
2008-12-04 11:21:31 -08:00
Brendan Cully
246275eed2
Update zsh completion for new help format
2008-12-03 22:01:34 -08:00
Patrick Mezard
9b8cb99ec1
hgweb: extend [paths] syntax to match repositories recursively (issue852)
...
This feature somehow duplicates [collections] but it is simpler to use and has
less issues under Windows where using absolute path as configuration file key
is not supported.
Suggested by Dirkjan Ochtman <dirkjan@ochtman.nl>
2008-12-01 14:20:20 +01:00
Benoit Boissinot
7c64bcb65d
merge with mpm
2008-11-27 01:35:12 +01:00
Mads Kiilerich
b229c34697
rpm spec: include python egg in rpm
...
Better complicance with packaging guidelines
http://fedoraproject.org/wiki/Packaging/Python
http://fedoraproject.org/wiki/Packaging/Python/Eggs
2008-11-27 01:10:27 +01:00
Mads Kiilerich
55633af5c3
buildrpm: complain when hg command isn't available
...
Before it complained "You are not inside a Mercurial repository!" which wasn't true.
2008-11-27 01:09:11 +01:00
Mads Kiilerich
d156191b6c
Fix rpmlint warnings
...
contrib/mercurial.spec:9: W: hardcoded-path-in-buildroot-tag /tmp/build.%{name}-%{version}-%{release}
A path is hardcoded in your Buildroot tag. It should be replaced by something
like %{_tmppath}/%name-root.
contrib/mercurial.spec:31: W: rpm-buildroot-usage %prep rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_ROOT should not be touched during %build or %prep stage, as it will
break short circuiting.
2008-11-23 18:17:02 +01:00
Mads Kiilerich
171cdd4c59
Make rpm spec less explicit
...
Fixes:
* current buildrpm failing on Fedora because of unexpected zeroconf extensions
* unowned directories hgext/*/
2008-11-23 18:16:02 +01:00
Brendan Cully
662347033e
zsh: make resolve with no options only complete unresolved files
2008-11-17 11:45:38 -08:00
Brendan Cully
f8be17617f
mergetools: add pointer to the usual filemerge path
2008-11-16 20:56:55 -08:00
Brendan Cully
61a488c351
zsh: support for resolve
2008-11-16 19:49:36 -08:00
Matt Mackall
8b3cb5ceff
Add contrib/perf.py for performance testing
2008-11-13 12:52:03 -06:00
Matt Mackall
b2807810c6
linkrev: take a revision number rather than a hash
2008-11-12 15:19:14 -06:00
Mads Kiilerich
995611c9e8
Make contrib/buildrpm work on Fedora 9.
...
mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable.
Only minimal changes has been made, and there is plenty of room for improvement.
2008-10-06 14:41:22 +02:00
Patrick Mezard
0d0f719f13
tests: Windows compatibility fixes
...
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
2008-10-12 19:11:59 +02:00
Michael Sommerville
3ce4deef7c
hgk: Display branch name for each head (issue 740)
...
In the graphical view, each head is decorated with an additonal tag
containing the branch name, if that head is not on the default branch.
2008-09-15 23:39:11 +01:00
Christian Ebert
09b34ab14b
hgcommand.vim: refer Vim7 users to vcscommand plugin
2008-09-10 09:41:42 -04:00
Dirkjan Ochtman
6f2e3a456b
contrib: remove deprecated darcs2hg.py script
...
We've have support for darcs in the convert extension for a while now.
2008-08-28 13:16:15 +02:00
Dirkjan Ochtman
b2e25d7f06
merge with crew-stable
2008-08-20 11:09:53 +02:00
TK Soh
84cf853d31
update copyright dates in Windows installer's readme file
2008-08-20 10:31:19 +02:00
Martin OConnor
c79872ed51
Updating Copyright dates in Windows Installer
2008-07-01 23:41:47 +01:00
Lee Cantey
99a8c73ee9
Fix bad span tag in Readme
2008-05-25 14:05:35 -07:00
Neal Becker
23032b2d99
mergetools.hgrc patch
2008-04-16 15:26:37 -07:00
byron@base2.cc
5bb9254434
Added missing --config global option to zsh_completion.
...
The global options --encoding and --encodingmode where also added.
Without these options some functionality breaks. Also added basic
completion for config items for the --config option.
2008-07-03 20:53:14 -07:00
Dirkjan Ochtman
b4d9394e54
merge with crew-stable
2008-07-02 09:21:57 +02:00
