Commit Graph

936 Commits

Author SHA1 Message Date
Steve Borho
f81fa9164b wix: a new mercurial.js has replaced graph.js 2011-04-30 11:53:57 -05:00
Augie Fackler
d47b2c1afa shrink-revlog: defend against null first parents 2011-04-29 09:28:45 -05:00
Augie Fackler
74615b75c0 shrink-revlog: use a bundler object (see cddd91650ec7) 2011-04-29 08:04:54 -05:00
Augie Fackler
fb1853a333 shrink-revlog: update util.opener to scmutil.opener after d26b1348d3f6 2011-04-29 08:01:10 -05:00
Augie Fackler
c61c6d6b7c shrink-revlog: remove \ from docstring 2011-04-29 07:38:12 -05:00
Idan Kamara
169899ab9c check-code: separate warnings to avoid repetitive str.startswith 2011-04-25 13:03:26 +03:00
Idan Kamara
83e05de083 check-code: warn about naked except clauses 2011-04-23 00:52:21 +03:00
Andreas Freimuth
0a5e675fad hg-ssh: fix duplicate word in docstring 2011-04-22 16:43:06 +02:00
Adrian Buehlmann
cf126bb7dd move opener from util to scmutil 2011-04-20 19:54:57 +02:00
Matt Mackall
a8dd64dcb0 misc: replace .parents()[0] with p1() 2011-04-04 16:21:59 -05:00
Matt Mackall
7fbf746bf2 changegroup: fold progress meter into callbacks
progress meters now start at 1 rather than 0
2011-03-28 11:18:56 -05:00
Matt Mackall
f94b6206a0 changegroup: combine infocollect and lookup callbacks 2011-03-28 11:18:56 -05:00
Dan Villiom Podlaski Christiansen
ecb9e72af1 osutil: replace #import with #include, and add a check for it 2011-03-23 23:05:32 +01:00
Matt Mackall
b156bda724 osutil: fix up check-code issues 2011-03-23 09:41:58 -05:00
Steve Borho
4b3a38e051 merge with stable 2011-03-18 13:01:18 -05:00
Steve Borho
ebbe78951f wix: add new file templates/paper/bookmarks.tmpl
This file was snuck onto the stable branch with 77ea38e46cc8
2011-03-18 11:36:36 -05:00
Steve Borho
4f66f8741b mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Not all applications needed the workarounds, so I did not add alternate keys for
every Windows merge application.
2011-03-08 13:35:01 -06:00
Steve Borho
f6f81fe744 wix: drop bin/ folder from MSI installers (issue 2673)
Also fixes issue 2658.
2011-03-08 10:03:01 -06:00
Gilles Moris
cd3e15208e contrib: update tcsh_completion for Mercurial 1.8
Added the following commands: bookmarks debugignore.
Fix the tcsh parse script for the current help text layout.
2011-03-01 07:28:20 +01:00
Augie Fackler
790d2fac2d zsh completion: complete bookmarks where they are accepted
This used to work because bookmarks were pseudo-tags, but broke
once bookmarks became their own first-class object.
2011-02-28 19:15:08 -06:00
Kevin Bullock
3a4f89086c bash_completion: complete bookmarks
Since bookmarks moved into core and are no longer merged with the list
of tags (8e2d23f4bd25), they don't get completed in bash_completion
along with other revision specifiers. This adds a new function to
provide the list of bookmarks for completion, and another, _hg_labels(),
to list all tags, branches, and bookmarks. It further modifies
completion for all commands where '_hg_tags; _hg_branches' was used to
use '_hg_labels' instead.
2011-02-28 16:45:15 -06:00
David Soria Parra
362bc7e128 hgk: display bookmark in commit diff window 2011-02-23 00:25:18 +01:00
David Soria Parra
9e74296485 hgk: display bookmarks as gray labels in the commitline 2011-02-23 00:25:01 +01:00
David Soria Parra
1e08f0a83e hgk: read bookmarks 2011-02-23 00:24:21 +01:00
Dan Villiom Podlaski Christiansen
ec590d5cd4 explicitly close files
Add missing calls to close() to many places where files are
opened. Relying on reference counting to catch them soon-ish is not
portable and fails in environments with a proper GC, such as PyPy.
2010-12-24 15:23:01 +01:00
Adrian Buehlmann
281d62d169 contrib: add win32/buildlocal.bat 2011-02-13 11:14:46 +01:00
Javi Merino
20536933b3 hgk: gitk->hgk in About... menu 2011-02-14 07:39:21 +00:00
Adrian Buehlmann
77ab03f101 port win32.py to using the Python ctypes library
The pywin32 package is no longer needed.

