Commit Graph

542 Commits

Author SHA1 Message Date
Stefano Tortarolo
a94892f192 contrib/buildrpm: force en_US locale during changelog's creation
Running this script using a different locale (i.e., Italian) returns
an error:
$ ./contrib/buildrpm
sto aggiornando la directory di lavoro
1060 file aggiornati, 0 file merge, 0 file rimossi, 0 file non risolti
errore: data errata in %changelog: mar giu 23 2009 Stefano Tortarolo <stefano.tortarolo@gmail.com> 1.2.1-1034
2009-06-23 14:14:48 +02:00
Stefano Tortarolo
24b7df6192 contrib/buildrpm: set python requirement to 2.4 2009-06-23 14:12:17 +02:00
Dirkjan Ochtman
a774ff01bc help: add/fix docstrings for a bunch of extensions 2009-06-21 16:45:47 +02:00
Mads Kiilerich
eb27d6f1b7 contrib/buildrpm: Don't require installed hg, use local hg with pure extensions 2009-06-20 16:06:55 +02:00
Mads Kiilerich
d0145b8d82 contrib/buildrpm: Don't use perl 2009-06-20 16:06:55 +02:00
Mads Kiilerich
4f6d9d0917 contrib/buildrpm: Support python 2.4 and 2.6 2009-06-20 16:06:54 +02:00
Steve Losh
ffd2524669 Support branch names in contrib/bash_completion
Anywhere a revision is needed a branch name can be used to specify
the tip of that branch, so branch names should be tab completed.
2009-06-03 22:58:43 -04:00
Steve Losh
15b3451b67 Support merge in contrib/bash_completion 2009-06-03 22:54:53 -04:00
Martin Geisler
58e8fb6277 removed unused imports 2009-05-30 23:20:30 +02:00
Martin Geisler
6ab8a62f66 zsh-comp: explain how to use for non-global install 2009-05-24 23:53:28 +02:00
Martin Geisler
0a365d5ca2 use 'x is None' instead of 'x == None'
The built-in None object is a singleton and it is therefore safe to
compare memory addresses with is. It is also faster, how much depends
on the object being compared. For a simple type like str I get:

            | s = "foo" | s = None
  ----------+-----------+----------
  s == None | 0.25 usec | 0.21 usec
  s is None | 0.17 usec | 0.17 usec
2009-05-20 00:52:46 +02:00
Martin Geisler
ee6f4bf040 contrib/win32: add simple style sheet 2009-05-16 08:46:42 +02:00
Martin Geisler
449d0084f2 contrib/win32: updated title of the hgbook 2009-05-16 08:38:04 +02:00
Martin Geisler
c08fe914b5 contrib/win32: format file names and env vars with <tt> 2009-05-16 08:37:06 +02:00
Martin Geisler
caab648bf1 contrib/win32: indent and word wrap consistently 2009-05-16 08:33:23 +02:00
Martin Geisler
d3744da5b7 contrib/win32: add missing <p> tags 2009-05-16 08:26:36 +02:00
Martin Geisler
5cd17cb3ee contrib/win32: fix HTML tag nesting 2009-05-16 08:22:30 +02:00
Adrian Buehlmann
93dfb394e2 contrib/win32: license is GPLv2 only
according to Matt Mackall
2009-05-15 13:59:43 +02:00
Dirkjan Ochtman
f9ccb5f95a contrib: add tmplrewrite.py script to help rewrite old templater syntax 2009-05-15 10:47:19 +02:00
Jonathan Kotta
54a1763f72 allow toggling when the cursor is on the correct line instead of just the filename text in hg-commit-toggle-file 2009-05-13 13:07:43 -05:00
Steve Borho
83629eeaea simplemerge: use ui.warn() for warnings 2009-04-30 23:57:36 -05:00
Martin Geisler
7d509c2459 add blank line after copyright notices and after header 2009-04-26 01:25:53 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00
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