Commit Graph

707 Commits

Author SHA1 Message Date
Martin Geisler
59385f10e8 check-code: add test for callable 2010-07-09 14:01:55 +02:00
Julian Cowley
270cd1a3b9 mercurial.spec: rename docutils to python-docutils in BuildRequires
Even though the name of the project is Docutils, most packagers use
the package name python-docutils to fit into the naming scheme of
other packages written in Python.  The name is used by Fedora, EPEL,
DAG, Mandriva, and a few other distributions.
2010-07-02 14:14:30 -10:00
Martin Geisler
6ae5a495d7 hgweb.wsgi: add a URL to the corresponding wiki documentation
Imported for_upstream__add_doc_url_in_example_files.patch from
Debian's patch queue:

  http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
2010-07-03 01:48:50 +02:00
Steve Borho
3f177d32a4 wix: generate a new GUID for the help folder
A GUID change is recommended after changes like 857ab17725c0
2010-07-01 19:13:23 -05:00
Steve Borho
a10936e8ce wix: pick up new help topics added between 1.5 and 1.6
These files are not included the 1.6.0 installer, but will be picked up by
nightly builds as soon as this makes it to the stable branch.
2010-07-01 12:53:37 -05:00
Mads Kiilerich
20a31caeb0 mercurial.spec: don't include convert-repo - use "hg convert" instead 2010-06-25 19:59:22 +02:00
Gilles Moris
b51db262e6 contrib: update tcsh_completion with commands for 1.6
Added the following commands: debugbuilddag debugdag debugpushkey
debugrevspec.
2010-06-26 15:56:48 +02:00
Martin Geisler
5bd48f2f1e check-code: reformat long lines 2010-06-15 10:01:55 +02:00
Martin Geisler
28297c8184 check-code: catch format(), introduced in Python 2.6 2010-06-15 09:55:59 +02:00
Martin Geisler
5d9db0b74d check-code: fix check for any/all function
The old check would only detect any/all at the beginning of a line.
The regexp was probably just modeled after the preceding regexp which
(correctly) finds the 'with' keyword at the beginning of a line.

We now complain about 'any(' and 'all(' anywhere in a line, unless it
is preceded by 'def'. This allows us to define our own compatibility
wrapper in util and use 'util.any(' in the code.
2010-06-15 09:51:52 +02:00
Steve Borho
74a14c2364 mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
2010-06-08 11:58:09 -05:00
Pradeepkumar Gayam
ade05bacc0 shrink-repo: wrong variable name 2010-06-06 22:39:32 +05:30
Greg Ward
6e1d6aff0f shrink-revlog: use util.mktempcopy() to preserve mode of index file.
(There's still a chmod() call to manually preserve the mode of the
data file.)
2010-06-03 10:18:33 -04:00
Martin Geisler
ae18c6a910 win32text: mark this extension as deprecated 2010-06-02 14:54:25 +02:00
Martin Geisler
e73685cb49 Merge with stable 2010-06-02 14:40:31 +02:00
Greg Ward
cb24398037 shrink-revlog: preserve mode of the shrunken index and data file.
Otherwise, the shrunken index file always has mode 0600 thanks to
mkstemp(). This is annoying on a server, where multiple users may need
to read/write the manifest. chmod()ing the data file is not strictly
necessary, but it's nice for consistency.
2010-06-01 18:29:52 -04:00
Yuya Nishihara
ffeee8dfd0 check-code: add check for 'source' 2010-05-21 22:53:57 +09:00
Steve Borho
c76d6b8145 extdiff: add labels, read diff arguments from [merge-tools]
hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:

[extdiff]
kdiff3 =
meld =
2010-01-07 22:19:05 -06:00
David Champion
8d642796c6 give worst-case 'merge' merge-tool lowest priority
Another tool had -10 already.  Since 'merge' is clearly a worst-case
tool (internal), lowering to -100 ensures there's plenty of room for
slightly better cases.
2010-04-21 12:02:51 -05:00
Mads Kiilerich
df529b99ae contrib/mercurial.spec: Use DESTDIR variable and 'make install' 2010-04-19 11:31:19 +02:00
Adrian Buehlmann
a3eefcc44b wix: new GUID for contrib.guid
to comply with the component GUID rules of Windows Installer, applied to
the change 5f884a9e81ee
2010-04-27 09:47:33 +02:00
Mads Kiilerich
da86b3d27f contrib/mercurial.spec: drop git-viz
Follow-up to a8ccf53d3400
2010-04-19 11:00:36 +02:00
Steve Borho
547e95b96c wix: hgweb file renames 2010-04-26 11:33:37 -05:00
Matt Mackall
7bbcc61ae7 hgweb: synchronize fcgi and wsgi scripts 2010-04-26 11:03:40 -05:00
Martin Geisler
9f9d28399a contrib/win32: update build instructions after 54a12ae534c6 2010-04-24 23:08:27 +02:00
Adrian Buehlmann
5b1887513a wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
2010-04-16 14:57:30 +02:00
Nicolas Dumazet
7f1a963829 pylint, pyflakes: remove unused or duplicate imports 2010-04-14 17:58:10 +09:00
Matt Mackall
062bdb8d0b check-code: add a warnings level
- demote "unwrapped ui message"
2010-04-12 17:41:32 -07:00
Jeff Schiller
a08ba2f39f logo: clean up source file with scour 2010-04-05 14:33:41 -05:00
Matt Mackall
62c4921786 contrib: drop rewrite-revlog 2010-04-05 14:33:41 -05:00
Matt Mackall
661fa63a2a contrib: drop git-viz 2010-04-05 14:33:41 -05:00
Adrian Buehlmann
c2496a9944 wix: refactor and new guids.wxi 2010-04-04 02:39:45 +02:00
Matt Mackall
0726edad79 Merge with stable 2010-04-01 17:51:59 -05:00
Mads Kiilerich
6f24bc8f03 check-code.py: Check for bare ^
Solaris sh interprets ^ as some kind of piping symbol.
2010-03-31 11:07:46 +02:00
Martin Geisler
79b5361923 Merge with stable 2010-03-19 11:32:55 +01:00
Adrian Buehlmann
bd3cb13c64 wix: don't show version in title of root feature
The version is already shown in the title bar of the feature selection dialog
and in the text of the welcome dialog. It's unusual for Windows programs to repeat
the version in the root feature.
2010-03-19 10:39:01 +01:00
Adrian Buehlmann
1f2b9929e9 wix: use build variable for VC redist source dir 2010-03-19 10:26:19 +01:00
Benoit Boissinot
2fa74b1aa8 check-code: more tests and more robust python filtering 2010-03-18 16:32:03 +01:00
Matt Mackall
6e515e4e5d progress: drop extra args for pos=None calls (issue2087) 2010-03-17 18:15:16 -05:00
Matt Mackall
9ead8ddeec check-code: fix check-code complaint 2010-03-17 15:36:48 -05:00
Benoit Boissinot
4e213c5898 check-code: improve quote detection regexp, add tests 2010-03-17 14:15:33 +01:00
Martin Geisler
3c35180612 Merge with stable 2010-03-17 10:55:28 +01:00
Pierre-Yves David
ada28ea37e check-code: add a return value to checkfile function
The checkfile function returns True if the file is correct, False
otherwise.
2010-03-17 10:51:26 +01:00
Pierre-Yves David
d5796f6daf code-code: Add a logfunc argument to checkfile
This helps external tool customisation. The logfunc argument must be a
function called to report errors. A new logger class is also added to
keep the old behaviour by default.
2010-03-16 19:53:00 +01:00
Pierre-Yves David
ffbf49397a check-code: Add a `maxerr argument to the checkfile` function
check-code.py used to halt after 15 errors. This changeset adds a new
argument to the checkfile function to control this limit.
2010-03-16 19:52:58 +01:00
Pierre-Yves David
16e40846e1 check-code: Add a `checkfile` function
The part of the code actually checking each file is moved in the
``checkfile`` function to allow external reuses.
2010-03-16 19:52:57 +01:00
Pierre-Yves David
64bcf4a5c3 check-code: Only call check-code if __name__ = "__main__".
This changeset moves the code that actually executes something to the
"if __name__ = '__main__'" section to allow the file to be imported as
a module.
2010-03-16 19:52:56 +01:00
Benoit Boissinot
57712fa835 check-code: remove simple quotes first 2010-03-16 16:39:17 +01:00
Adrian Buehlmann
3e93d70483 contrib/wix: fix product name to include version
Without this, Mercurial is registered under the installed programs
on Windows as just 'Mercurial', which is unusual for a program to do
on Windows.

Including the version in the registered product name registers the
software in the Windows control panel of installed programs as, for
example, 'Mercurial 1.5' (for 1.5), or as

  'Mercurial 1.5.1032' for a stable 1.5+32-d9a6645d6d9b
  'Mercurial 1.5.5080' for a unstable 1.5+80-1119076dd3e8

when using http://bitbucket.org/tortoisehg/thg-winbuild to create
daily builds.

Furthermore, the install UI texts in the built installer database (MSI
file) are more clear on what the user is about to install, as, for example,
the text in the initial installer dialog now reads

  "The Setup Wizard will install Mercurial 1.5 on your computer"

instead of just

  "The Setup Wizard will install Mercurial on your computer"
2010-03-16 17:39:12 +01:00
Matt Mackall
36aa3dd390 check-code: add check for any/all 2010-03-12 16:16:47 -06:00