ctypes is now required for running Mercurial on Windows.

ctypes is included in Python since version 2.5. For Python 2.4, ctypes is
available as an extra installer package for Windows.

Moved spawndetached() from windows.py to win32.py and fixed it, using
ctypes as well. spawndetached was defunct with Python 2.6.6 because Python
removed their undocumented subprocess.CreateProcess. This fixes
'hg serve -d' on Windows.
2011-02-14 11:12:26 +01:00
Martin Geisler
a76e121863 backout of e4cb9628354c
Matt and a majority of crew did not like this approach.
2011-01-27 11:15:08 +01:00
Martin Geisler
77e1343f88 check-code: do not complain about 'ls x | foo -v'
Such a line was introduced in test-subrepo-git.t in 686775e575f3,
which made check-code confused.
2011-01-26 12:35:02 +01:00
Martin Geisler
d23e1973c2 specify C indention style using Emacs file local variables 2011-01-26 12:05:01 +01:00
Matt Mackall
dc0a2bb9fd perf: restore lazyindex hack
This hack (and the module it lives in) exist so that performance can
be compared across different hg versions.
2011-01-18 15:55:49 -06:00
Benoit Boissinot
0e3e49c93d perf: there is no lazy index anymore 2011-01-15 12:28:10 +01:00
Matt Mackall
186cb7506d perf: fix ordering of invalidate in perfindex 2011-01-12 11:34:42 -06:00
Matt Mackall
76efe52d35 perf: make perfindex results useful on hg with lazyparser 2011-01-11 17:01:14 -06:00
Matt Mackall
846d35e24f revlog: only build the nodemap on demand 2011-01-11 17:01:04 -06:00
Matt Mackall
efaaee2894 revlog: remove lazy index 2011-01-04 14:12:52 -06:00
Steve Borho
8ab85e67c4 merge with stable 2011-01-08 22:15:19 -06:00
Pascal Quantin
8b6499714d win32: add cacert.pem file to Inno Setup installer 2011-01-08 11:18:38 +01:00
Patrick Mezard
da2f1496a7 bash_completion: support record command 2011-01-07 20:50:41 +01:00
Steve Borho
33365c466e wix: add an ssl certificate file to the WiX installers 2010-12-29 18:27:56 -06:00
Steve Borho
933f43725b merge with stable 2010-12-30 23:36:50 -06:00
Matt Mackall
940fa28a3f check-code: catch os.path.relpath 2010-12-16 14:50:37 -06:00
Matt Mackall
cdcb8c0f47 check-code: catch "except as" 2010-12-16 14:50:36 -06:00
Steve Borho
1d324e9771 wix: allow x86 MSI packages to be installed on x64 systems 2010-11-26 20:05:16 -06:00
Steve Borho
f2a3ea2967 wix: add support for x64 native MSI packages 2010-11-26 17:40:13 -06:00
Steve Borho
a95ec762fd wix: switch Mercurial Windows installer to use py2exe --bundle 3
--bundle 3 leaves all of the compiled C extensions and other DLLs outside of
the library.zip, so we no longer add the installer folder to the system PATH.
Instead, we now ship a small bin/hg.cmd and it is placed in the PATH.

