Commit Graph

10713 Commits

Author SHA1 Message Date
Patrick Mezard
3cefb24597 convert/svn: handle files/links replaced by dirs (issue2166) 2010-05-09 19:11:02 +02:00
Patrick Mezard
c25c428f66 convert/svn: do not retrieve removed files
It gives us a way to not retrieve content of entries we know are no longer
files. And it is faster when converting remote repositories.
2010-05-09 19:11:02 +02:00
Patrick Mezard
1cb53b6a8f convert/svn: correctly encode deleted entry paths
This recode call was removed in 597805361f86, because it looked the
encode(decode()) construct was a no-op. In fact, the first decode() call was
wrong, and entries still have to be encoded before being passed to the sink.
2010-05-09 19:11:02 +02:00
Patrick Mezard
c5e014e3e0 convert/svn: remove broken but unused copy filtering code
For some reason, if a copy source is deleted in the same revision it is
referenced, it is filtered out. This is silly, because this happens all the
time with move operations. Fortunately, the filtering code is buggy and ends
being a no-op 99% of the time, since it does not delete the right key. Just
remove all this nonsense.
2010-05-09 19:11:02 +02:00
Patrick Mezard
cb10fb5dd3 test-convert-svn-move: test moved dirs copy records 2010-05-09 19:11:02 +02:00
Patrick Mezard
ce447a0bd6 convert/svn: tree conflicts no longer happen now we use memctx 2010-05-01 16:29:27 +02:00
Martin Geisler
0f12cdee49 commands: explain that "hg serve" does not do authentication 2010-05-07 17:03:31 +02:00
Martin Geisler
03fe3d3627 commands: explain that "hg serve" is mostly for ad-hoc sharing 2010-05-07 17:01:14 +02:00
Brendan Cully
4d11a5bfea grep: clarify help for -r 2010-05-03 15:22:47 -07:00
Matt Mackall
60271b58eb Added signature for changeset 53507b778ebd 2010-05-01 16:02:51 -05:00
Wagner Bruna
d2ede753bb i18n-pt_BR: synchronized with 0f0816bb2880 2010-05-01 17:55:44 -03:00
Matt Mackall
127aa795db Merge with i18n 2010-05-01 15:08:30 -05:00
Faheem Mitha
5fe5a6e7b6 mq: rewrite strip docstrings
This patch is joint work with ilowe.
2010-05-01 23:04:49 +05:30
Mads Kiilerich
76f4bb870c test-issue2137: don't use $PWD; use pwd instead
This fixes test failure on Solaris, as described on
http://mercurial.selenic.com/wiki/WritingTests
2010-05-01 19:24:51 +02:00
Mads Kiilerich
7c7a8e770e test-mq-merge: quote ^
^ is magic on Solaris and must be quoted
2010-05-01 19:24:49 +02:00
Mads Kiilerich
5e49c62ca7 test-extension: changed environment variables must be exported again
This fixes failure on Solaris because HGRCPATH wasn't unset.
2010-05-01 19:24:46 +02:00
Wagner Bruna
707cfea20f subrepo: add test for issue1977 2010-04-30 19:50:37 -03:00
Wagner Bruna
e4cfca8a2e subrepo: update test output for issue1977 fix 2010-04-30 19:49:35 -03:00
Matt Mackall
53ab4498e1 subrepo: propagate and catch push failures 2010-04-30 18:32:18 -05:00
Wagner Bruna
52fb80e608 i18n-pt_BR: synchronized with dea59174415a 2010-04-30 17:39:56 -03:00
Nicolas Dumazet
09283d5a0c static-http: mimic more closely localrepo (issue2164: allow clone -r )
* httprangereader: name, __iter__ and close are needed to mimic file object
* static-http opener:
    - disallow write/append modes
    - add (unused) atomictemp parameter
* static-http repo:
    - root attribute is needed for localrepo.dirstate()
    - _branch* attributes are required for commitctx and branchmap calls
* tags: force repo.opener.__iter__ call earlier to force httprangereader
  to try to read the cache early, to avoid raising IOError later.
2010-04-26 20:13:14 +09:00
Dan Villiom Podlaski Christiansen
16da932a11 dispatch: don't mangle ImportError abort messages
Previously, Mercurial assumed that the last word of the string
representation was the name of the moduled that was imported. This
assmption is incorrect, despite being true for the common case of an
exception raised by the Python VM.

For example, hgsubversion raises an ImportError with a helpful message
if the Subversion bindings were not found. The final word of this
message is not meaningful on its own, and is never the name of a
module.

This patch changes the output printed to be a simple stringification
of the exception instance. In most cases, this will be `abort: No
module named X!' rather than `abort: could not import module X!'.

No functionality change; all tests pass.
2010-04-30 18:11:56 +02:00
Benoit Boissinot
e1d4a8491c relink/progress: correctly handle the no file to relink case 2010-05-01 14:36:48 +02:00
Michael Glassford
f37b4abb21 schemes: fix // breakage with Python 2.6.5 (issue2111)
Recent Pythons (e.g. 2.6.5 and 3.1) introduce a change that causes
urlparse.urlunparse(urlparse.urlparse('x://')) to return 'x:' instead of 'x://'i and
urlparse.urlunparse(urlparse.urlparse('x:///y')) to return 'x:/y' instead of 'x:///y'.
Fix url.hidepassword() and url.removeauth() to handle these cases.
2010-04-08 11:00:46 -04:00
Dan Connolly
3a8d40d5c3 log: document the new xml style 2010-04-28 13:36:06 -05:00
Matt Mackall
e40531cc47 Merge with i18n 2010-04-28 13:45:21 -05:00
Patrick Mezard
b7c02777e0 util: fix default termwidth() under Windows
sys.stdout.write('-'*80 + '\n')

