Commit Graph

5623 Commits

Author SHA1 Message Date
Patrick Mezard
c182383712 test-import: read email payload in binary mode 2007-11-10 21:30:43 +01:00
Patrick Mezard
d9ba22f633 convert: fix util.popen regression in darcs converter 2007-11-10 17:09:56 +01:00
Alexis S. L. Carvalho
2e160ca8ff merge with crew-stable 2007-11-09 21:24:25 -02:00
Alexis S. L. Carvalho
0086f97dc7 mq: really remove undo after a qpush (and after a strip)
For qpush, removeundo has to be called after the transaction has finished.

strip may use unbundle, which also leaves an undo file.

Fixes issue780.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
f8788ac266 httprepo: give self._url and the netloc to the password manager
This should hide some differences between different python versions.
2007-11-09 20:21:35 -02:00
Matt Mackall
3418169510 clarify rm -A 2007-11-09 10:45:58 -06:00
Steve Borho
ddde53112b hgweb: make web.name default to repo basename
Providing the full path to the repository by default
could be considered a security risk.
2007-11-29 20:47:41 -06:00
Matt Mackall
d3de4f56b7 Merge with crew 2007-11-07 21:13:56 -06:00
Matt Mackall
62438e2d34 Add note to CONTRIBUTORS file 2007-11-07 21:10:30 -06:00
Bryan O'Sullivan
68c398d741 convert: add support for Subversion as a sink 2007-11-07 18:26:59 -08:00
Bryan O'Sullivan
4b5495f397 convert: abstract darcs's commandline handling 2007-11-07 17:40:39 -08:00
Bryan O'Sullivan
bb3b51ecf1 convert: iterate 2007-11-07 17:07:14 -08:00
Bryan O'Sullivan
857e67d5db convert: abstract map files into a class 2007-11-07 17:06:02 -08:00
Matt Mackall
10b354f4a5 Mark failing test as a known bug 2007-11-07 14:38:04 -06:00
Bryan O'Sullivan
33c2bc9eb9 Merge with -stable 2007-11-05 13:20:24 -08:00
Manuel Holtgrewe
4a33cb8d98 Do not display passwords with pull/push/incoming/outgoing
Passwords specified in the repository URL are now displayed as '***'
when accessing the remote repository.
2007-11-05 20:29:32 +01:00
Alexis S. L. Carvalho
9877d9e85e run-tests.py: add a default --date "0 0" argument to commit et al
Part of test-tags was modified just to be sure this works.

The change in test-archive-symlinks is necessary to avoid a "helpful"
warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
cde5fb5024 tests/*: avoid losing the original settings from $HGRCPATH 2007-11-09 20:21:35 -02: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
Alexis S. L. Carvalho
959d3f5cd4 test-convert-darcs: skip if we can't find the elementtree module
This patch is a bit dirty to avoid having to repeat the dance required
to import elementtree.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
bb984a6137 test-permissions: add a chmod +w to allow the directory to be removed 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
8dd3103fe5 run-tests.py: don't print a dot for skipped tests 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
c4d02f3fdf purge: simplify safety net for case mangling filesystems
Relying on the exact return of statwalk would cause us to abort
when there was at least one tracked file inside an ignored directory.

This patch forces an extra walk of the whole working directory even
on sane filesystems, where it wouldn't be needed.

Fixes issue621.
2007-11-09 20:21:35 -02:00
Maxim Dounin
084e15f969 Fix dir-changed-to-file updates on clean workdir.
Workaround for dir-changed-to-file updates mentioned
in rev c3f3393b9096 doesn't actually work since tests
introduced in mentioned changeset prevented dirstate
updates even if working directory updates succeded.

Make tests more relaxed for dirstate operations
not directly accessible from cli. See also issue660.

While here, move _dirs existance check from _decpath()
to _changepath() for unification.
2007-11-07 22:57:28 +01:00
Peter Arrenbrecht
bfb3ae9d06 Support qgoto in contrib/bash_completion. 2007-11-05 08:41:22 +01:00
bdowning@lavos.net
95bc1b9c93 hgk: change config file from .gitk to .hgk
Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible.  Whenever I run one, the other gets reset to the default screen position.  This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.
2007-11-03 21:50:11 +01:00
Patrick Mezard
f616d2f864 Merge with crew-stable 2007-11-03 17:06:44 +01:00
Rocco Rutte
49a794484a hgweb_mod: update unidiff() calls and finish f2af74bd8f86 job 2007-11-03 17:04:42 +01:00
Bryan O'Sullivan
27b71bbba8 Merge with stable. 2007-11-02 14:45:05 -07:00
Bryan O'Sullivan
2a0ef5ab06 Fix context iterator. 2007-11-02 14:44:33 -07:00
Bryan O'Sullivan
6605c95531 Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
2007-11-02 14:02:28 -07:00
Bryan O'Sullivan
c050342f77 Merge with -stable. 2007-11-02 12:15:39 -07:00
Rafael Villar Burke ext:(%22)
163660fdbe Update convert help text
Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.
2007-11-02 20:09:21 +01:00
Bryan O'Sullivan
0aabd6e0d0 Merge with crew. 2007-11-01 15:22:22 -07:00
Bryan O'Sullivan
e08db629ad Merge with crew-stable. 2007-11-01 15:22:10 -07:00
Hollis Blanchard
9d5f9ce7a0 Handle patches with misformatted empty lines
Insert a space on empty lines which are missing a control character.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
I frequently receive emailed patches with empty lines represented as "\n\n",
where Mercurial expects them to be "\n \n". patch(1) applies these patches
without complaint, but qpush fails all hunks.
2007-11-01 17:15:50 -05:00
Dustin Sallings
bebcdac954 Use both the from and to name in mdiff.unidiff.
This fixes a compatibility issue with git diffs.
* * *
2007-11-01 12:17:59 -07:00
Patrick Mezard
90a7d714cf Merge with crew-stable 2007-11-01 12:37:17 +01:00
Patrick Mezard
6aa1e21320 Fix Windows os.popen bug with interleaved stdout/stderr output
See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.
2007-11-01 12:05:14 +01:00
Bryan O'Sullivan
e2b7124fbc Merge with crew-stable. 2007-10-30 16:56:01 -07:00
Elliott Peele
dae15f3456 https url handling: usernames and passwords were registered to the wrong url 2007-10-30 16:54:25 -07:00
Patrick Mezard
e3792eb143 convert: fail if an external required tool is not found 2007-10-30 22:14:15 +01:00
Patrick Mezard
d3a63f2008 Merge with crew-stable 2007-10-28 09:47:54 +01:00
Christian Ebert
b5976042a1 patchbomb: no traceback if (diffstat) confirmation is refused 2007-10-28 09:25:35 +01:00
Patrick Mezard
7df367eed1 test-execute-bit: skip if execute-bit is not supported 2007-10-27 20:23:46 +02:00
Bryan O'Sullivan
2e7ccc7ee4 See if execute bit is honoured when we go back in time 2007-10-26 16:43:13 -07:00
Alexis S. L. Carvalho
d5cac48462 Honour the exec bit when we go back in time.
Fixes issue801.
2007-11-05 18:49:35 -02:00
Benoit Boissinot
37290329f4 fix typo in convert help text, update test 2007-11-05 20:15:33 +01:00
Maxim Dounin
8561d688a1 Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.

This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
2007-11-05 20:05:44 +03:00