Switching to py2exe --bundle 3 is necessary because the higher bundle options
are not supported on x64.
2010-11-26 16:18:19 -06:00
Thomas Arendsen Hein
3669dce8b1 check-code: single check for Python keywords used as a function
This replaces the specific checks for del/and/or/not/except and additionally
checks other Python keywords.
2010-12-03 12:04:31 +01:00
Thomas Arendsen Hein
31218f1044 check-code: check for gratuitous whitespace after Python keywords 2010-12-03 11:23:38 +01:00
Steve Borho
dd3fe52932 Merge with stable 2010-11-26 20:08:03 -06:00
Steve Borho
473937df1f Merge with stable 2010-11-26 18:04:10 -06:00
Martin Geisler
6a3d9310ab code style: prefer 'is' and 'is not' tests with singletons 2010-11-22 18:15:58 +01:00
Adrian Buehlmann
5e2e71ea82 check-code: catch Python 'is' comparing number or string literals
The Python 'is' operator compares object identity, so it should
definitely not be applied to string or number literals, which Python
implementations are free to represent with a temporary object.

This should catch the following kinds of bogus expressions (examples):

  x is 'foo'     x is not 'foo'
  x is "bar"     x is not "bar"
  x is 42        x is not 42
  x is -36       x is not -36

As originally proposed by Martin Geisler, amended with catching
negative numbers.
2010-11-21 11:52:27 +01:00
Martin Geisler
ca016e40cb check-code: catch 'ls filename --option' case as per 8745def6e53b 2010-11-17 09:37:57 +01:00
Martin Geisler
9d82b9ed1f check-code: using and/or/not as a function is bad style 2010-11-11 00:08:09 +01:00
Dan Villiom Podlaski Christiansen
f385faac7a *: kill all unnecessary shebangs. 2010-10-26 12:18:39 +02:00
Dan Villiom Podlaski Christiansen
080231037c *: add executable bit to a few files that were missing it. 2010-10-26 12:18:37 +02:00
Steve Borho
85bbdcc648 wix: add subrepos help text 2010-10-25 10:07:54 -05:00
Azhagu Selvan SP
f5c025b9a9 mercurial.el: fix hg-outgoing path when 'default-push' is not defined
hg-outgoing path is set as 'default-push' which prevents it from working in
repos which only have 'default' defined.

Fix provided by Kyujin Shim at
http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html
2010-10-20 18:15:47 +05:30
Steve Borho
44d93504ff wix: add vim syntax file for Mercurial unit tests 2010-10-20 16:45:08 -05:00
Steve Borho
c84eb2535b wix: add new help page templates 2010-10-20 16:41:17 -05:00
Steve Borho
9663c6a39b wix: add new merge-tools.txt help text 2010-10-20 16:27:24 -05:00
Matt Mackall
0f064b0796 check-code: warning and fixes for whitespace in unified tests 2010-10-20 14:57:36 -05:00
Martin Geisler
77ce66fb6a check-code: find trailing whitespace 2010-10-20 10:13:04 +02:00
Adrian Buehlmann
758fc721d8 check-code: add 'no tab indent' check for unified tests
and fix the offending tests accordingly
2010-10-16 18:09:01 +02:00
Benoit Boissinot
3040e3e352 parentdelta: compress.py extension is no longer necessary
Using `hg --config format.parentdelta=True clone --pull src dst` is equivalent.
2010-10-12 08:30:15 -05:00
Benjamin Pollack
cf93a0a8f8 windows: handle spaces in path to Python (issue2074) 2010-10-09 18:04:36 +02:00
Eduard-Cristian Stefan
2ad7399c8a hgk: remember main window position 2010-10-06 23:07:52 +03:00
Steve Losh
9c8327389c contrib/vim: add a syntax file for unified tests
This syntax file adds:

* Highlighting of comments, output, and commands (with sh highlighting
  in commands).
* Folding for output and blocks of commands+output.
* Setting tab/indent settings to 2 spaces, because that's what's defined by the
  unified test file format.
