Commit Graph

622 Commits

Author SHA1 Message Date
Dan Villiom Podlaski Christiansen
4ed28d7664 maps: don't set the `seen' attribute in TagMap.__init__().
This seems like something left over from copying RevMap.__init__();
the attribute does not make sense for TagMap, nor is it ever expected
to have it.
2010-06-23 11:37:03 +02:00
Dan Villiom Podlaski Christiansen
9f1cd17db5 stupid: lower patch application failure output to verbose.
There is no reason to notify all users when patches fail to apply, as
we are able to handle it internally.
2010-06-22 22:43:01 +02:00
Dan Villiom Podlaski Christiansen
630b6fa132 test_rebuildmeta: use just added diff support when comparing files. 2010-06-23 13:42:53 +02:00
Dan Villiom Podlaski Christiansen
9b4929ac3c test_util: add assertMultiLineEqual() method.
This method is based on code from the CPython py3k branch; it prints
out a diff on failure.
2010-06-22 21:58:24 +02:00
Augie Fackler
747d8b134a wrappers: cope with remoteui move to hg (hg cset 1d4f3581cbe5) 2010-06-13 00:10:53 -05:00
Augie Fackler
f18467bb2a util: handle change to hg.parseurl from d6ca622d1122 2010-06-12 20:32:02 -05:00
Augie Fackler
c78907439a svnrepo: support new discovery module introduced in 8bff0f5944ea 2010-06-12 20:55:23 -05:00
Augie Fackler
9a684b65f0 pull: handle argspec change from a00aac92bfb9 2010-06-12 20:09:25 -05:00
Dan Villiom Podlaski Christiansen
41162d88dc svncommands: add two missing imports
Two imports used when printing tracebacks were missing. They were
easily missed as this code isn't exercised unless an exception happens
to be raised during the execution of one of the `svn' subcommands.
2010-05-15 20:33:05 +02:00
Augie Fackler
2b51d7f616 tests/run.py: make sure our hgsubversion loads correctly 2010-05-18 14:46:50 -05:00
Dan Villiom Podlaski Christiansen
f5f972b21f testrunner: use demandimport, with an option to disable it 2010-05-14 20:27:24 +02:00
Dan Villiom Podlaski Christiansen
5cce3e0739 testrunner: delay and `simplify' importing of tests 2010-05-14 20:26:06 +02:00
Dan Villiom Podlaski Christiansen
a352cd9d64 setup: check for Subversion by importing the `svnwrap' module. 2010-05-14 20:27:14 +02:00
Dan Villiom Podlaski Christiansen
3ea18817b9 svncommands: fix layering violation & tweak error messages.
Importing `SubversionException' directly from `svn.core' is a layering
violation: Anything within the Subversion bindings should only be
accessed via svnwrap.

The advantages to doing this are twofold: we only need to intercept
missing bindings in one place, and we have the option of supporting
alternate bindings. As an added bonus, the recently-added support for
intercepting missing Subversion bindings actually works.

Two error messages are tweaked to remove `It appears...' from one
error message (just blaming Subversion instead) and make both errors
include the URL in the suggested command line.
2010-05-14 20:22:32 +02:00
Dan Villiom Podlaski Christiansen
a0077c3bfc testrunner: use optparse 2010-05-14 17:39:26 +02:00
Dan Villiom Podlaski Christiansen
38127671b5 svnwrap: use SubversionConnectionException instead of mercurial.util.Abort
This makes svnwrap independent of Mercurial.
2010-05-14 14:21:25 +02:00
Dan Villiom Podlaski Christiansen
d7942f767d push: remove superfluous creation of a new `svnremoterepo' instance. 2010-05-12 20:16:40 +02:00
Dan Villiom Podlaski Christiansen
96678cc2bc svn_swig_wrapper: improved handling of missing or outdated bindings.
Instead of aborting with a generic message when Subversion bindings
are missing, provide a helpful message. Also, the version check is
refactored to make it easier to bump our requirements in the
future. Finally, error messages are shorten so they fit in 80 columns
along with the standard `abort: ' prefix.
2010-04-30 17:35:36 +02:00
Patrick Mezard
f6b98ef530 wrappers: fix pull output if termwidth() is inexact
This is going to happen soon on Windows.
2010-04-26 22:17:25 +02:00
Augie Fackler
2324ef4fac stupid: update monkeypatch for 440f7a03198c 2010-04-22 22:37:03 -05:00
Dan Villiom Podlaski Christiansen
d9a170cac6 pull: fix passing credentials in URL.
Previously, the parsed URL - with credentials removed - was used for
instantiating a new svnremoterepo instance. One option for fixing this
is using the unparsed URL for this instantiation. An even better
option, however, is to simply reuse the instance passed to the
function as `source'.
2010-04-01 16:06:01 +02:00
Dan Villiom Podlaski Christiansen
0731d6a8c8 metacommand: use AmbiguousCommand from hg for consistency. 2010-04-14 20:33:27 +02:00
Dan Villiom Podlaski Christiansen
5cf244711e wrappers.pull: fix calculation of progress totals.
The previous calculation was wrong and could lead to negative totals;
it substracted a revision number from totals, from which the start
revision has already been subtracted.
2010-03-31 14:04:31 +02:00
Dan Villiom Podlaski Christiansen
05fd2cecc4 isolate all imports of Subversion modules in svnwrap.
editor: move dependancy on Subversion bindings to svnwrap package.

