Commit Graph

691 Commits

Author SHA1 Message Date
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
Greg Lindahl
5dd2da8417 mercurial.spec: remove reference to doc/ja 2010-03-13 16:19:28 +01:00
Mads Kiilerich
badb17240e test-merge-default and check-code.py: No "export x=x" in sh 2010-03-08 03:07:35 +01:00
Benoit Boissinot
d6eff743cd merge with stable 2010-03-13 17:02:41 +01:00
Martin Geisler
42e9951ca6 Merge with stable 2010-03-12 00:50:41 +01:00
Martin Geisler
dee8d94155 shrink-revlog: add missing whitespace in expression 2010-03-11 23:44:12 +01:00
Benoit Boissinot
bdc24dd6be shrink-revlog: factor out postorder algorithm 2010-03-10 09:52:16 +01:00
Benoit Boissinot
732670e0f2 shrink-revlog: factor out suboptimal computation 2010-03-10 09:51:07 +01:00
Benoit Boissinot
7727772fc6 shrink-revlog: remove branchsort algorithm (it behaves poorly) 2010-03-10 09:48:15 +01:00
Greg Ward
99f8164fc6 shrink-revlog: add accounting of suboptimal nodes to the new algorithms. 2010-03-09 21:25:37 -05:00
Greg Ward
76befe4a29 shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts.
Based on a patch by Benoit Boissinot, adapted to the pluggable sort
algorithm design.  toposort_reversepostorder() is a very good
performer; it's designed to recreate what the revlog would have looked
like if Mercurial had parent deltas now.  toposort_postorderreverse()
is unstable and very inconsistent, but perhaps with some work it could
be made better.
2010-03-09 21:22:01 -05:00
Greg Ward
b03d42b1e5 shrink-revlog: add --sort option for user-selectable toposort algorithm. 2010-02-25 09:16:39 -05:00
Greg Ward
5495f8a314 shrink-revlog: rename some local variables for consistency. 2010-03-09 21:30:19 -05:00
Greg Ward
b1905b686f shrink-revlog: instrument sort code to record statistics.
Notably, count "suboptimal" nodes (predecessor is not first parent)
and (with -v) report them at the end of the run.
2010-03-09 21:13:39 -05:00
Benoit Boissinot
dff5eacc8e remove contrib/hgdiff, it makes refactoring diff/patch harder
it can always be revived if needed
2010-03-09 18:27:02 +01:00
Steve Borho
5e4444fb42 wix: pre-check the 'I approve this license' checkbox
This is simply a convenience to the user, they can click next until the
installer goes away.  Optimally, the checkbox would be hidden or removed,
but that requires rewriting the UI.
2010-03-08 11:12:48 -06:00
Lee Cantey
15adb591a0 Make Readme.html reference current OS X release 2010-03-06 21:29:02 -08:00