2010-09-26 20:43:43 -04:00
Dan Villiom Podlaski Christiansen
8e99053714 tests: compatibility fix.
'touch -d *' doesn't work on Mac OS X. In order to prevent this from
occuring again, a check for the case is added to 'check-code.py'.
2010-09-21 18:36:23 +02:00
Matt Mackall
5d9fc42983 tests: drop a bunch of sed calls from unified tests 2010-09-21 16:44:13 -05:00
Matt Mackall
0c59a109d6 check-code: add some basic support for unified tests 2010-09-21 12:41:24 -05:00
Matt Mackall
a624bd1945 bundle: fix shrink-revlog bundle usage 2010-09-20 16:25:29 -05:00
Matt Mackall
4b4d939b00 bundle: get rid of chunkiter 2010-09-19 12:51:54 -05:00
Matt Mackall
43940bec52 bundle: make getchunk() a method 2010-09-18 18:20:34 -05:00
Pascal Quantin
8779a2558c win32: update build instructions with correct CRT version
As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you
compile an application with MSVC 2008 SP1 it is bound by default to the
original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1.
If the wrong CRT version is embedded in the Inno Setup installer, with a PC
that does not have the MSVC 2008 redistributable package installed, hg will
refuse to launch with an error: "the system cannot execute the specified
program".
2010-09-16 11:36:38 +02:00
Pascal Quantin
79b606ed69 win32: 64-bit Inno Setup installer 2010-09-11 18:48:03 +02:00
Pascal Quantin
58f110611d win32: update Inno Setup build instructions with up-to-date software 2010-09-11 09:48:10 +02:00
Brendan Cully
fc79a72f03 zsh completion: bookmarks support 2010-09-05 13:37:17 -07:00
Brendan Cully
94254d16e4 zsh completion: patchbomb support 2010-09-04 01:32:01 -07:00
Martin Geisler
c3c7fa090f Merge with stable 2010-08-30 13:00:22 +02:00
Pascal Quantin
80eb33b604 win32: add hgweb scripts to Inno Setup installer 2010-08-29 23:16:31 +02:00
Pascal Quantin
be74e290e0 win32: add Emacs scripts to Inno Setup installer 2010-08-29 22:57:24 +02:00
Mads Kiilerich
cd19e3668d mercurial.spec: specify file modes for install 2010-08-26 23:11:03 +02:00
Martin Geisler
1b1861d1eb Merge with stable 2010-08-27 13:18:25 +02:00
Benoit Boissinot
2a5344e149 contrib/compress: compress should activate parentdelta 2010-08-22 19:41:04 +02:00
Benoit Boissinot
f1dc9e3787 contrib/compress: correct ordering of copying
Changelog should always be copied last, otherwise readers can see an
inconsistent repo.
2010-08-22 19:27:09 +02:00
Benoit Boissinot
b68994148f contrib/compress: refactor revlog copying 2010-08-22 19:26:07 +02:00
Benoit Boissinot
ca7a857d7d contrib/compress: use store API instead of a collector 2010-08-22 19:13:30 +02:00
Benoit Boissinot
984cffb62e contrib/compress: proper lock handling
Lock the src repo before beginning the compression and lock the destination
repo before copying the revlogs.
Proper handling of exceptions.
2010-08-22 18:29:30 +02:00
Benoit Boissinot
349b6aaab5 contrib/compress: use hg API to compute the destination path 2010-08-22 18:23:32 +02:00
Benoit Boissinot
e7a85d1ff5 contrib/compress: use repo's transaction method 2010-08-22 18:21:30 +02:00
Benoit Boissinot
75b2e19c12 contrib/compress: remove unused variables 2010-08-22 18:18:36 +02:00
Yann E. MORIN
f3a35cc478 mq/qqueue: update bash completion 2010-08-18 23:37:26 +02:00
Renato Cunha
49f7aba937 hgfixes: added a fixer to convert changes in the email package
This patch adds a fixer that accounts for changes in python packages, as the
framework provided by lib2to3 is only able to track changes in module names.
This fixer (hopefully) can fix any change in one-level hierarchies.

