facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity
13,214 Commits 24 Branches 62 Tags 320 MiB
dc0a2bb9fd
Commit Graph

799 Commits

Author SHA1 Message Date
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
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
Greg Ward
d14ca44965 shrink-revlog: help/doc tweaks 
- make it look right in 'hg help extensions'
- clarify --revlog option
- add a main program to tell users this is no longer a standalone script
 2010-01-12 15:12:53 +01:00
Pascal Quantin
d31ffd58b5 Add shrink-revlog.py to win32 installer 2010-01-07 23:04:53 +01:00
Patrick Mezard
97e153876e shrink-revlog: make it work on windows (issue1976) 2010-01-11 21:15:53 +01:00
Dirkjan Ochtman
33f1b017fa contrib: small documentation fixes in shrink-revlog.py 2010-01-07 16:06:36 +01:00
Dirkjan Ochtman
865f446247 contrib: turn shrink-revlog.py into an extension 2010-01-07 16:06:12 +01:00
Dirkjan Ochtman
012ee6cd41 contrib: fix error handling in shrink-revlog.py to be more hg-like 2010-01-07 15:12:16 +01:00
Dirkjan Ochtman
bd89648509 contrib: use ui to write in shrink-revlog.py 2010-01-07 15:07:18 +01:00
Martin Geisler
1a65fd1163 Merge with stable. 2010-01-05 22:41:39 +01:00
Pascal Quantin
7de2b2725b Add RelaxNG schema to win32 installer 2010-01-01 15:30:21 +01:00
Augie Fackler
678623416a dirstate: don't check state of subrepo directories 2009-12-31 17:19:30 -06:00
Robert Bachmann
45906c924c Added RelaxNG schema for hg log XML output format 2009-12-30 02:44:37 +01:00
Patrick Mezard
1657ad7d2c mercurial.iss: update locale location 2009-12-16 22:18:15 +01:00
Pascal Quantin
ac9b895522 mercurial.iss: add tcsh completion script 2009-12-10 23:57:14 +01:00
Martin Geisler
b3d1267494 mercurial.iss: backout 2e80adec97b9 
Not a complete backout, the bash_completion script is still installed.
 2009-12-10 22:28:09 +01:00
Martin Geisler
24f2c1af20 setup: backout 47cfa8aa4b94 
We decided that it is better to let the distributions install these
files themselves since they know where to put them.
 2009-12-10 22:26:09 +01:00
Martin Geisler
e34a6ee1e1 contrib: helper extension to track memory usage 2009-12-05 00:15:17 +01:00
Benoit Boissinot
f50a5b9c25 shrink-revlog: improve performance: use changegroup instead of revisions 
Before:
real	0m23.971s

Now:
real	0m4.229s

The only case where the output would be different is if the newer hg was using
a different diff algorithm than used originally.
 2009-12-04 15:36:13 +01:00
Pascal Quantin
dd2d04c211 Update win32 installer paths for bash and zsh scripts after move done in 47cfa8aa4b94 2009-12-04 07:52:30 +01:00
Dan Villiom Podlaski Christiansen
a6c07a0720 setup: install some useful data files. 
The selection is somewhat arbitrary. In the case of the Zsh completion
file, it will not conflict with the builtin Zsh completions: they
are in a file named `_mercurial', not `_hg'.
 2009-11-30 21:54:34 +01:00
Pascal Quantin
862fafc1f6 Update win32 installer with changes from 0e00643abaf7 2009-12-03 22:34:51 +01:00
Martin Geisler
f96631075b Merge with stable 2009-12-03 01:06:15 +01:00
Alexander Solovyov
a3cf7dd75b perf.perflog: add option to follow renames 2009-11-25 00:02:02 +02:00
Brendan Cully
c66c7e7f6e zsh completion: add summary 2009-11-24 11:20:25 -08: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
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
Matt Mackall
bc715be859 add __len__ and __iter__ methods to repo and revlog 2008-06-26 14:35:50 -05:00
Lee Cantey
9090ffe5c4 Fix bad span tag in Readme 2008-05-25 13:39:08 -07:00
Neal Becker
4d6f13d80e mergetools.hgrc patch 2008-04-16 15:26:37 -07:00
Paul Moore
7113d144ac Add a batch file driver for Windows 2008-04-10 23:07:54 +02:00
Adrian Buehlmann
c7aabb085a contrib: fix binary file issues with dumprevlog on Windows 
* Fix traceback on dumprevlog: open revlog in mode 'rb' (binary)
* Set stdio to binary mode so that redirected data is not modified

References:
http://selenic.com/pipermail/mercurial/2008-March/018330.html
http://selenic.com/repo/index.cgi/hg/rev/0f20f68c768c
 2008-04-04 16:39:44 +02:00
Matt Mackall
96d3666c86 add simple dump and undump scripts to contrib/ 2008-03-31 21:49:32 -05:00
Bryan O'Sullivan
548c365ad9 mercurial.el: note new Emacs VC mode support 2008-03-27 12:52:41 -07:00
Patrick Mezard
8ad14a4450 convertrepo: make it work with refactored convert extension 2008-03-23 21:41:03 +01:00
Patrick Mezard
0c0a818562 hgk: display orphan revisions content (issue 1041) 2008-03-23 18:52:02 +01:00
Patrick Mezard
449fc02367 Make churn an official extension 2008-03-22 18:01:46 +01:00
Dennis Schoen
ccbd3f1b72 hgk: don't exit if mercurial commands only print warnings 2008-01-16 11:50:24 +01:00
Jonas Diemer
e984394797 Fixed bash completion for filenames containing spaces. 2008-03-11 23:54:03 +01:00
Stephen Deasey
8fd0ead6b5 churn: show comitter email addresses unclipped (bug 1023) 
Email addresses were being clipped at a hard-coded 20 chars. Measure
the length of all email addresses and accommodate the longest.
 2008-03-09 17:34:55 +00:00
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Thomas Arendsen Hein
deb94bc7fe Removed trailing spaces from everything except test output 2008-03-07 00:24:36 +01:00
Thomas Arendsen Hein
6f399a19b1 merge backout 2008-02-18 19:21:33 +01:00
Thomas Arendsen Hein
4d33c02751 Backed out changeset 8105fa3c7347 (see issue971/msg5317) 2008-02-18 19:20:22 +01:00
Bryan O'Sullivan
dfa3e1ea9b profiling: allow CGI and FastCGI to be profiled 2008-02-01 13:09:45 -08:00
Thomas Arendsen Hein
3d1d8b45c7 Fixed typo: Gnerating -> Generating 2008-02-01 00:25:32 +01:00
Armin Ronacher
14aa65e30c added \r for progress counting in churn extension 2008-01-31 23:42:21 +01:00