In the editor, this involves importing the superclass of `HgEditor' as
`svnwrap.Editor'. Additionally, the `delta.svn_txdelta_apply()'
function has been abstracted away into a simpler interface, stored in
`svnwrap.apply_txdelta()'.
2010-03-31 17:51:09 +02:00
Dan Villiom Podlaski Christiansen
d44f1dab7f wrappers: remove unused code for compatibility with Subversion 1.4. 2010-03-31 17:48:32 +02:00
Dan Villiom Podlaski Christiansen
013e37e805 Move the 'svn' metacommand into the 'svncommands' module. 2010-03-31 17:34:30 +02:00
Dan Villiom Podlaski Christiansen
4117462fc9 Use Mercurial-provided infrastructure for `svn' metacommand help. 2010-03-31 17:54:08 +02:00
Dan Villiom Podlaski Christiansen
2e0bdb2d83 svnrepo: ease debugging of Subversion fallback
Show a verbose note when falling back to Subversion support, and
enable showing the traceback.
2010-03-31 22:06:05 +02:00
Dan Villiom Podlaski Christiansen
f6578ee13c test_tags: improve test output. 2009-06-28 12:50:52 +02:00
Dan Villiom Podlaski Christiansen
d45b91a0b7 svncommands: rename the help' function to help_'.
This avoids overriding the builtin `help' function; a possible source
of confusion.

No funcationality change.
2010-03-31 17:53:47 +02:00
Dan Villiom Podlaski Christiansen
86c2a0cf0c svnmeta: minor cosmetics whitespace cleanup.
No functionality change.
2010-03-31 17:53:20 +02:00
Augie Fackler
30e34465d8 maps: fix a % formatting bug 2010-03-27 18:42:47 -05:00
Gerhard Weis
8958823457 strip off root file name only once for missing files 2010-03-20 15:07:37 +10:00
Jonathan Kotta
4aa1d845af handle nonexistant svn repositories, fixes issue 137 2010-03-09 20:58:08 -06:00
Augie Fackler
145188f746 pull: try and produce a better progress bar for certain cases
This uses the first converted revision as an offset, and then uses
(r.revnum - offset) as the current item index and (HEAD - offset) as
the total so that we always show a "real" progress number for the case
where we're cloning only part of the svn repository.
2010-03-19 21:24:03 -05:00
Patrick Mezard
8114ffd92c stupid: fix getcopies() logic
getcopies() assumed that copies where happening withing the current branch.
This is wrong when a branch replaces another, and used to generate wrong copy
records when copy sources existed in parent revision but were coming from an
unrelated revision.
2010-03-02 17:06:06 +01:00
Patrick Mezard
566a8fca5b editor: fix replaced directory copies
Known failures:
- Replaced directories copy records are wrong in stupid mode
- Replaced files copy records are probably wrong in all modes
2010-03-02 17:06:06 +01:00
Patrick Mezard
9cd3444c4e editor: fix open_file() on replaced branch
The mercurial parent revision was the replacing branch revision not the
replaced one.
2010-03-02 17:06:06 +01:00
Patrick Mezard
f834a403ab editor: fix replaced files content in replay mode 2010-03-02 17:06:06 +01:00
Patrick Mezard
29cb87b49d svnmeta: add exact arg to get_parent_revision() to handle 'R' 2010-03-02 17:06:06 +01:00
Patrick Mezard
c429e0b444 stupid: handle directory replacement in very stupid mode
Known failures:
- comprehensive/test_verify on replace_branch_with_branch: replaced files
  content is incorrect
2010-03-02 17:06:06 +01:00
Patrick Mezard
c47bdbcb15 editor: fix issamefile() and copy detection in replay mode
Known failures:
- comprehensive/test_verify on replace_branch_with_branch: replaced files
  content is incorrect
- comprehensive/test_stupid_pull on replace_branch_with_branch: very stupid
  mode does not handle replacements correctly.
2010-03-02 17:06:06 +01:00
Patrick Mezard
2977e6b7da Add rsvn.py to test tools 2010-03-02 17:06:06 +01:00
Augie Fackler
46894a9f2d util: add progress wrapper to maintain 1.3 support 2010-03-03 17:44:41 -06:00
Dirkjan Ochtman
66f986fb89 maps: if operation can continue, it should probably not use ui.warn() 2010-03-01 21:26:30 +01:00
Dirkjan Ochtman
4e8189acf4 merge commands from utility_commands into svncommands 2010-02-26 15:00:15 +01:00
Dirkjan Ochtman
e4c4a43451 tests: make sure single dir clone tests get run by non-nose users 2010-02-26 14:52:50 +01:00
Dirkjan Ochtman
e5b9813875 tests: silence test suite by using quiet UIs everywhere 2010-02-26 14:50:22 +01:00
Dirkjan Ochtman
760207eee3 svnmeta: reverse parameter calculation to lessen complexity 2010-02-24 12:48:37 -05:00
Dirkjan Ochtman
7e2d3d3d2b add basic branchmap functionality, to rename branches 2010-03-01 22:10:18 +01:00