To exemplify, this fixer can successfully change an import from
"email.MIMEMultipart" to "email.mime.multipart".
2010-08-08 15:48:58 -03:00
Renato Cunha
c4578da8bf contrib/setup3k.py: added script to build hg with py3k
This patch implements a script that inherits most of its functionality from
hg's setup.py and adds support to calling 2to3 during invocation with python3.
The motivation of having this script around is twofold:

 1) It enables py3k crazies to test mercurial in py3k and, hopefully, patch it
    more easily, so it can improve the py3k support to eventually run there.

 2) Being separated from the main setup.py eliminates the need to make hg's
    setup.py even more cluttered, and enables "independent" development until
    the port is done.

Some considerations about the structure of this patch:

Mercurial already overrides the behavior of build_py, this patch tweaks it a bit
more to add support to call 2to3 with a custom fixer* location for Mercurial.
There is also a need of having the core C modules built *before* the
translation process starts, otherwise 2to3 will think those are global modules.

* A fixer is a python module that transforms python 2.x code in python 3.x
code.
2010-08-03 13:18:16 -03:00
Pradeepkumar Gayam
a444183249 contrib: simple extension to practically convert a repo from tip delta to parentdelta 2010-08-10 22:28:30 +05:30
Martin Geisler
ec0bf03276 Merge with stable 2010-08-15 18:13:46 +02:00
Martin Geisler
888421d8ca check-code: catch "echo -n" in tests 2010-08-15 17:48:05 +02:00
Mads Kiilerich
e26e44a190 mercurial.spec: gettext is a build requirement for getting proper localization 2010-08-14 01:31:57 +02:00
Martin Geisler
e7bd3fc69a Merge with stable 2010-08-14 03:30:35 +02:00
Alecs King
00c728120d check-code: add exit status
so that we can use it in a shell command combination and/or in hg hooks.
2010-08-12 16:42:41 +08:00
Yann E. MORIN
af2d086089 mq/qqueue: enable bash completion
Return the list of available queues when completion is attempted on qqueue.
2010-08-08 23:10:08 +02:00
Renato Cunha
f65cf06e03 check-code: added a check for calls to the builtin cmp function 2010-08-07 16:13:53 -03:00
Yuya Nishihara
3cdd1e55b0 zsh completions: add qpush --move option 2010-08-07 15:32:33 +09:00
Renato Cunha
49c247ab1e hgfixes: added a fixer that makes bytes to be formatted correctly
This patch implement a fixer that replaces all calls to the '%' when bytes
arguments are used to a call to bytesformatter(), a function that knows how to
format byte strings. As one can't be sure if a formatting call is done when
only variables are used in a '%' call, these calls are also translated. The
bytesformatter, in runtime, makes sure to return the "raw" % operation if
that's what was intended.
2010-08-03 13:59:14 -03:00
Renato Cunha
48aa19eddb py3kcompat: added a "compatibility layer" for py3k
This patch adds some ugly constructs. The first of them is bytesformatter, a
function that formats strings like when '%' is called. The main motivation for
this function is py3k's strange behavior:

>>> 'foo %s' % b'bar'
"foo b'bar'"
>>> b'foo %s' % b'bar'
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: unsupported operand type(s) for %: 'bytes' and 'bytes'
>>> b'foo %s' % 'bar'
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: unsupported operand type(s) for %: 'bytes' and 'str'

In other words, if we can't format bytes with bytes, and recall that all
mercurial strings will be converted by a fixer, then things will break badly if
we don't take a similar approach.

The other addition with this patch is that the os.environ dictionary is
monkeypatched to have bytes items. Hopefully this won't be needed in the
future, as python 3.2 might get a os.environb dictionary that holds bytes
items.
2010-08-03 13:52:48 -03:00
Renato Cunha
09994866c3 hgfixes: add a fixer to convert plain strings to bytestrings
This patch implements a 2to3 fixer that converts all plain strings in a python
source file to byte strings syntax. Example:

