Bryan O'Sullivan
e824d5ba5d
convert/subversion: Simplify callback.
2007-07-18 22:44:25 -07:00
Thomas Arendsen Hein
eface5b265
merge with crew-stable
2007-07-19 07:28:27 +02:00
Bryan O'Sullivan
12b2410da4
convert/subversion: reduce memory usage by filtering early
...
This makes up to a 50% difference in memory consumption.
2007-07-18 19:56:36 -07:00
Bryan O'Sullivan
dd356c432e
Automated merge with http://hg.intevation.org/mercurial/crew
2007-07-18 19:47:22 -07:00
Bryan O'Sullivan
b5c4639e41
convert/subversion: get converter working against plain HTTP.
2007-07-18 17:44:52 -07:00
Bryan O'Sullivan
8d0f81f7cc
Simplify update.
2007-07-18 14:00:55 -07:00
Bryan O'Sullivan
5930d0695b
Simplify update.
2007-07-18 14:00:55 -07:00
Bryan O'Sullivan
f645e069a4
Better fix for issue 622 than we had in 287a2fbd37b0.
2007-07-18 13:56:08 -07:00
Bryan O'Sullivan
261434d5a1
Better fix for issue 622 than we had in 287a2fbd37b0.
2007-07-18 13:56:08 -07:00
Thomas Arendsen Hein
4d93912190
merge with main
2007-07-18 16:46:20 +02:00
Thomas Arendsen Hein
0fccb9b2ae
merge with crew-stable
2007-07-18 16:46:01 +02:00
Thomas Arendsen Hein
085838b3dc
fix test-tag on Solaris
2007-07-18 16:41:45 +02:00
Bryan O'Sullivan
118f017025
convert/subversion.py: str.rsplit is not available in Python 2.3
2007-07-17 15:47:32 -07:00
Bryan O'Sullivan
1c2ba2ab65
Automated merge with http://hg.intevation.org/mercurial/crew
2007-07-17 15:26:27 -07:00
Bryan O'Sullivan
4946c0febe
convert/subversion.py: fix bad assumptions about SVN path naming
...
The SVN converter assumed that the trunk and branches paths were fixed,
and immediately under the base of the SVN URL. Fix the second assumption,
and allow the trunk and branches paths to be reconfigured.
2007-07-17 15:24:59 -07:00
Patrick Mezard
dd336a8d1a
patch: patches should be read and written in binary mode when possible.
2007-07-17 23:35:24 +02:00
Patrick Mezard
ccc14e4990
patch: fix normalized paths separators.
2007-07-17 23:34:52 +02:00
Patrick Mezard
3979bd753f
posixfile_nt: '+' was understood as read mode instead of update.
2007-07-17 23:33:42 +02:00
Matt Mackall
d8a67c1df2
doc: typo, -x bit
2007-07-17 15:26:28 -05:00
Bryan O'Sullivan
1f2fa7bf13
convert/subversion.py: escape quotes to make code readable in Emacs
2007-07-17 13:08:50 -07: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
c824069322
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
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
e2e04c39f7
issue 622: pull/unbundle -u updates to default branch if repo was empty
2007-07-16 18:01:20 -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
e1c7de520a
mq: autodetect an existing git patch during qrefresh (issue 491)
2007-07-16 16:50:47 -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
Brendan Cully
d4bd9b2ed8
replace .hgtags instead of appending to it when doing a raw commit
2007-07-11 00:53:44 -07:00
