Commit Graph

83 Commits

Author SHA1 Message Date
Patrick Mezard
30764759c6 Merge with crew-stable 2009-09-06 15:32:16 +02:00
Patrick Mezard
da332667e9 convert: fix history topology when using hg.tagsbranch
When using hg.tagsbranch, all conversions fail at
transcribing the source repo topology with conversion
scenarios interleaving:
 - initial repo conversion,
 - then upstream tag
 - then later incremental conversion

The problem is caused by the usage of the last source
revid as source revid for the tagnode in the revision
map.

On a later incremental conversion, when resolving some
child commit of the true last source revid, convert
will parent the nodes to the tag node. If using
tagsbranch you get a bad topology where all incremental
commit nodes end up in the tag branch.

Analysis and test by Edouard Gomez <ed.gomez@free.fr>
2009-09-06 15:29:14 +02: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
Patrick Mezard
a848b6f227 convert: rewrite tags when converting from hg to hg 2009-06-01 17:12:42 +02:00
Patrick Mezard
e8585b2da9 convert: fail fast if source does not support --sourcesort 2009-06-01 17:12:39 +02:00
Patrick Mezard
7c73a84f65 convert: add --sourcesort option for source specific sort
Only supported by Mercurial source for now.
2009-06-01 17:12:39 +02:00
Patrick Mezard
64fcf86ad8 convert: better feedback when filtering out empty revisions
Original patch by Herbert Griebel <herbertg@gmx.at>
2009-05-24 18:30:59 +02:00
Patrick Mezard
c9834814d1 convert/hg: update documentation 2009-05-24 16:27:37 +02:00
Benoit Boissinot
fa38342899 convert: directly use nullid 2009-05-18 22:55:45 +02:00
Benoit Boissinot
04ba054816 convert: use set instead of dict 2009-05-17 03:04:17 +02:00
Martin Geisler
393fa0bd51 convert: add copyright and license headers to back-ends 2009-04-26 01:47:44 +02:00
Matt Mackall
2f9b02c62d replace util.sort with sorted built-in
This is marginally faster for small and moderately-sized lists
2009-04-26 16:50:44 -05:00
Matt Mackall
de487eacda ui: print_exc() -> traceback() 2009-04-26 16:50:44 -05:00
Ronny Pfannschmidt
0cd168d6ec switch lock releasing in the extensions from gc to explicit 2009-04-22 02:01:22 +02:00
Peter Arrenbrecht
8c3658a497 cleanup: whitespace cleanup 2009-03-23 13:13:27 +01:00
Peter Arrenbrecht
19591b6a8c cleanup: drop unused assignments 2009-03-23 13:13:06 +01:00
Peter Arrenbrecht
a2d3e23eef cleanup: drop variables for unused return values
They are unnecessary. I did leave them in localrepo.py where there is
something like:

  _junk = foo()
  _junk = None

