Patrick Mezard
70ab7b4b41
mq: add qnew --git option
2007-07-28 20:15:54 +02:00
Bryan O'Sullivan
e5831bba91
convert: empty log messages are OK as of d10c8cd5d283
2007-07-27 14:30:20 -07:00
Brendan Cully
0c1f3fe27b
Merge with bos
2007-07-26 14:04:48 -07:00
Brendan Cully
987acabeef
convert svn: canonicalize path before calling url_from_path.
...
Otherwise libsvn has a tendency to abort().
2007-07-26 14:02:49 -07:00
Bryan O'Sullivan
930e85e029
convert: get rid of ugly use of hasattr
2007-07-26 13:36:53 -07:00
Bryan O'Sullivan
4b8b41843e
convert: get rid of "hg." prefix where not needed
2007-07-26 13:34:36 -07:00
Bryan O'Sullivan
30c0638736
convert: add filename filtering and renaming support
2007-07-26 13:34:36 -07:00
Bryan O'Sullivan
2eb79e019f
convert: acquire/release locks periodically
2007-07-26 13:34:36 -07:00
Bryan O'Sullivan
73b8ede983
convert: Support Mercurial as a source, as well as a sink
2007-07-26 13:34:36 -07:00
Bryan O'Sullivan
787a42c2b2
convert: make commit constructor clearer and less magical
2007-07-26 13:34:36 -07:00
Bryan O'Sullivan
fe20ca5067
convert: rename mapfile to revmapfile, so we can map more than just revs
2007-07-26 13:34:36 -07:00
Brendan Cully
bd0ce0a313
convert svn: try to extract URL from source if it is a working directory
2007-07-26 10:57:26 -07:00
Brendan Cully
eb0a3e666b
convert: urlify svn repos if necessary.
...
We should also try to extract the URL from an svn working directory.
2007-07-26 10:42:44 -07:00
Matt Mackall
3dfe783ec5
transactions: avoid late tear-down (issue641)
...
We use weak references (ugh) to avoid having to manually delete
transaction references out of each call frame when an exception occurs.
2007-07-22 14:53:57 -05:00
Matt Mackall
cd72dc7f1b
Merge with crew
2007-07-21 16:44:38 -05:00
Matt Mackall
3a3bd8ec5b
Make repo locks recursive, eliminate all passing of lock/wlock
2007-07-21 16:02:10 -05:00
Matt Mackall
3e13c68628
Use try/finally pattern to cleanup locks and transactions
2007-07-21 16:02:10 -05:00
Matt Mackall
c2967290a5
dirstate: add __contains__ and make __getitem__ more useful
...
dirstate.state(f) == '?' -> f not in dirstate
dirstate.state(f) -> dirstate[f]
2007-07-21 16:02:09 -05:00
Matt Mackall
bab511ec55
dirstate: make wjoin function private
2007-07-21 16:02:09 -05:00
Matt Mackall
cf691df912
dirstate: break update into separate functions
2007-07-21 16:02:09 -05:00
Thomas Arendsen Hein
c8973835b3
test-alias: Removed fallback to parentui, no longer needed since 681da44cf9e4
2007-07-21 17:56:30 +02:00
Thomas Arendsen Hein
95c8d3f7f8
Remove unused pprint import and the commented line which used it before.
2007-07-21 10:43:29 +02:00
Thomas Arendsen Hein
4c6cff621b
Backout 5d79f5ed74d4 and replace ''' with """ to make some highlighting happy.
...
I have tried Debian's default emacs and the current CVS version. Default emacs
doesn't have highlighting enabled (and being emacs-illiterate I don't know how
to enable it) and the CVS emacs' Python highlighting has no problems with '
characters here.
2007-07-21 10:36:51 +02:00
Thomas Arendsen Hein
d9d3256252
removed trailing whitespace
2007-07-21 10:30:51 +02:00
Bryan O'Sullivan
17119bef10
convert/subversion: rehandle the no-tags case
2007-07-19 15:33:21 -07:00
Bryan O'Sullivan
c303898fbc
convert/subversion: work around memory leak in svn's python bindings
...
The svn.ra.get_log wrapper attaches the hash of changed paths for every
log entry to a global memory pool, so memory consumption increases
rapidly, with no way to free it.
Our workaround is to call this function in a child process, and feed
its results back over a pipe. The memory consumption of the child still
grows huge (hundreds of megabytes), but at least it goes away once the
reading-the-log phase is done.
2007-07-19 12:41:07 -07:00
Bryan O'Sullivan
e824d5ba5d
convert/subversion: Simplify callback.
2007-07-18 22:44:25 -07: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
118f017025
convert/subversion.py: str.rsplit is not available in Python 2.3
2007-07-17 15:47:32 -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
Bryan O'Sullivan
1f2fa7bf13
convert/subversion.py: escape quotes to make code readable in Emacs
2007-07-17 13:08:50 -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
Bryan O'Sullivan
3ab73cd145
mq: autodetect an existing git patch during qrefresh (issue 491)
2007-07-16 16:50:47 -07:00
Bryan O'Sullivan
a4a1d041e4
patchbomb: add --desc, to specify a file containing a series description
2007-07-16 14:43:47 -07: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
Brendan Cully
ee2cc772b4
convert: record the source revision in the changelog
2007-07-13 08:28:57 -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
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
Brendan Cully
864d59c393
python 2.3 does not have sorted
2007-07-06 10:29:09 -07:00
Brendan Cully
27d64c4447
convert: svn code movement (no actual changes)
2007-07-05 16:14:01 -07:00
Brendan Cully
58d7e42923
convert: svn: avoid parsing already-seen logentries due to branch following
2007-07-05 15:01:31 -07:00
Brendan Cully
ed4c3cf173
Merge with main
2007-07-05 14:32:18 -07:00
Brendan Cully
24a607c530
convert: svn: some improvements in memory usage
2007-07-05 14:31:13 -07:00
Brendan Cully
ddffa36984
convert: svn: remove svn_paths wrappers
2007-07-05 12:45:41 -07:00
Brendan Cully
d1cc733573
convert: svn: use revmap to parse only new revisions in incremental conversions
2007-07-05 12:41:58 -07:00