foo = 'Normal string'

would become

foo = b'Normal string'

The motivation behind this fixer can be found in
http://selenic.com/pipermail/mercurial-devel/2010-June/022363.html or, in other
words: the current hg source assumes that _most_ strings are "meant" to be byte
sequences, so it makes sense to make the convertion implemented by this patch.

As mentioned above, not all mercurial modules want to use strings as bytes,
examples include i18n (which uses unicode), and demandimport (in py3k, module
names are normal strings, thus unicode, and there's no need for a convertion).
Therefore, these modules are blacklisted in the fixer. There are also a few
functions that can take only unicode arguments, thus the convertion shouldn't
be done for those.
2010-08-03 13:41:47 -03:00
Nicolas Dumazet
3186d42f7f perf: break down long line 2010-07-31 11:41:42 +09:00
Pradeepkumar Gayam
02c67b2a97 perf: add perfrevlog function to check performance of revlog 2010-07-27 20:50:09 +05:30
Matt Mackall
661034417e check-code: add warning on lines over 80 characters 2010-07-25 17:10:32 -05:00
Brodie Rao
bfa13e8d9a bash/zsh completion: use HGPLAIN when invoking hg (issue2297) 2010-07-21 17:06:00 -04:00
Martin Geisler
71971a8928 check-code: warn about untranslated ui.warn calls 2010-07-16 14:40:57 +02:00
Martin Geisler
177012ed6e Merge with stable 2010-07-22 10:49:55 +02:00
Vishakh H
dc91b670e1 contrib: add debugshell extension 2010-07-20 23:29:49 +05:30
Matt Mackall
6c780d7b4f check-code: add --blame switch 2010-07-16 13:26:39 -05:00
Martin Geisler
12085cad2b check-code: catch dict.has_key 2010-07-16 14:48:52 +02:00
Martin Geisler
f985c9d777 Merge with stable 2010-07-16 14:45:52 +02:00
Renato Cunha
29ee0d7c07 check-code: added check for reduce usage 2010-07-14 23:15:03 -03:00
Renato Cunha
f678753e0c check-code: check for tuple parameter unpacking (missing in py3k) 2010-07-14 23:15:00 -03:00
Martin Geisler
5fbbb27c25 Merge with stable 2010-07-09 14:21:45 +02:00
Martin Geisler
59385f10e8 check-code: add test for callable 2010-07-09 14:01:55 +02:00
Martin Geisler
9fd4048b8f Merge with stable 2010-07-06 20:43:19 +02:00
Martin Geisler
fabfcd3971 mergetools.hgrc: add vimdiff
Imported from deb_specific__mergetools patch in Debians patch queue:

  http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
2010-07-03 02:15:25 +02: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
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
Steve Borho
912f22c7ae merge with stable 2011-03-08 14:55:31 -06:00
Steve Borho
a549e552c4 merge with stable 2011-03-08 10:25:18 -06:00
Martin Geisler
950ba1a21f zsh completion: remove computed default values from help texts
The default encoding and encoding mode are computed at runtime and can
vary from system to system. The two remaining default values in the
completion help texts (number of directories to strip on import and
default bundle name) are fixed in the source code.
2011-03-08 11:01:01 +01:00
Martin Geisler
e8a21642ee check-code: catch "echo > $HGRCPATH" too
Make error message consistent with the other error messages.
2011-03-02 14:52:31 +01:00
Martin Geisler
11500eaa6f check-code: better check for overwriting $HGRCPATH
Suggested by Mads Kiilerich on IRC.
2011-03-02 14:22:50 +01:00
Martin Geisler
83c27fb95f tests: don't overwrite HGRCPATH
Overwriting instead of appending to the file removes the [defaults]
section put into the file by run-tests.py.

It also defeats the --inotify option to run-tests.py.

(Nothing was broken yet, but the lack of -d "0 0" cause changeset
hashes to change unexpectedly in a test case I was editing.)
2011-03-01 17:01:17 +01: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