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
Sune Foldager
b18c5efa94
win32/hgwebdir_wsgi: clarify documentation and clean up script a bit
2010-03-04 13:10:48 +01:00
Martin Geisler
ef18417e98
win32/hgwebdir_wsgi: clarify copyright license
2010-03-03 20:35:20 +01:00
Sune Foldager
a27039877b
add wsgi script for Microsoft IIS with isapi-wsgi
2010-03-03 14:42:43 +01:00
Adrian Buehlmann
5c235b09fe
contrib/wix: add COPYING.rtf
...
Moving the file from the misc directory of the thg-winbuild repo, which
uses mercurial's contrib/wix.
This file is displayed by the install UI sequence, so it belongs to the
WiX sources quite closely.
It happens to be installed by the msi installer, too.
2010-02-25 14:56:09 +01:00
Manpreet Singh
92eb9e2c61
Updated contrib/vim/patchreview.* to version 0.2.2
...
- Security fixes by removing custom tempfile creation
- Removed need for DiffReviewCleanup/PatchReviewCleanup
- Better command execution error detection and display
- Improved diff view and folding by ignoring modelines
- Improved tab labels display
2010-02-24 19:43:13 -08:00
Manpreet Singh
712fecc765
Updated contrib/vim/patchreview.* to version 0.2.1
...
1) adds a :DiffReview command to review code changes
in the current workspace.
2) removes the need to have patchutils (specifically filterdiff)
installed on the system by implementing patch extraction in
pure vim script.
2010-02-24 13:12:17 -08:00
Benoit Boissinot
2615e405ae
shrink: handle all combinations of inline/non-inline revlogs
2010-02-24 18:22:45 +01:00
Adrian Buehlmann
ba12ccbcb7
contrib/wix: switch *.wxs files to LF eol
2010-02-19 21:48:09 +01:00
Benoit Boissinot
72fa9a2788
shrink-revlog: remove unneeded imports and useless code
2010-02-19 02:11:37 +01:00
Benoit Boissinot
18bab73073
shrink-revlog: add strings for translation / import _ before using it
2010-02-19 02:07:13 +01:00
Adrian Buehlmann
3d25317a13
contrib/wix: MSVC CRT libraries are installed in WinSxS
...
not in %system32%
2010-02-18 20:47:12 +01:00
Steve Borho
58556829a8
Add WiX installer scripts to contrib/wix
2010-02-18 13:05:15 -06:00
Martin Geisler
e2e1279b27
progress: mark strings for translation
2010-02-17 23:07:50 +01:00
Benoit Boissinot
9399306905
regression: missing arg from 3067d5de9e6c dirstate.{walk,status} changes
2010-02-17 20:30:57 +01:00
Steve Borho
a6d934b6af
mergetools: improve configuration for several merge tools
...
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
2010-02-15 21:18:16 -06:00
Pascal Quantin
b4af915ca2
Add progress extension to win32 default config file
2010-02-14 23:17:28 +01:00
Matt Mackall
0bc7a87925
check-code: two more rules
...
- no plain Exceptions
- complain about unmarked ui messages
2010-02-13 23:20:17 -06:00
Benoit Boissinot
dccf4785fb
shrink: use progress API
2010-02-13 15:34:44 +01:00
Matt Mackall
a17b73e2eb
check-code: import some pylint checks
2010-02-09 13:53:24 -06:00
Benoit Boissinot
778deb93f5
pylintrc: string isn't deprecated, only some of its methods
2010-02-09 13:48:52 +01:00
Benoit Boissinot
9ab1f0678a
add pylintrc with some mercurial specific configuration
2010-02-08 15:06:26 +01:00
timeless@mozdev.org
4cd821593d
commands: Try to improve help options text for basic commands
...
Mostly rewrite -r text
2009-11-20 14:37:36 +02:00
Martin Geisler
4817fcfe96
check-code.py: make help strings consistent
2010-02-07 10:58:51 +01:00
Mads Kiilerich
289637cadf
check-code.py: escape backslash
2010-02-07 01:52:10 +01:00
Matt Mackall
1a71a75d3d
check-code: del isn't a function
2010-01-28 22:44:54 -06:00
Matt Mackall
f7b37826db
check-code: fix copyright date
2010-01-28 22:44:45 -06:00
Matt Mackall
6c94f28bab
check-code: add some ignore hints
2010-01-28 22:44:18 -06:00
Matt Mackall
3f5075a48f
check-code: check thyself
2010-01-25 01:23:34 -06:00
Matt Mackall
8d99be19f0
many, many trivial check-code fixups
2010-01-25 00:05:27 -06:00
Matt Mackall
9b0512d1f6
Introduce check-code.py
...
check-code is a simple regex-based framework for checking our code and
tests for common style and portability errors. Currently, it knows a
fair amount about our Python and C style, and a little about common
shell script portability problems.
2010-01-25 00:05:22 -06:00
Martin Geisler
a0fd2fa800
Merge with stable
2010-01-20 16:58:48 +01:00
Martin Geisler
a0c08172ed
mercurial.el: add forgotten version number
...
The number was accidentally removed in the change from GPLv2 to GPLv2+
in fba10de77fcb.
2010-01-20 16:48:20 +01:00
Matt Mackall
cd3ef170f7
Merge with stable
2010-01-19 22:45:09 -06:00
Matt Mackall
595d66f424
Update license to GPLv2+
2010-01-19 22:20:08 -06:00
Martin Geisler
5b8443bcff
Merge with stable
2010-01-16 02:40:00 +01:00
Patrick Mezard
ee36296620
shrink-revlog: add --dry-run option
2010-01-12 22:20:21 +01:00
Mads Kiilerich
2c377a4b1c
mercurial.spec: Alignment with AIX spec by Jim Hague
...
* Require Python 2.4 or later
* Note that hgk uses tk - but don't require it
* Remove bashism to support ksh
* Install mq.el
* Handle uncompressed man pages
2010-01-06 03:27:15 +01:00
Benoit Boissinot
e70eea1089
shrink-revlog: avoid cryptic error when used as an extension
...
When shrink-revlog is used as an extension, it would produce an error when
switching back to stable because the script will try to execute itself.
2010-01-11 21:44:04 +01:00
Pascal Quantin
9e8542ebfd
Update copyright year to 2010
2010-01-04 23:45:45 +01:00
Fabian Kreutz
a7bf3f1ac6
hgk: do not ignore ---/+++ lines in diff
2009-12-02 14:30:39 +02:00
Pascal Quantin
ba9e9478b8
Add help files to win32 installer (issue 1919)
2009-11-23 22:08:59 +01:00
Thomas Arendsen Hein
b795944ec3
Add missing bash_completion for qfinish
2009-11-12 12:46:00 +01:00
Patrick Mezard
e18a9b4ce6
contrib/perf: profile diff of working directory changes
2009-11-11 17:02:00 +01:00
Gilles Moris
dc8e526f5e
buildrpm: enhance changelog of the RPM file
...
Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag
As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.
2009-11-06 10:06:08 +01:00
Gilles Moris
22e16b7eb9
buildrpm: build full RPM package including sources
2009-11-06 09:59:55 +01:00
Gilles Moris
7f93b8d88a
buildrpm: cleanup script
2009-11-06 09:53:23 +01:00
Gilles Moris
90efd6a603
buildrpm: enable to start the script from anywhere
...
Previously the script worked only from the hg root.
2009-11-06 09:35:38 +01:00
Gilles Moris
99dbd348b2
buildrpm: warn if there is outstanding uncommitted changes
2009-11-06 09:30:18 +01:00
Gilles Moris
01c82a9f23
buildrpm: build from working dir parent and use hg version for RPM versioning
...
Previous, RPMs was always built from tip, and the release number did not match
the 'hg version' put in place for 1.4.
This will enable also to this script to be able to build official tag and not
only nightly build.
2009-11-06 09:26:29 +01:00
Jesse Glick
1c304ddf8b
Issue919: add a standard extension to recreate hardlinks between repositories.
...
Having to run a standalone Python script from the contrib dir is a nuisance.
Also makes various improvements to locking, file discovery, etc.
Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories
2009-11-05 17:38:03 -05:00
Dirkjan Ochtman
12c5890a70
kill trailing whitespace
2009-11-05 10:44:36 +01:00
Gilles Moris
bed857bb1e
update tcsh_completion for the new forget and summary commands
2009-10-24 12:29:39 +02:00
Gilles Moris
33dae3e063
mercurial.spec: update requirements for the build
2009-10-23 23:10:05 +02:00
Pascal Quantin
0c0e1b3aec
Add style.css file to Inno Setup script
2009-10-22 23:41:01 +02:00
Mads Kiilerich
0f7110ec11
Merge with redone 9660769e6539 (issue1860)
2009-10-16 11:19:39 +02:00
Steve Losh
d8eb61a4f6
contrib/bash_completion: add tab completion for some bookmark commands
2009-09-17 22:30:45 -04:00
Greg Ward
48fc9e07a3
Add script to rewrite revlog to workaround lack of parent deltas.
...
Defaults to rewriting the manifest in the current repository.
Based on a patch to rewrite-log by Benoit Boissinot that I found here:
http://article.gmane.org/gmane.comp.version-control.mercurial.general/11908
2009-08-27 10:21:32 -04:00
Kevin Bullock
7d9f94de98
bash_completion: add completions for shelve extension
2009-09-23 21:29:47 -05:00
Steve Borho
ef214fdcd8
Merge with crew-stable
2009-08-17 20:20:34 -05:00
Steve Borho
5d6c914525
iss: make mfc*.dll and msvc*.dll optional
...
mfc71.dll was only needed for Python2.4
msvc*.dll is similarly optional
Do not bail installer build if not found
2009-08-16 20:53:49 -05:00
Steve Borho
bef6f273c2
iss: take version from iscc command line or __version__.py
...
Requires InnoSetup Preprocessor to be installed.
2009-08-16 21:23:48 -05:00
Patrick Mezard
ef63c1e5f9
Mention GnuWin32 gettext in win32 build instructions
2009-07-19 18:23:37 +02:00
Brendan Cully
18d0727ce3
zsh completion: update bisect for builtin syntax
2009-06-30 19:23:50 -07:00
Brendan Cully
1ad5037a50
zsh completion: add hg branch
2009-06-30 18:47:16 -07:00
Brendan Cully
c6f44d1bc6
zsh completion: add hg branches
2009-06-30 18:45:09 -07:00
Brendan Cully
adcf3f9f6d
zsh completion: basic merge support
2009-06-30 18:41:43 -07:00
Brodie Rao
cc7929d81c
zsh completion: disable defaults and verbose output when completing
...
If ui.verbose is set to True in hgrc, commands used to provide completions
would yield bad results. For example, qpush completion would include the
patch numbers and statuses as returned by qunapplied -v, instead of just
the patch names.
Defaults are also disabled when completing to prevent similar issues when
an option is set that changes a command's output.
2009-06-30 17:58:17 -04:00
Brendan Cully
76c4e9d8bc
zsh completion: include guarded patches in qdelete
2009-06-30 14:31:16 -07:00
Steve Borho
164c094422
mercurial.ini: provide more useful info
...
* Add warning about not editing the site-wide file on Vista
* More detail about where to create user Mercurial.ini
* Provide examples for ssh tools
* List extensions, all disabled
* add [patch] section, for fixing patch behavior when using win32text
* example [extdiff] section, all disabled
* example [diff] section, all disabled
2009-08-03 23:27:25 -05:00
Patrick Mezard
c18b5e4660
Update win32 build instructions for rst2html
2009-07-19 18:44:20 +02:00
Patrick Mezard
5b2d10b6fe
Merge with crew-stable
2009-07-19 18:28:43 +02:00
Greg Ward
37b1525e95
localrepo: rename in-memory tag cache instance attributes (issue548).
...
- self.tagscache to self._tags
- self._tagstypecache to self._tagtypes
- this is for consistency, readability, privacy, and to subtly hint
that "caching" is something else
2009-07-16 10:39:41 -04:00
Nicolas Dumazet
7eadbe8d42
for calls expecting bool args, pass bool instead of int
...
str.splitlines and email.message.as_string both expect a bool argument
defaulting at False: replace f(1) by f(True) and f(0) by f()
2009-07-13 09:50:26 +09:00
Brendan Cully
1743b600cb
Relicense zsh completion script under zsh license.
...
Steve agreed some time ago.
2009-06-29 09:32:06 -07:00
Mads Kiilerich
230b15e299
Make RPM spec in contrib more aligned with the one from Fedora
...
This is mostly syntactical changes which make the real differences more obvious
when looking at a diff.
contrib/mergetools.rc is now also installed and enabled by default.
2009-06-24 03:05:01 +02:00
Dirkjan Ochtman
1d29e68744
change wiki/bts URLs to point to new hostname
2009-06-24 15:32:37 +02:00
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