to free memory early. I don't know if just `foo()` will free the return
value as early.
2009-03-23 13:13:02 +01:00
Matt Mackall
6ed04dc163 convert: change hg.saverev default to False
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
2009-03-02 19:19:12 -06:00
Matt Mackall
e0735a1762 error: move repo errors
rename NoCapability to CapabilityError
2009-01-12 10:42:31 -06:00
Matt Mackall
d15d559b7c errors: move revlog errors
- create error.py for exception classes to reduce demandloading
- move revlog exceptions to it
- change users to import error and drop revlog import if possible
2009-01-11 22:48:28 -06:00
Thomas Arendsen Hein
912f59bb30 Remove trailing spaces. 2008-10-24 15:00:40 +02:00
Patrick Mezard
a90ccace70 convert: correctly detect missing revlog for root revisions 2008-10-23 23:03:09 +02:00
Patrick Mezard
f10fc4ae24 convert: ignore hg source errors with hg.ignoreerrors (issue 1357)
This flag makes missing revlog errors to be ignored which allow broken
repositories to be fixed by converting them from and to Mercurial.
2008-10-21 21:24:47 +02:00
Martin Geisler
a791bcac31 i18n: mark strings for translation in convert extension 2008-08-31 16:12:02 +02:00
Dirkjan Ochtman
3e077a5422 strip trailing whitespace, replace tabs by spaces 2008-08-21 11:35:17 +02:00
Patrick Mezard
0eba22ee63 convert: implement startrev for hg source 2008-08-13 23:31:10 +02:00
Matt Mackall
a65ef7bc5d util: add sort helper 2008-06-27 18:28:45 -05:00
Matt Mackall
dcacfb3161 manifest: remove execf/linkf methods 2008-06-26 14:35:50 -05:00
Matt Mackall
fbb5127472 use repo[changeid] to get a changectx 2008-06-26 14:35:46 -05:00
Patrick Mezard
93bb017ccb convert: hg sink commits without working dir 2008-06-19 00:14:24 +02:00
Patrick Mezard
b0ebcaac98 convert: reintegrate file retrieval code in sinks
It simplifies the sink interface and all the sinks to handle files data as they
want.
2008-06-19 00:14:24 +02:00
Joel Rosdahl
c26213193c Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg 2008-03-06 22:51:16 +01:00
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Joel Rosdahl
5dae3059a0 Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
Thomas Arendsen Hein
deb94bc7fe Removed trailing spaces from everything except test output 2008-03-07 00:24:36 +01:00
Patrick Mezard
79c0636ca8 Merge with crew-stable 2008-01-26 20:04:31 +01:00
Patrick Mezard
fd2ee26173 convert: hg.clonebranches must pull missing parents (issue941) 2008-01-26 19:55:04 +01:00
Patrick Mezard
494df8c5f5 convert: mercurial sink must be local 2008-01-21 22:24:28 +01:00
Thomas Arendsen Hein
ddce807d45 merge with crew-stable 2008-01-22 00:55:01 +01:00
Edouard Gomez
2d7c3fefd7 convert: respect hg.tagsbranch setting 2008-01-09 00:27:33 +01:00
Patrick Mezard
4200777a7b test-convert: test before() and after() conversion actions 2008-01-04 23:43:55 +01:00
Bryan O'Sullivan
314630c85c convert: some tidyups, doc improvements, and test fixes
The various back end options are now documented.
The hg source can now be configured not to hand out a revision ID.
2007-11-27 09:44:09 -08:00
Bryan O'Sullivan
eff109c7b0 convert: tell the source repository when a rev has been converted
This lets us roundtrip changes between svn and hg.
2007-11-26 17:23:20 -08:00
Bryan O'Sullivan
d991d10d66 convert: save hg revision during a convert
This breaks hg->hg hash roundtripping, but that was fragile, didn't work
reliably, and hence arguably of little value.
2007-11-26 14:01:31 -08:00
Alexis S. L. Carvalho
8775f8f81c convert: make sure mercurial_source has a local hg repo 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
fe9d865e0d convert: display all errors if we couldn't open the source repo
This should give the user a better hint of what's going wrong.

Improve some error messages.  In particular, mention "CVS checkout" instead
of "CVS repo".

Fixes issue822 and issue826.
2007-11-09 20:21:35 -02:00
Bryan O'Sullivan
0ec99ed035 convert: refactor sink initialisation, to remove hardcoding of hg
We also introduce options to explicitly set the source and destination
repository types.

Improve testing of corner cases a little.
2007-10-10 15:42:00 -07:00
Bryan O'Sullivan
1264846224 convert: add default constructor for converter_sink 2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
6df62fb77c convert: make contents of "extra" dict available from sources, for sinks.
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict.  Ugh.
2007-10-10 15:30:00 -07:00
Bryan O'Sullivan
27bb37764f convert: report errors more meaningfully if run with --traceback 2007-10-10 00:15:33 -07:00