or

  sys.stdout.write('-'*80 + '\r')

do not work on Windows as they do on unix. On a 80 columns Windows console, the
extra CR or LF are interpreted as if belonging to the next line, so the first
command displays 2 lines (only one on unix) and the second one leave the line
visible and move back to the following line. To avoid this, we sacrifice one
column under Windows.
2010-04-26 22:30:40 +02:00
Faheem Mitha
a231e38798 commands: revised documentation of 'default' and 'default-push'
This patch was a collaborative effort between faheem, mg, timeless and
ilowe.
2010-04-27 00:44:06 +05:30
Patrick Mezard
8207527bd4 test-convert-git: be tolerant to git output variants 2010-04-26 14:40:34 +02:00
Patrick Mezard
438c49a871 convert/git: check status when reading output stream 2010-04-25 23:07:46 +02:00
Patrick Mezard
7dba5c05ca convert/git: check status when reading the whole output 2010-04-25 22:59:50 +02:00
Patrick Mezard
cadf5fd884 convert/git: rename gitcmd() into gitopen() for readability 2010-04-25 22:32:27 +02:00
Martin Geisler
aa7bc3741f hgrc.5: mention lists as well 2010-04-25 17:11:36 +02:00
Martin Geisler
61ede1530c hgrc.5: describe form of config values 2010-04-25 16:46:26 +02:00
Wagner Bruna
6bbaafbc55 i18n-pt_BR: synchronized with ff0d9f139923 2010-04-24 01:30:24 -03:00
Wagner Bruna
52b1ff0e0d merge with i18n stable 2010-04-24 01:34:55 -03:00
Jens Bäckman
0ca3a8ed52 i18n-sv: translated a few messages 2010-04-19 18:57:16 +02:00
Jens Bäckman
437388c648 i18n-sv: syncronized with b8a6d9274f73 2010-04-19 18:40:02 +02:00
Brett Cannon
8e100766b6 subrepo: fix repo root path handling in svn subrepo 2010-04-18 14:20:08 -07:00
Faheem Mitha
d7c81ab4be Document 'default' and 'default-push' in paths docstring 2010-04-14 11:59:53 +05:30
Benoit Boissinot
189189e360 test-git-import: better testing, check nodeids 2010-04-16 01:57:53 +02:00
Benoit Boissinot
788c113d09 context: fix bug introduced in f2d764a0939e, path should be used 2010-04-16 01:57:32 +02:00
Sune Foldager
a81e6a76a5 prepush: rewrite most of the code from scratch
For servers with branchmap support, the algorithm now works as follows:

1. A list of branches in outgoing changesets is created.
2. Using the remote branchmap, a check for new branches is performed.
3. A map (from branch to head list) of locally known remote heads before
   the push is created, and one which, after step 4, will contain the locally
   known remote heads after the push.
4. The post-push head map is updated with the outgoing changesets, using the
   branch cache update mechanism.
5. A check for new heads is performed, by comparing the length of the head list
   before and after push, for each branch. If there are new heads, an error
   depending on whether or not there are incoming changes on the branch,
   is returned.
6. If the push is allowed, a warning is written if there are incoming changes
   on any branches involved in the push.

For old servers, an algorithm similar to step 4-6 above is used to check for
new topological heads only.

Two bugs are also fixed:
1. Sometimes you would be allowed to push new branch heads without --force.
   A test for this case was added.
2. You would get the "note: unsynced remote changes!" warning if there were any
   incoming changesets, even if they were on unrelated branches.
2010-04-15 21:59:21 +02:00
Benoit Boissinot
d2fd3d1bf8 run-tests.py: can't remove from os.environ on solaris 2010-04-15 20:25:07 +02:00
Benoit Boissinot
73bdc48646 workingctx: correctly compute the flag for noexec filesystems+merge
This bug happens if the filesystem doesn't support exec-bit, during merges,
for example in 0b01431fee25 on the hg repo.
If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is
based on p1, and the FS doesn't support the exec-bit, the dirstate can't
"guess" the right bit.
We instead fix it in workingcontext.flags()/manifest.
2010-04-15 18:08:48 +02:00
Benoit Boissinot
36f866b9f2 simplify test-issue2137, make it more portable 2010-04-15 15:21:41 +02:00
Benoit Boissinot
042c3ae681 add documentation for revlog._prereadsize 2010-04-15 15:21:21 +02:00
Greg Ward
81511c58c5 revlog: fix lazyparser.__iter__() to return all revisions (issue2137)
Previously, it only returned revisions that were in the revlog when it
was originally opened; revisions added since then were invisible.
This broke revlog._partialmatch() and therefore repo.lookup().

(Credit to Benoit Boissinot for simplifying my original test script
and for the actual fix.)
2010-04-14 15:06:40 -04:00
Greg Ward
fac8084184 revlog: factor out _maxinline global.
This lets us change the threshold at which a *.d file will be split
out, which should make it much easier to construct test cases that
probe revlogs with a separate data file.
(issue2137)
2010-04-13 17:58:38 -04:00
Peter Arrenbrecht
da567ef452 prepush: add more test cases 2010-04-14 19:35:54 +02:00