facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity
10,565 Commits 24 Branches 62 Tags 322 MiB
c82c9a473d
Commit Graph

643 Commits

Author SHA1 Message Date
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