Patrick Mezard
3979bd753f
posixfile_nt: '+' was understood as read mode instead of update.
2007-07-17 23:33:42 +02:00
Bryan O'Sullivan
bbc8c72100
Update test output to reflect small changes in patch chattiness.
2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
6c741e45c0
patch.py: re-add the ability to use an external patch program
...
This is now invoked by default only if ui.patch is set. Otherwise, we
use our built-in patch. If that fails because it can't find any valid
hunks, we'll fall back to trying the external patch command.
2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
78c5b7bde0
patch.py: don't mark files as changed unless they have actually been changed
2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
691d74d7d4
patch.py: fix some incorrect uses of _() for i18n
2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
590b9213d3
Add Chris Mason's mpatch library.
...
The original repo is http://oss.oracle.com/mercurial/mason/mpatch
2007-07-17 09:39:30 -07:00
Alexis S. L. Carvalho
ae58d97874
merge with crew-stable
2007-07-17 09:28:01 -03:00
Alexis S. L. Carvalho
b476b55a4a
convert: manually set encoding to UTF-8
...
Right now the backends assume we're working in UTF-8 and there's
no good way to ignore the encoding when adding revisions.
2007-07-17 09:08:29 -03:00
Alexis S. L. Carvalho
4770c831b2
hg parents: don't pass an OS-specific path to repo.filectx
...
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
2007-07-17 09:08:29 -03:00
Thomas Arendsen Hein
26fba570c8
merge with main
2007-07-17 08:22:43 +02:00
Bryan O'Sullivan
39c3672fd0
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
...
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
ef448328f7
issue 622: pull/unbundle -u updates to default branch if repo was empty
2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
3ab73cd145
mq: autodetect an existing git patch during qrefresh (issue 491)
2007-07-16 16:50:47 -07:00
Matt Mackall
642976187f
contexts: improve filectx eq test
2007-07-16 17:39:03 -05:00
Matt Mackall
90ef8d6105
Merge with -stable
2007-07-16 17:30:34 -05:00
Bryan O'Sullivan
a4a1d041e4
patchbomb: add --desc, to specify a file containing a series description
2007-07-16 14:43:47 -07:00
Matt Mackall
1e9e9e4cdd
merge: fix unnecessary rename merges on linear update (issue631)
...
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
2007-07-15 14:43:38 -05:00
Thomas Arendsen Hein
db8622096e
merge with crew-stable
2007-07-15 21:05:38 +02:00
Thomas Arendsen Hein
3d7a9209df
convert: Use clone's behaviour for the default destionation name.
...
Adjusted the documentation for this and for the fact that the destionation is
created even if a name is specified.
2007-07-15 21:04:07 +02:00
Patrick Mezard
afa316b160
Merge with crew-stable.
2007-07-15 14:57:20 +02:00
Patrick Mezard
9ce0928703
test-symlink-basic: require symlinks availability
2007-07-15 14:09:56 +02:00
Matt Mackall
86ab3ea033
Merge with -stable
2007-07-14 13:34:40 -05:00
Matt Mackall
6a7cb8cbaa
diff: correctly handle combinations of whitespace options
2007-07-14 12:44:47 -05:00
Patrick Mezard
a17aa86e69
Add hghave utility and run-tests.py support.
...
hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with:
"$TESTDIR/hghave" symlink || exit 80
The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.
2007-07-14 18:34:06 +02:00
Patrick Mezard
4e0f588756
run-tests: extract correct status when script terminates with exit
2007-07-14 14:01:11 +02:00
Jesse Glick
5b3c852e55
typo fix
2007-07-12 10:55:49 -04:00
jon.christopher@Rigaku.com
db9543cd23
Re: mercurial.el and hg-version-other-window
...
hg-version-other window is unimplemented in mercurial.el. The version
below works for me, YMMV.
2007-07-14 11:27:58 -05:00
Giorgos Keramidas
827573f6ad
hg grep: handle re.compile errors & update tests/test-grep
2007-07-09 17:41:14 +03:00
Alexis S. L. Carvalho
e4f786c463
archive: make the %r escape work.
2007-07-11 19:56:16 -03:00
Alexis S. L. Carvalho
3b07689b6a
serve: respect settings from .hg/hgrc
...
create_server was looking only at the root ui object, ignoring any
settings from .hg/hgrc. To keep respecting command-line arguments,
commands.serve must also call repo.ui.setconfig.
2007-07-11 19:56:16 -03:00
Christian Ebert
7a47878736
Use isinstance instead of type == type
2007-07-06 12:02:43 +02:00
Brendan Cully
ee2cc772b4
convert: record the source revision in the changelog
2007-07-13 08:28:57 -07:00
Wesley J. Landaker
49f06e37cf
Use wsgi.url_scheme instead of ad-hoc CGI checks.
...
Instead of each place in hgweb_mod that needs to check for SSL or get
the protocol scheme (http vs. https) doing it ad-hoc, make them just
look at the wsgi.url_scheme which because of previous patches is now
always set correctly.
2007-07-12 22:55:44 -07:00
Brendan Cully
a0b3ae0fbb
cosmetics
2007-07-12 22:44:16 -07:00
Wesley J. Landaker
90ae651c49
Make hg serve set the wsgi.url_scheme property correctly.
...
This fixes the bug where hg serve with SSL will always detect the wrong
urlbase for templates. This is also part of unifying the CGI interface
and hg serve interface to both use standard wsgi.
2007-07-12 13:58:36 -06:00
Wesley J. Landaker
feb6c32251
Handle CGI SSL detection via HTTPS environment better.
...
Some servers send on/off, 0/1, yes/no, and may be upper or lower case.
This fix will handle all of those permutations. It was inspired by the
detection done in in some other wsgi python web applications I looked at.
2007-07-12 13:55:20 -06:00
Alexis S. L. Carvalho
05dd580e30
merge with crew-stable
2007-07-11 20:15:03 -03:00
Wesley J. Landaker
034dcaed92
Make {urlbase} work in templates when https is used.
2007-07-10 10:54:54 -06:00
Brendan Cully
cd69031532
replace .hgtags instead of appending to it when doing a raw commit
2007-07-11 00:53:44 -07:00
Brendan Cully
c685e57a99
handle nonexistent .hgtags in raw _tag
2007-07-11 00:34:35 -07:00
Brendan Cully
7530fee196
Export extra in _tag so convert can set the branch of a tag
2007-07-11 00:04:15 -07:00
Brendan Cully
5421e55633
archive: abort on empty repository. Fixes #624 .
2007-07-10 10:06:24 -07:00
Brendan Cully
98b8fae908
mq: improve qclone error handling when patch directory is not a repository.
2007-07-10 09:52:32 -07:00
Lee Cantey
04ba8da4cb
Fix test-debugcomplete for new --certificate option
2007-07-09 22:35:10 -07:00
Brendan Cully
4654693aa4
Add SSL support to hg serve, activated via --certificate option
2007-07-09 22:12:28 -07:00
Lee Cantey
1515fb9031
Correct inadvertent line ending change.
2007-07-09 10:59:49 -07:00
Lee Cantey
244b7b7c94
Fix for win32text corrupting files that have CRLF line endings. (issue302)
...
Also generate a warning when encountering this condition.
From Shun-ichi Goto in attachment win32text-patch3.txt for issue 302.
2007-07-09 10:46:41 -07:00
Thomas Arendsen Hein
5a9970a155
Add --line-number option to hg annotate (issue506)
...
Line numbers are separated from the last annotation element with a colon,
like with many other commands, e.g. (hg) grep or compiler errors.
Idea and tests by FUJIWARA Katsunori.
2007-07-08 19:59:02 +02:00
FUJIWARA Katsunori
03774e057f
Allow filectx.annotate to return the line number of first appearance.
2007-07-08 19:46:04 +02:00
Thomas Arendsen Hein
5501bd63c6
Check for conflict markers in hgmerge (issue471)
2007-07-08 13:44:41 +02:00
